diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d8e045265d..5622636083 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,12 +22,12 @@ SHELL ["pwsh", "-command"]
 RUN $url = "https://github.com/JanDeDobbeleer/oh-my-posh/releases/latest";$latestVersion = (Invoke-WebRequest -Uri $url).Content | Select-String -Pattern "v[0-9]+\.[0-9]+\.[0-9]+" | Select-Object -ExpandProperty Matches | Select-Object -ExpandProperty Value;$downloadUrl = "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/$latestVersion/posh-linux-amd64.tar.gz";wget https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/$latestVersion/posh-linux-amd64 -O /usr/local/bin/oh-my-posh
 RUN chmod +x /usr/local/bin/oh-my-posh
 
-# Install Azure Developer CLI (https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/)
+# Install Azure Developer CLI (https://learn.microsoft.com/azure/developer/azure-developer-cli/)
 RUN curl -fsSL https://aka.ms/install-azd.sh | bash
 
 # Switch to non-root user:
 WORKDIR /home/vscode
 USER vscode
 
-# Install Azure PowerShell modules (https://docs.microsoft.com/en-us/powershell/azure/install-az-ps)
+# Install Azure PowerShell modules (https://learn.microsoft.com/powershell/azure/install-az-ps)
 RUN Install-Module -Name Az -Force
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 589aa0f286..6df1323bc9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 <!--- 🛑 Please check existing issues first before continuing: https://github.com/microsoft/azure_arc/issues --->
 
-<!---  Disclaimer: The intent of this "Bug report" template is to address issues related to the Azure Arc Jumpstart scenarios, ArcBox, HCIBox and all other project ares. The Azure Arc Jumpstart team does not handle Azure Arc core product issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
+<!---  Disclaimer: The intent of this "Bug report" template is to address issues related to the Azure Arc Jumpstart scenarios, ArcBox, HCIBox, Agora, and all other project ares. The Azure Arc Jumpstart team does not handle Azure Arc core product issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
 
 **Is your issue related to a Jumpstart scenario, ArcBox, HCIBox, or Agora?**
 <!--- A link to the Jumpstart scenario you are working on. --->
@@ -31,12 +31,12 @@ assignees: ''
 
 **Have you looked at the Troubleshooting and Logs section?**
 <!---Relevant logs retrieval instructions can be found in the Troubleshooting section.
-- [Jumpstart ArcBox "Full" troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_arcbox/full/#basic-troubleshooting)
-- [Jumpstart ArcBox for IT Pros troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#basic-troubleshooting)
-- [Jumpstart ArcBox for DevOps troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_arcbox/devops/#basic-troubleshooting)
-- [Jumpstart ArcBox for DataOps troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_arcbox/dataops/)
-- [HCIBox troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_hcibox/#basic-troubleshooting)
-- [Agora - Contoso Supermarket troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/troubleshooting/)
+- [Jumpstart ArcBox "Full" troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/Full#basic-troubleshooting)
+- [Jumpstart ArcBox for IT Pros troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/ITPro#basic-troubleshooting)
+- [Jumpstart ArcBox for DevOps troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/DevOps#basic-troubleshooting)
+- [Jumpstart ArcBox for DataOps troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_arcbox/DataOps#basic-troubleshooting)
+- [HCIBox troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_hcibox/getting_started#basic-troubleshooting)
+- [Agora - Contoso Supermarket troubleshooting](https://azurearcjumpstart.com/azure_jumpstart_ag/retail/contoso_supermarket/troubleshooting)
 --->
 
 **Screenshots**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 92c7d0d90b..d4c6fce7ed 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,10 +6,10 @@ labels: ''
 assignees: ''
 
 ---
-<!--- Disclaimer: The intent of this "Feature request" template is to address issues related to the Azure Arc Jumpstart scenarios, ArcBox and all other project ares. The Azure Arc Jumpstart team does not handle Azure Arc core product issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
+<!--- Disclaimer: The intent of this "Feature request" template is to address feature requests related to the Azure Arc Jumpstart scenarios, ArcBox, HCIBox, Agora, and all other project ares. The Azure Arc Jumpstart team does not handle Azure Arc core product issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
 
 **Is your feature request related to a new Jumpstart scenario you would like to contribute?**
-<!--- That's great! Use our [Jumpstart Scenario Write-up Guidelines](https://azurearcjumpstart.io/scenario_guidelines) --->
+<!--- That's great! Use our [Jumpstart Scenario Write-up Guidelines](https://aka.ms/JumpstartContribution) --->
 
 **Is your feature request related to a problem? Please describe.**
 <!--- A clear and concise description of what the problem is. Ex. As a user of ... I would like to have [...] --->
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md
index 609083681b..0db7002514 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md
@@ -16,10 +16,7 @@
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
 
 ## Checklist
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 - [ ] My code follows the code style of this project.
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation and/or images accordingly.
-<!-- - [ ] I've read the [CONTRIBUTION](https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md) guide -->
-<!-- - [ ] I have signed-off my commits with `git commit -s` -->
+- [ ] I've read the Jumpstart [contribution guidelines](https://aka.ms/JumpstartContribution).
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index d6979e4cd7..b9dbcadd06 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1 +1 @@
-./docs/code_of_conduct/_index.md
\ No newline at end of file
+https://aka.ms/JumpstartCOC
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0503439bb8..a28e22c917 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1 @@
-./docs/contributing/_index.md
\ No newline at end of file
+https://aka.ms/JumpstartContribution
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index e95822b96e..0000000000
--- a/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Azure Arc Jumpstart documentation
-
-If you are looking to explore the Jumpstart documentation, please go to the documentation website:
-
-https://azurearcjumpstart.io
-
-This repository contains the markdown files which generate the above website. See below for guidance on running with a local environment to contribute to the docs.
-
-> **Disclaimer: The intention for the Azure Arc Jumpstart project is to focus on the core Azure Arc capabilities, deployment scenarios, use-cases, and ease of use. It does not focus on Azure best-practices or the other tech and OSS projects being leveraged in the scenarios and code. Jumpstart scenarios, ArcBox, HCIBox, and Agora are all intended for evaluation, training and demo purposes only and are not supported for production use cases.**
-
-## Want to help and contribute?
-
-Before making your first contribution, make sure to review the [contributing](https://azurearcjumpstart.io/contributing/) section in the docs.
-
-* Found a bug?! Use the [Bug Report](https://github.com/microsoft/azure_arc/issues/new?assignees=&labels=bug&template=bug_report.md&title=) issue template to let us know.
-
-* To ask for a Jumpstart scenario, create one yourself or submit an Azure Arc core product feature request, use the [Feature Request](https://github.com/microsoft/azure_arc/issues/new?assignees=&labels=&template=feature_request.md&title=) issue template.
-
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
-Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
-the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com.
-
-When you submit a pull request, a CLA bot will automatically determine whether you need to provide
-a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions
-provided by the bot. You will only need to do this once across all repos using our CLA.
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
-contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## Jumpstart Roadmap
-
-Up-to-date roadmap for the Azure Arc Jumpstart scenarios can be found under [the repository GitHub Project](https://github.com/microsoft/azure_arc/projects/1).
-
-## Legal Notices
-
-Microsoft and any contributors grant you a license to the Microsoft documentation and other content
-in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
-see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the
-[LICENSE-CODE](LICENSE-CODE) file.
-
-Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
-may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
-The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
-
-Privacy information can be found at https://privacy.microsoft.com/
-
-Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
-or trademarks, whether by implication, estoppel or otherwise.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
deleted file mode 100644
index fee586f006..0000000000
--- a/RELEASE_NOTES.md
+++ /dev/null
@@ -1 +0,0 @@
-./docs/release_notes/_index.md
\ No newline at end of file
diff --git a/SECURITY.md b/SECURITY.md
index ca2bf7a61f..92b5ab00c3 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1 +1 @@
-./docs/security/_index.md
\ No newline at end of file
+https://github.com/Azure/arc_jumpstart_docs/blob/main/SECURITY.md
\ No newline at end of file
diff --git a/arc_data_services/deploy/scripts/create-sql-keytab.sh b/arc_data_services/deploy/scripts/create-sql-keytab.sh
index 5582e71d09..1e60212577 100644
--- a/arc_data_services/deploy/scripts/create-sql-keytab.sh
+++ b/arc_data_services/deploy/scripts/create-sql-keytab.sh
@@ -11,7 +11,7 @@
 #     $ sudo apt-get install krb5-user
 #
 #  2) The tool 'adutil' should be pre-installed if using --use-adutil flag.
-#     Installation instructions: https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-ad-auth-adutil-introduction?view=sql-server-ver15&tabs=ubuntu
+#     Installation instructions: https://learn.microsoft.com/sql/linux/sql-server-linux-ad-auth-adutil-introduction?view=sql-server-ver15&tabs=ubuntu
 #
 #  3) User must kinit with an AD user when using --use-adutil flag.
 #
diff --git a/arc_data_services/deploy/scripts/rotate-sql-keytab.sh b/arc_data_services/deploy/scripts/rotate-sql-keytab.sh
index d1668dfeb0..9987ee9909 100644
--- a/arc_data_services/deploy/scripts/rotate-sql-keytab.sh
+++ b/arc_data_services/deploy/scripts/rotate-sql-keytab.sh
@@ -11,7 +11,7 @@
 #     $ sudo apt-get install krb5-user
 #
 #  2) The tool 'adutil' should be pre-installed if using --use-adutil flag.
-#     Installation instructions: https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-ad-auth-adutil-introduction?view=sql-server-ver15&tabs=ubuntu
+#     Installation instructions: https://learn.microsoft.com/sql/linux/sql-server-linux-ad-auth-adutil-introduction?view=sql-server-ver15&tabs=ubuntu
 #
 #  3) User must kinit with an AD user when using --use-adutil flag.
 #
diff --git a/arc_data_services/deploy/yaml/README.md b/arc_data_services/deploy/yaml/README.md
index 436e52b64e..9a850bc170 100644
--- a/arc_data_services/deploy/yaml/README.md
+++ b/arc_data_services/deploy/yaml/README.md
@@ -1,6 +1,6 @@
 # Azure Arc enabled data services - Sample yaml files
 
-This folder contains deployment related scripts for Azure Arc enabled data services. These scripts can be applied using kubectl command-line tool. If you are performing any operations on the services using the [Azure Data CLI](https://docs.microsoft.com/en-us/sql/azdata/install/deploy-install-azdata?toc=%2Fazure%2Fazure-arc%2Fdata%2Ftoc.json&bc=%2Fazure%2Fazure-arc%2Fdata%2Fbreadcrumb%2Ftoc.json&view=sql-server-ver15) tool then ensure that you have the latest version always.
+This folder contains deployment related scripts for Azure Arc enabled data services. These scripts can be applied using kubectl command-line tool. If you are performing any operations on the services using the [Azure Data CLI](https://learn.microsoft.com/sql/azdata/install/deploy-install-azdata?toc=%2Fazure%2Fazure-arc%2Fdata%2Ftoc.json&bc=%2Fazure%2Fazure-arc%2Fdata%2Fbreadcrumb%2Ftoc.json&view=sql-server-ver15) tool then ensure that you have the latest version always.
 
 ## Deployment yaml files for kube-native operations
 
diff --git a/arc_data_services/test/launcher/overlays/openshift/scc.yaml b/arc_data_services/test/launcher/overlays/openshift/scc.yaml
index c165fe4adb..90ea435acf 100644
--- a/arc_data_services/test/launcher/overlays/openshift/scc.yaml
+++ b/arc_data_services/test/launcher/overlays/openshift/scc.yaml
@@ -1,5 +1,5 @@
 # For Azure Arc Connected Cluster
-# https://docs.microsoft.com/en-us/azure/azure-arc/kubernetes/quickstart-connect-cluster?tabs=azure-cli#prerequisites
+# https://learn.microsoft.com/azure/azure-arc/kubernetes/quickstart-connect-cluster?tabs=azure-cli#prerequisites
 # TODO: Remove this once Connected Cluster removes SCC for fluentbit for node polling
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/arc_data_services/upgrade/yaml/README.md b/arc_data_services/upgrade/yaml/README.md
index 73860ecef8..0bf24ac444 100644
--- a/arc_data_services/upgrade/yaml/README.md
+++ b/arc_data_services/upgrade/yaml/README.md
@@ -1,6 +1,6 @@
 # Azure Arc-enabled data services - Sample yaml files
 
-This folder contains upgrade related scripts for Azure Arc-enabled data services. These scripts can be applied using kubectl command-line tool. If you are performing any operations on the services using the [Azure Data CLI](https://docs.microsoft.com/sql/azdata/install/deploy-install-azdata?toc=%2Fazure%2Fazure-arc%2Fdata%2Ftoc.json&bc=%2Fazure%2Fazure-arc%2Fdata%2Fbreadcrumb%2Ftoc.json&view=sql-server-ver15) tool then ensure that you have the latest version always.
+This folder contains upgrade related scripts for Azure Arc-enabled data services. These scripts can be applied using kubectl command-line tool. If you are performing any operations on the services using the [Azure Data CLI](https://learn.microsoft.com/sql/azdata/install/deploy-install-azdata?toc=%2Fazure%2Fazure-arc%2Fdata%2Ftoc.json&bc=%2Fazure%2Fazure-arc%2Fdata%2Fbreadcrumb%2Ftoc.json&view=sql-server-ver15) tool then ensure that you have the latest version always.
 
 ## Upgrade yaml files for kube-native operations
 
diff --git a/archive/arc_updateManagement/_index.md b/archive/arc_updateManagement/_index.md
deleted file mode 100644
index cbf4396d3a..0000000000
--- a/archive/arc_updateManagement/_index.md
+++ /dev/null
@@ -1,156 +0,0 @@
-<!-- ---
-type: docs
-title: "Update Management"
-linkTitle: "Update Management"
-weight: 8
-description: >
---- -->
-
-<!-- ## Enable Update Management on Azure Arc-enabled servers
-
-The scenario will show you how to onboard Azure Arc-enabled servers to [Update Management](https://docs.microsoft.com/azure/automation/update-management/overview), so that you can manage operating system updates for your Azure Arc-enabled servers running Windows or Linux.
-
-in this scenario, you will create and configure an Azure Automation account and Log Analytics workspace to support Update Management for Azure Arc-enabled servers by doing the following:
-
-- Setup a new Log Analytics Workspace and Azure Automation account.
-
-- Enable Update Management on Azure Arc-enabled servers.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository -->
-<!-- 
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario, as can be seen in the screenshots below, we will be using an Amazon Web Services (AWS) EC2 instance that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot showing AWS cloud console with EC2 instance](./01.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled server](./02.png)
-
-    > **NOTE: Ensure that the server you will use for this scenario is running an [OS supported by Update Management](https://docs.microsoft.com/azure/automation/update-management/overview#supported-operating-systems)and meets the [system requirements](https://docs.microsoft.com/azure/automation/update-management/overview#system-requirements).**
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.42.0 or later. Use ```az --version``` to check your current installed version.
-
-## Configuring Update Management
-
-Update Management uses the Log Analytics agent to collect Windows and Linux server log files and the data collected is stored in a Log Analytics workspace.
-
-- You will need to create a Log Analytics workspace. For that you can use this [ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/updateManagement/law-template.json) that will create a new Log Analytics Workspace and define the Update Management solution and enable it for the workspace.
-
-- First, create a new resource group for the Log Analytics workspace by running the below command, replacing the values in brackets with your own.
-
-    ```shell
-    az group create --name <Name for your resource group> \
-    --location <Location for your resources> \
-    --tags "Project=jumpstart_azure_arc_servers"
-    ```
-
-    ![Screenshot showing az group create being run](./03.png)
-
-- Next, edit the ARM template [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/updateManagement/law-template.parameters.json), providing a name for your Log Analytics workspace, a location, and a name for your Azure Automation account. You also need to supply the name of your Azure Arc-enabled server, and the name of the resource group that contains the Arc-enabled server as shown in the example below:
-
-    ![Screenshot showing Azure ARM template](./04.png)
-
-- To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/updateManagement) and run the below command:
-
-    ```shell
-    az deployment group create --resource-group <Name of the Azure resource group you created> \
-        --template-file law-template.json \
-        --parameters law-template.parameters.json
-    ```
-
-   ![Screenshot showing az deployment group create being run](./05.png)
-
-- When the deployment is complete, you should be able to see the resource group with your Log Analytics workspace, automation account and Update Management solution from the Azure Portal. Drilling into the Log Analytics workspace Solutions blade should show the Update Management solution.
-
-    ![Screenshot showing Azure Portal with Log Analytics workspace](./06.png)
-
-## Confirm that the Update Management solution is deployed on your Azure Arc-enabled server
-
-- Click on the Solutions blade of the Log Analytics workspace and then click the Updates solution from the list to check the progress of the Update Management assessment.
-
-    ![Screenshot showing Solutions Blade of Log Analytics workspace](./13.png)
-
-- It may take several hours for Update Management to collect enough data to show an assessment for your VM. In the screen below we can see the assessment is being performed.
-
-    ![Screenshot showing Update Management overview blade](./14.png)
-
-- When the assessment is complete, you will see an option to "View summary" on the Update Management blade.
-
-    ![Screenshot showing Update Management with summary](./15.png)
-
-- Click View Summary and then click again to drill into the Update Management assessment. In the below example we can see there are updates missing on our Azure Arc-enabled server.
-
-    ![Screenshot showing ](./16.png)
-
-## Schedule an Update
-
-Now that we have configured the Update Management solution, we can deploy updates on a set schedule for our Azure Arc-enabled server.
-
-- Navigate to the Automation Account we created previously and click on the Update Management blade as shown in the screenshot below. You should see your Azure Arc-enabled server listed.
-
-    ![Screenshot showing Azure Automation account](./18.png)
-
-- From the above screen, click "Schedule update deployment". On the next screen, select the Operating System that your Azure Arc-enabled server is using, and then select "Machines to update" as shown below.
-
-    ![Screenshot showing scheduling an update with Update Management](./19.png)
-
-- From the "Type" dropdown, select "Machines" and then select your server and click Ok.
-
-    ![Screenshot showing scheduling an update with Update Management](./20.png)
-
-- Click Schedule Settings and then provide a desired schedule.
-
-    ![Screenshot showing scheduling an update with Update Management](./21.png)
-
-    ![Screenshot showing scheduling an update with Update Management](./22.png)
-
-- Finally, provide a name for your Update deployment and then click Create.
-
-    ![Screenshot showing scheduling an update with Update Management](./23.png)
-
-- From the Automation Account Update Management blade, you should be able to see your scheduled Update deployment from the Deployment Schedules tab.
-    ![Screenshot showing scheduled update](./24.png)
-
-The Update Management solution will now update your Azure Arc-enabled servers in the deployment window based on the schedule you defined. There is a lot more you can do with [Update Management](https://docs.microsoft.com/azure/automation/update-management/overview) that is outside the scope of this scenario. Review the [documentation](https://docs.microsoft.com/azure/automation/update-management/overview) for more information.
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-- Delete the resource group.
-
-    ```shell
-    az group delete --name <Name of your resource group>
-    ```
-
-    ![Screenshot showing az group delete being run](./26.png) -->
diff --git a/archive/arc_vm_extension_mma_arm/_index.md b/archive/arc_vm_extension_mma_arm/_index.md
deleted file mode 100644
index 15c3d46c70..0000000000
--- a/archive/arc_vm_extension_mma_arm/_index.md
+++ /dev/null
@@ -1,185 +0,0 @@
-<!-- ---
-type: docs
-title: "Monitoring Agent Extension"
-linkTitle: "Monitoring Agent Extension"
-weight: 3
-description: >
---- -->
-<!-- 
-## Deploy Monitoring Agent Extension on Azure Arc Linux and Windows servers using Extension Management
-
-The following Jumpstart scenario will guide you on how to manage extensions on Azure Arc-enabled servers. Virtual machine extensions are small applications that provide post-deployment configuration and automation tasks such as software installation, anti-virus protection, or a mechanism to run a custom script.
-
-Azure Arc-enabled servers, enables you to deploy Azure VM extensions to non-Azure Windows and Linux VMs, giving you a hybrid or multi-cloud management experience that levels to Azure VMs.
-
-You can use the Azure portal, Azure CLI, an ARM template, PowerShell script or Azure policies to manage the extension deployment to Azure Arc-enabled servers, both Linux and Windows. In this scenario, you will use an ARM template deploy the Microsoft Monitoring Agent (MMA) to your servers so they are onboard on Azure services that leverage this agent: Azure Monitor, Azure Security Center, Azure Sentinel, etc.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Please review the [Azure Monitor supported OS documentation](https://docs.microsoft.com/azure/azure-monitor/insights/vminsights-enable-overview#supported-operating-systems) and ensure that the VMs you will use for this exercise are supported. For Linux VMs, check both the Linux distribution and kernel to ensure you are using a supported configuration.
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshots below you can see a GCP server has been connected with Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot Azure Arc-enabled server on resource group](./01.png)
-
-    ![Screenshot Azure Arc-enabled server connected status](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.42.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure Service Principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- You will also need to have a Log Analytics workspace deployed. You can automate the deployment by editing the ARM template [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/extensions/arm/log_analytics-template.parameters.json) and provide a name and location for your workspace.
-
-    ![Screenshot ARM template parameters file](./03.png)
-
-  To deploy the ARM template, navigate to the "deployment folder" ***../extensions/arm*** and run the below command:
-
-  ```shell
-  az deployment group create --resource-group <Name of the Azure resource group> \
-  --template-file <The *log_analytics-template.json* template file location> \
-  --parameters <The *log_analytics-template.parameters.json* template file location>
-  ```
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User is verifying the successful extension deployment.
-
-## Deployment Option 1: Azure portal
-
-- For Windows VMs, click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fextensions%2Farm%2Fmma-template-windows.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-  ![Screenshot showing Azure portal deployment](./05.png)
-
-- For Linux VMs, click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fextensions%2Farm%2Fmma-template-linux.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters:
-
-  ![Screenshot showing Azure portal deployment](./06.png)
-
-  ![Screenshot showing Azure portal deployment](./07.png)
-
-- To match your configuration you will need to provide:
-
-  - The VM name as it is registered in Azure Arc.
-
-    ![Screenshot Azure Arc-enabled server computer name](./08.png)
-
-  - The location of the resource group where you registered the Azure Arc-enabled server.
-
-    ![Screenshot Azure Arc-enabled server location](./09.png)
-
-  - Information of the Log Analytics workspace you previously created: workspace ID and key. These parameters will be used to configure the MMA agent. You can get this information by going to your Log Analytics workspace and under "Settings" select "Agent management".
-
-    ![Screenshot Azure Arc-enabled server Agent management](./10.png)
-
-    ![Screenshot workspace configuration](./11.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [*extensions parameters file*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/extensions/arm/mma-template.parameters.json) providing the values that match your configuration as described above.
-
-    ![Screenshot ARM template parameters file](./12.png)
-
-- Choose the ARM template that matches your operating system, for [*Windows*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/extensions/arm/mma-template-windows.json) and [*Linux*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/extensions/arm/mma-template-linux.json), deploy the template by running the following command:
-
-    ```shell
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-file <The *mma-template.json* template file location> \
-    --parameters <The *mma-template.parameters.json* template file location>
-    ```
-
-- Once the template has completed its run, you should see an output as follows:
-
-    ![Screenshot ARM template execution output](./13.png)
-
-- You will have the Microsoft Monitoring agent deployed on your Windows or Linux system and reporting to the Log Analytics workspace that you have selected. You can verify by going back to the "Agents management" section of your workspace and choosing either Windows or Linux, you should see now an additional connected VM.
-
-    ![Screenshot Windows connected agents](./14.png)
-
-    ![Screenshot Linux connected agents](./15.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-- Remove the Log Analytics workspace by executing the following command in AZ CLI. Provide the workspace name you used when creating the Log Analytics Workspace.
-
-    ```shell
-    az monitor log-analytics workspace delete --resource-group <Name of the Azure resource group> --workspace-name <Log Analytics Workspace Name> --yes
-    ``` -->
diff --git a/azure_arc_app_services_jumpstart/aks/ARM/artifacts/Bootstrap.ps1 b/azure_arc_app_services_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
index ae34604ac6..fd3231b007 100644
--- a/azure_arc_app_services_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_app_services_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
@@ -71,7 +71,7 @@ Write-Host "Extending C:\ partition to the maximum size"
 Resize-Partition -DriveLetter C -Size $(Get-PartitionSupportedSize -DriveLetter C).SizeMax
 
 # Downloading global Jumpstart artifacts
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Downloading GitHub artifacts for AppServicesLogonScript.ps1
 if ($deployAppService -eq $true -Or $deployFunction -eq $true -Or $deployApiMgmt -eq $true -Or $deployLogicApp -eq $true) {
diff --git a/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1 b/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1
index 18bb83b795..e4d13cfdc1 100644
--- a/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1
@@ -48,7 +48,7 @@ Write-Host "Extending C:\ partition to the maximum size"
 Resize-Partition -DriveLetter C -Size $(Get-PartitionSupportedSize -DriveLetter C).SizeMax
 
 # Downloading global Jumpstart artifacts
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Downloading GitHub artifacts for AppServicesLogonScript.ps1
 Invoke-WebRequest ($templateBaseUrl + "artifacts/capiStorageClass.yaml") -OutFile "C:\Temp\capiStorageClass.yaml"
diff --git a/azure_arc_data_jumpstart/aks/ARM/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
index e87138317c..420c461602 100644
--- a/azure_arc_data_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/aks/ARM/artifacts/Bootstrap.ps1
@@ -86,7 +86,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "${t
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "${tempDir}\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "${tempDir}\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "${tempDir}\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "${tempDir}\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "${tempDir}\wallpaper.png"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/adConnector.yaml") -OutFile "${tempDir}\adConnector.yaml"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/adConnectorCMK.yaml") -OutFile "${tempDir}\adConnectorCMK.yaml"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIADAuthCMK.yaml") -OutFile "${tempDir}\SQLMIADAuthCMK.yaml"
diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/Bootstrap.ps1
index 9997604475..22a2e827a3 100644
--- a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/Bootstrap.ps1
@@ -76,7 +76,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "C:\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "C:\Temp\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/Bootstrap.ps1
index f92fb284c1..dfb7c12f6b 100644
--- a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/Bootstrap.ps1
@@ -75,7 +75,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMI.json") -OutFile "C:\Temp\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMI.parameters.json") -OutFile "C:\Temp\SQLMI.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01 {
diff --git a/azure_arc_data_jumpstart/aro/ARM/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/aro/ARM/artifacts/Bootstrap.ps1
index 371682ba24..eeb841c469 100644
--- a/azure_arc_data_jumpstart/aro/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/aro/ARM/artifacts/Bootstrap.ps1
@@ -79,7 +79,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "C:\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "C:\Temp\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/AROSCC.yaml") -OutFile "C:\Temp\AROSCC.yaml"
 
 
diff --git a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1
index 97ebbafe42..d32db96a65 100644
--- a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/Bootstrap.ps1
@@ -84,7 +84,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "C:\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "C:\Temp\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_data_jumpstart/eks/terraform/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/eks/terraform/artifacts/Bootstrap.ps1
index 4bfbbbb557..81133e6c4e 100644
--- a/azure_arc_data_jumpstart/eks/terraform/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/eks/terraform/artifacts/Bootstrap.ps1
@@ -89,7 +89,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "C:\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "C:\Temp\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 
 # Installing tools
diff --git a/azure_arc_data_jumpstart/gke/terraform/artifacts/wallpaper.png b/azure_arc_data_jumpstart/gke/terraform/artifacts/wallpaper.png
new file mode 100644
index 0000000000..e6b4ecc2b3
Binary files /dev/null and b/azure_arc_data_jumpstart/gke/terraform/artifacts/wallpaper.png differ
diff --git a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/Bootstrap.ps1
index dd23b70782..1d7c37af3f 100644
--- a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/Bootstrap.ps1
@@ -83,7 +83,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "C:\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "C:\Temp\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/Bootstrap.ps1 b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/Bootstrap.ps1
index 324cc8a3a0..43b018b8d0 100644
--- a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/Bootstrap.ps1
+++ b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/Bootstrap.ps1
@@ -83,7 +83,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.json") -OutFile "C:\
 Invoke-WebRequest ($templateBaseUrl + "artifacts/postgreSQL.parameters.json") -OutFile "C:\Temp\postgreSQL.parameters.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/SQLMIEndpoints.ps1") -OutFile "C:\Temp\SQLMIEndpoints.ps1"
 Invoke-WebRequest "https://github.com/ErikEJ/SqlQueryStress/releases/download/102/SqlQueryStress.zip" -OutFile "C:\Temp\SqlQueryStress.zip"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/artifacts/Bootstrap.ps1 b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/artifacts/Bootstrap.ps1
index 9952ce3603..5b03d7a538 100644
--- a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/artifacts/Bootstrap.ps1
+++ b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/artifacts/Bootstrap.ps1
@@ -50,7 +50,7 @@ Resize-Partition -DriveLetter C -Size $(Get-PartitionSupportedSize -DriveLetter
 
 # Download artifacts
 Invoke-WebRequest ($templateBaseUrl + "artifacts/LogonScript.ps1") -OutFile "$tempDir\LogonScript.ps1"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "$tempDir\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "$tempDir\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/artifacts/Bootstrap.ps1 b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/artifacts/Bootstrap.ps1
index 19cb613ffa..28b1dff0da 100644
--- a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/artifacts/Bootstrap.ps1
+++ b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/artifacts/Bootstrap.ps1
@@ -59,7 +59,7 @@ Resize-Partition -DriveLetter C -Size $(Get-PartitionSupportedSize -DriveLetter
 
 # Download artifacts
 Invoke-WebRequest ($templateBaseUrl + "artifacts/LogonScript.ps1") -OutFile "$tempDir\LogonScript.ps1"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "$tempDir\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "$tempDir\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/artifacts/Bootstrap.ps1 b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/artifacts/Bootstrap.ps1
index b1b5b667f3..04d4e88b71 100644
--- a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/artifacts/Bootstrap.ps1
+++ b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/artifacts/Bootstrap.ps1
@@ -33,7 +33,7 @@ $ErrorActionPreference = "SilentlyContinue"
 
 # Downloading GitHub artifacts
 Invoke-WebRequest ($templateBaseUrl + "artifacts/LogonScript.ps1") -OutFile "C:\Temp\LogonScript.ps1"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/artifacts/Bootstrap.ps1 b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/artifacts/Bootstrap.ps1
index b1b5b667f3..04d4e88b71 100644
--- a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/artifacts/Bootstrap.ps1
+++ b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/artifacts/Bootstrap.ps1
@@ -33,7 +33,7 @@ $ErrorActionPreference = "SilentlyContinue"
 
 # Downloading GitHub artifacts
 Invoke-WebRequest ($templateBaseUrl + "artifacts/LogonScript.ps1") -OutFile "C:\Temp\LogonScript.ps1"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 
 # Installing tools
 workflow ClientTools_01
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_vi/artifacts/Bootstrap.ps1 b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_vi/artifacts/Bootstrap.ps1
index b9c7d3cf5e..9c23d38883 100644
--- a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_vi/artifacts/Bootstrap.ps1
+++ b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_vi/artifacts/Bootstrap.ps1
@@ -70,7 +70,7 @@ if (($rdpPort -ne $null) -and ($rdpPort -ne "") -and ($rdpPort -ne "3389")) {
 Invoke-WebRequest ($templateBaseUrl + "artifacts/LogonScript.ps1") -OutFile "C:\Temp\LogonScript.ps1"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/longhorn.yaml") -OutFile "C:\Temp\longhorn.yaml"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/video/video.mp4") -OutFile "C:\Temp\video.mp4"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png"
 Invoke-WebRequest "https://github.com/certbot/certbot/releases/latest/download/certbot-beta-installer-win_amd64_signed.exe" -OutFile "C:\Temp\certbot-beta-installer-win_amd64_signed.exe"
 
 ##############################################################
diff --git a/azure_arc_ml_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 b/azure_arc_ml_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1
index eb125104e6..691d673cd0 100644
--- a/azure_arc_ml_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1
+++ b/azure_arc_ml_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1
@@ -31,7 +31,7 @@ New-Item -Path $tempDir -ItemType directory -Force
 
 Start-Transcript "C:\Temp\Bootstrap.log"
 
-# https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-7.1#erroractionpreference
+# https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-7.1#erroractionpreference
 # Show errors, but to continue nonetheless
 $ErrorActionPreference = 'Continue'
 
@@ -61,7 +61,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/inference.zip") -OutFile "C:\Te
 Invoke-WebRequest ($templateBaseUrl + "artifacts/1.Get_WS.py") -OutFile "C:\Temp\1.Get_WS.py"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/2.Attach_Arc.py") -OutFile "C:\Temp\2.Attach_Arc.py"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/3.Create_MNIST_Dataset.py") -OutFile "C:\Temp\3.Create_MNIST_Dataset.py"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png" # Wallpaper is shared from main
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "C:\Temp\wallpaper.png" # Wallpaper is shared from main
 
 # Unzip training and inference payloads
 Expand-Archive -LiteralPath "C:\Temp\train.zip" -DestinationPath "C:\Temp"
diff --git a/azure_arc_ml_jumpstart/aks/arm_template/artifacts/train/notebook/img-classification-training.ipynb b/azure_arc_ml_jumpstart/aks/arm_template/artifacts/train/notebook/img-classification-training.ipynb
index ddb7c4f7d9..c8a6080053 100644
--- a/azure_arc_ml_jumpstart/aks/arm_template/artifacts/train/notebook/img-classification-training.ipynb
+++ b/azure_arc_ml_jumpstart/aks/arm_template/artifacts/train/notebook/img-classification-training.ipynb
@@ -185,7 +185,7 @@
         "\n",
         "### Download the MNIST dataset\n",
         "\n",
-        "Use Azure Open Datasets to get the raw MNIST data files. [Azure Open Datasets](https://docs.microsoft.com/azure/open-datasets/overview-what-are-open-datasets) are curated public datasets that you can use to add scenario-specific features to machine learning solutions for more accurate models. Each dataset has a corrseponding class, `MNIST` in this case, to retrieve the data in different ways.\n",
+        "Use Azure Open Datasets to get the raw MNIST data files. [Azure Open Datasets](https://learn.microsoft.com/azure/open-datasets/overview-what-are-open-datasets) are curated public datasets that you can use to add scenario-specific features to machine learning solutions for more accurate models. Each dataset has a corrseponding class, `MNIST` in this case, to retrieve the data in different ways.\n",
         "\n",
         "This code retrieves the data as a `FileDataset` object, which is a subclass of `Dataset`. A `FileDataset` references single or multiple files of any format in your datastores or public urls. The class provides you with the ability to download or mount the files to your compute by creating a reference to the data source location. Additionally, you register the Dataset to your workspace for easy retrieval during training.\n",
         "\n",
diff --git a/azure_arc_servers_jumpstart/esu/artifacts/Bootstrap.ps1 b/azure_arc_servers_jumpstart/esu/artifacts/Bootstrap.ps1
index 7d6bc8fc00..a0b741d0a0 100644
--- a/azure_arc_servers_jumpstart/esu/artifacts/Bootstrap.ps1
+++ b/azure_arc_servers_jumpstart/esu/artifacts/Bootstrap.ps1
@@ -98,7 +98,7 @@ foreach ($app in $appsToInstall) {
 Write-Header "Fetching GitHub Artifacts"
 
 Write-Host "Fetching Artifacts"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile $Env:ESUDir\wallpaper.png
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile $Env:ESUDir\wallpaper.png
 
 Write-Host "Fetching Artifacts"
 Invoke-WebRequest ($Env:templateBaseUrl + "artifacts/LogonScript.ps1") -OutFile $Env:ESUDir\LogonScript.ps1
diff --git a/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl b/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
index 134c967425..dbd3c7db06 100644
--- a/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
+++ b/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
@@ -10,7 +10,7 @@ $resourceTags= @{"Project"="jumpstart_azure_arc_sql"}
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
@@ -136,7 +136,7 @@ function installPowershellModule() {
         if ([version]$version -lt [version]"6.2.4") {
             Write-Error -Message ("Could not install Az module: Powershell $version does not support having both the AzureRM and Az modules installed. " + 
                 "If you need to keep AzureRM available on your system, install the Az module for PowerShell 6.2.4 or later. " +
-                "For more information, see: https://docs.microsoft.com/en-us/powershell/azure/migrate-from-azurerm-to-az")
+                "For more information, see: https://learn.microsoft.com/powershell/azure/migrate-from-azurerm-to-az")
             return
         }
             
diff --git a/azure_arc_sqlsrv_jumpstart/azure/windows/archive/vanilla/arm_template/scripts/installArcAgentSQL.ps1 b/azure_arc_sqlsrv_jumpstart/azure/windows/archive/vanilla/arm_template/scripts/installArcAgentSQL.ps1
index 829bb121b9..b1b1723a92 100644
--- a/azure_arc_sqlsrv_jumpstart/azure/windows/archive/vanilla/arm_template/scripts/installArcAgentSQL.ps1
+++ b/azure_arc_sqlsrv_jumpstart/azure/windows/archive/vanilla/arm_template/scripts/installArcAgentSQL.ps1
@@ -22,7 +22,7 @@ $workspaceName = $logAnalyticsWorkspaceName
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
@@ -185,7 +185,7 @@ function Install-PowershellModule() {
         if ([version]$version -lt [version]"6.2.4") {
             Write-Warning -Category NotInstalled -Message ("Could not install Az module: Powershell $version does not support having both the AzureRM and Az modules installed. " +
                 "If you need to keep AzureRM available on your system, install the Az module for PowerShell 6.2.4 or later. " +
-                "For more information, see: https://docs.microsoft.com/en-us/powershell/azure/migrate-from-azurerm-to-az")
+                "For more information, see: https://learn.microsoft.com/powershell/azure/migrate-from-azurerm-to-az")
             return
         }
 
diff --git a/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/Bootstrap.ps1 b/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/Bootstrap.ps1
index 7518f4b48d..474ac86098 100644
--- a/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/Bootstrap.ps1
+++ b/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/Bootstrap.ps1
@@ -101,7 +101,7 @@ Invoke-WebRequest ($templateBaseUrl + "azure/windows/defender_sql/arm_template/s
 Invoke-WebRequest ($templateBaseUrl + "azure/windows/defender_sql/arm_template/scripts/installArcAgent.ps1") -OutFile "$Env:agentScript\installArcAgent.ps1"
 Invoke-WebRequest ($templateBaseUrl + "azure/windows/defender_sql/arm_template/icons/arcsql.ico") -OutFile $Env:ArcJSIconDir\arcsql.ico
 Invoke-WebRequest ($templateBaseUrl + "azure/windows/defender_sql/arm_template/scripts/testDefenderForSQL.ps1") -OutFile $Env:ArcJSDir\testDefenderForSQL.ps1
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "$Env:tempDir\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "$Env:tempDir\wallpaper.png"
 
 Write-Header "Configuring Logon Scripts"
 
diff --git a/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLSP.ps1 b/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLSP.ps1
index 6b6ff217f1..75dc96088e 100644
--- a/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLSP.ps1
+++ b/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLSP.ps1
@@ -24,7 +24,7 @@ $unattended = $spnClientId -And $spnTenantId -And $spnClientSecret
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
diff --git a/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLUser.ps1 b/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLUser.ps1
index 0847ca6f3e..1877f275cf 100644
--- a/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLUser.ps1
+++ b/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLUser.ps1
@@ -10,7 +10,7 @@ $arcMachineName = [Environment]::MachineName
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
@@ -46,7 +46,7 @@ function Install-PowershellModule() {
         if ([version]$version -lt [version]"6.2.4") {
             Write-Warning -Category NotInstalled -Message ("Could not install Az module: Powershell $version does not support having both the AzureRM and Az modules installed. " +
                 "If you need to keep AzureRM available on your system, install the Az module for PowerShell 6.2.4 or later. " +
-                "For more information, see: https://docs.microsoft.com/en-us/powershell/azure/migrate-from-azurerm-to-az")
+                "For more information, see: https://learn.microsoft.com/powershell/azure/migrate-from-azurerm-to-az")
             return
         }
 
diff --git a/azure_arc_sqlsrv_jumpstart/gcp/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl b/azure_arc_sqlsrv_jumpstart/gcp/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
index ab661db180..7cc7a51838 100644
--- a/azure_arc_sqlsrv_jumpstart/gcp/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
+++ b/azure_arc_sqlsrv_jumpstart/gcp/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
@@ -10,7 +10,7 @@ $resourceTags= @{"Project"="jumpstart_azure_arc_sql"}
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
@@ -136,7 +136,7 @@ function installPowershellModule() {
         if ([version]$version -lt [version]"6.2.4") {
             Write-Error -Message ("Could not install Az module: Powershell $version does not support having both the AzureRM and Az modules installed. " + 
                 "If you need to keep AzureRM available on your system, install the Az module for PowerShell 6.2.4 or later. " +
-                "For more information, see: https://docs.microsoft.com/en-us/powershell/azure/migrate-from-azurerm-to-az")
+                "For more information, see: https://learn.microsoft.com/powershell/azure/migrate-from-azurerm-to-az")
             return
         }
             
diff --git a/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl b/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
index 134c967425..dbd3c7db06 100644
--- a/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
+++ b/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/scripts/install_arc_agent.ps1.tmpl
@@ -10,7 +10,7 @@ $resourceTags= @{"Project"="jumpstart_azure_arc_sql"}
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
@@ -136,7 +136,7 @@ function installPowershellModule() {
         if ([version]$version -lt [version]"6.2.4") {
             Write-Error -Message ("Could not install Az module: Powershell $version does not support having both the AzureRM and Az modules installed. " + 
                 "If you need to keep AzureRM available on your system, install the Az module for PowerShell 6.2.4 or later. " +
-                "For more information, see: https://docs.microsoft.com/en-us/powershell/azure/migrate-from-azurerm-to-az")
+                "For more information, see: https://learn.microsoft.com/powershell/azure/migrate-from-azurerm-to-az")
             return
         }
             
diff --git a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/Bootstrap.ps1 b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/Bootstrap.ps1
index ca82d7787c..3caf4239b2 100644
--- a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/Bootstrap.ps1
+++ b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/Bootstrap.ps1
@@ -138,10 +138,7 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/Settings/mqtt_listener.yml") -O
 Invoke-WebRequest ($templateBaseUrl + "artifacts/Settings/mqtt_explorer_settings.json") -OutFile "$aioToolsDir\mqtt_explorer_settings.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/Settings/Bookmarks") -OutFile "$aioToolsDir\Bookmarks"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/adx_dashboard/dashboard.json") -OutFile "$aioDataExplorer\dashboard.json"
-
-#Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "$aioDirectory\wallpaper.png"
-
-Invoke-WebRequest "https://raw.githubusercontent.com/azure/arc_jumpstart_docs/canary/img/wallpaper/jumpstart_title_wallpaper_dark.png" -OutFile "$aioDirectory\wallpaper.png"
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/jumpstart_wallpaper_dark.png" -OutFile "$aioDirectory\wallpaper.png"
 
 ##############################################################
 # Testing connectivity to required URLs
diff --git a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/Bookmarks b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/Bookmarks
index 68a682ff60..fd7e6893d5 100644
--- a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/Bookmarks
+++ b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/Bookmarks
@@ -21,7 +21,7 @@
             "show_icon": false,
             "source": "unknown",
             "type": "url",
-            "url": "https://azurearcjumpstart.io/"
+            "url": "https://aka.ms/ArcJumpstart/"
          }, {
             "id": "24",
             "name": "Azure Portal",
diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Bootstrap.ps1 b/azure_jumpstart_ag/artifacts/PowerShell/Bootstrap.ps1
index 715b965d96..d8f87108e3 100644
--- a/azure_jumpstart_ag/artifacts/PowerShell/Bootstrap.ps1
+++ b/azure_jumpstart_ag/artifacts/PowerShell/Bootstrap.ps1
@@ -219,7 +219,8 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/icons/contoso.png") -OutFile $A
 Invoke-WebRequest ($templateBaseUrl + "artifacts/icons/contoso.svg") -OutFile $AgIconsDir\contoso.svg
 Invoke-WebRequest ($templateBaseUrl + "artifacts/settings/DockerDesktopSettings.json") -OutFile "$AgToolsDir\settings.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/settings/Bookmarks") -OutFile "$AgToolsDir\Bookmarks"
-Invoke-WebRequest "https://raw.githubusercontent.com/$githubAccount/azure_arc/$githubBranch/img/jumpstart_ag.png" -OutFile $AgDirectory\wallpaper.png
+Invoke-WebRequest "https://raw.githubusercontent.com/$githubAccount/arc_jumpstart_docs/$githubBranch/img/wallpaper/agora_wallpaper_dark.png" -OutFile $AgDirectory\wallpaper.png
+
 Invoke-WebRequest ($templateBaseUrl + "artifacts/monitoring/grafana-freezer-monitoring.json") -OutFile "$AgMonitoringDir\grafana-freezer-monitoring.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/monitoring/grafana-node-exporter-full.json") -OutFile "$AgMonitoringDir\grafana-node-exporter-full.json"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/monitoring/grafana-cluster-global.json") -OutFile "$AgMonitoringDir\grafana-cluster-global.json"
diff --git a/azure_jumpstart_ag/artifacts/icons/contoso.png b/azure_jumpstart_ag/artifacts/icons/contoso.png
new file mode 100644
index 0000000000..0077f7ae1e
Binary files /dev/null and b/azure_jumpstart_ag/artifacts/icons/contoso.png differ
diff --git a/azure_jumpstart_ag/artifacts/settings/Bookmarks b/azure_jumpstart_ag/artifacts/settings/Bookmarks
index 69602069fc..120ebcc514 100644
--- a/azure_jumpstart_ag/artifacts/settings/Bookmarks
+++ b/azure_jumpstart_ag/artifacts/settings/Bookmarks
@@ -182,7 +182,7 @@
             "show_icon": false,
             "source": "unknown",
             "type": "url",
-            "url": "https://azurearcjumpstart.io/"
+            "url": "https://aka.ms/ArcJumpstart/"
          }, {
             "id": "24",
             "name": "Azure Portal",
diff --git a/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1 b/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1
index f206bb4fe3..6d95966f98 100644
--- a/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1
+++ b/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1
@@ -153,7 +153,7 @@ Write-Header "Fetching GitHub Artifacts"
 
 # All flavors
 Write-Host "Fetching Artifacts for All Flavors"
-Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/arcbox_wallpaper.png" -OutFile $Env:ArcBoxDir\wallpaper.png
+Invoke-WebRequest "https://raw.githubusercontent.com/Azure/arc_jumpstart_docs/main/img/wallpaper/arcbox_wallpaper_dark.png" -OutFile $Env:ArcBoxDir\wallpaper.png
 Invoke-WebRequest ($templateBaseUrl + "artifacts/MonitorWorkbookLogonScript.ps1") -OutFile $Env:ArcBoxDir\MonitorWorkbookLogonScript.ps1
 Invoke-WebRequest ($templateBaseUrl + "artifacts/mgmtMonitorWorkbook.parameters.json") -OutFile $Env:ArcBoxDir\mgmtMonitorWorkbook.parameters.json
 Invoke-WebRequest ($templateBaseUrl + "artifacts/DeploymentStatus.ps1") -OutFile $Env:ArcBoxDir\DeploymentStatus.ps1
diff --git a/azure_jumpstart_arcbox/artifacts/installArcAgentSQLSP.ps1 b/azure_jumpstart_arcbox/artifacts/installArcAgentSQLSP.ps1
index c935a7405d..b904e9ea6d 100644
--- a/azure_jumpstart_arcbox/artifacts/installArcAgentSQLSP.ps1
+++ b/azure_jumpstart_arcbox/artifacts/installArcAgentSQLSP.ps1
@@ -24,7 +24,7 @@ $unattended = $spnClientId -And $spnTenantId -And $spnClientSecret
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
diff --git a/azure_jumpstart_arcbox/artifacts/installArcAgentSQLUser.ps1 b/azure_jumpstart_arcbox/artifacts/installArcAgentSQLUser.ps1
index b5edc2f73a..073879cf68 100644
--- a/azure_jumpstart_arcbox/artifacts/installArcAgentSQLUser.ps1
+++ b/azure_jumpstart_arcbox/artifacts/installArcAgentSQLUser.ps1
@@ -19,7 +19,7 @@ $unattended = $false
 
 # These optional variables can be replaced with valid service principal details
 # if you would like to use this script for a registration at scale scenario, i.e. run it on multiple machines remotely
-# For more information, see https://docs.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
+# For more information, see https://learn.microsoft.com/sql/sql-server/azure-arc/connect-at-scale
 #
 # For security purposes, passwords should be stored in encrypted files as secure strings
 #
diff --git a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDataOps.json b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDataOps.json
index dc3502cce1..80c6568a9b 100644
--- a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDataOps.json
+++ b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDataOps.json
@@ -40,7 +40,7 @@
       "kind": "shared",
       "properties": {
         "displayName": "[parameters('workbookDisplayName')]",
-        "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":{\"json\":\"# Jumpstart ArcBox Workbook DataOps\\r\\n\\r\\nKeep track of your ArcBox resources by selecting one of the tabs below:\\r\\n____________________________________________________________________________________________________\\r\\n\"},\"name\":\"text - 3\"},{\"type\":11,\"content\":{\"version\":\"LinkItem/1.0\",\"style\":\"tabs\",\"links\":[{\"id\":\"001e53e2-be76-428e-9081-da7ce60368d4\",\"cellValue\":\"selectedTab\",\"linkTarget\":\"parameter\",\"linkLabel\":\"Inventory\",\"subTarget\":\"Inventory\",\"style\":\"link\"},{\"id\":\"547c6d68-f351-4898-bd7f-de56cd1ea984\",\"cellValue\":\"selectedTab\",\"linkTarget\":\"parameter\",\"linkLabel\":\"Monitoring\",\"subTarget\":\"Monitoring\",\"style\":\"link\"},{\"id\":\"942dd542-ac90-4ee4-bb5d-477c931c05b4\",\"cellValue\":\"selectedTab\",\"linkTarget\":\"parameter\",\"linkLabel\":\"Security\",\"subTarget\":\"Security\",\"style\":\"link\"}]},\"customWidth\":\"100\",\"name\":\"links - 7\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"\"},\"name\":\"text - 4\"},{\"type\":1,\"content\":{\"json\":\"## Jumpstart ArcBox Metrics and Alerts\\r\\n\\r\\n💡 Select your Azure ArcBox subscription and Resource Group to see more information.\"},\"name\":\"text - 1\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{subscriptionId}\"],\"parameters\":[{\"id\":\"1f74ed9a-e3ed-498d-bd5b-f68f3836a117\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscriptionId\",\"label\":\"Subscriptions\",\"type\":6,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"includeAll\":true,\"showDefault\":false}},{\"id\":\"b616a3a3-4271-4208-b1a9-a92a78efed08\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resourceGroup\",\"label\":\"Resource groups\",\"type\":2,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"Resources\\r\\n| summarize by resourceGroup\\r\\n| order by resourceGroup asc\\r\\n| project id=resourceGroup, resourceGroup\",\"crossComponentResources\":[\"{subscriptionId}\"],\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"*\",\"showDefault\":false},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"0e85e0e4-a7e8-4ea8-b291-e444c317843a\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"ResourceTypes\",\"label\":\"Resource types\",\"type\":7,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"includeAll\":true,\"selectAllValue\":\"*\",\"showDefault\":false}},{\"id\":\"f60ea0a0-3703-44ca-a59b-df0246423f41\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"Resources\",\"type\":5,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"Resources\\r\\n| where \\\"*\\\" in ({ResourceTypes}) or type in~({ResourceTypes})\\r\\n| where '*' in~({resourceGroup}) or resourceGroup in~({resourceGroup}) \\r\\n| order by name asc\\r\\n| extend Rank = row_number()\\r\\n| project value = id, label = name, selected = Rank <= 10, group = resourceGroup\",\"crossComponentResources\":[\"{subscriptionId}\"],\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"*\",\"showDefault\":false},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"015d1a5e-357f-4e01-ac77-598e7b493db0\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"timeRange\",\"label\":\"Time Range\",\"type\":4,\"isRequired\":true,\"value\":{\"durationMs\":3600000},\"typeSettings\":{\"selectableValues\":[{\"durationMs\":300000},{\"durationMs\":900000},{\"durationMs\":1800000},{\"durationMs\":3600000},{\"durationMs\":14400000},{\"durationMs\":43200000},{\"durationMs\":86400000},{\"durationMs\":172800000},{\"durationMs\":259200000},{\"durationMs\":604800000},{\"durationMs\":1209600000},{\"durationMs\":2419200000},{\"durationMs\":2592000000}],\"allowCustom\":true}},{\"id\":\"bd6d6075-dc8f-43d3-829f-7e2245a3eb21\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"State\",\"type\":2,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"{\\\"version\\\":\\\"1.0.0\\\",\\\"content\\\":\\\"[ \\\\r\\\\n    {\\\\\\\"id\\\\\\\":\\\\\\\"New\\\\\\\", \\\\\\\"label\\\\\\\": \\\\\\\"New\\\\\\\"},\\\\r\\\\n    {\\\\\\\"id\\\\\\\":\\\\\\\"Acknowledged\\\\\\\", \\\\\\\"label\\\\\\\": \\\\\\\"Acknowledged\\\\\\\"},\\\\r\\\\n    {\\\\\\\"id\\\\\\\":\\\\\\\"Closed\\\\\\\", \\\\\\\"label\\\\\\\": \\\\\\\"Closed\\\\\\\"}\\\\r\\\\n]\\\",\\\"transformers\\\":null}\",\"crossComponentResources\":[\"{Subscription}\"],\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"*\",\"showDefault\":false},\"queryType\":8}],\"style\":\"above\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},\"name\":\"parameters\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"AlertsManagementResources | where type =~ 'microsoft.alertsmanagement/alerts'\\r\\n| where todatetime(properties.essentials.startDateTime) {timeRange}  \\r\\n| where \\\"*\\\" in ({resourceGroup}) or properties.essentials.targetResourceGroup in~ ({resourceGroup})\\r\\n| where \\\"*\\\" in ({ResourceTypes}) or properties.essentials.targetResourceType in~ ({ResourceTypes})\\r\\n| where \\\"*\\\" in ({Resources}) or properties.essentials.targetResource in~ ({Resources})\\r\\n| extend State=tostring(properties.essentials.alertState)\\r\\n| where \\\"*\\\" in ({State}) or State in ({State})\\r\\n| summarize Count=count(), New=countif(State==\\\"New\\\"), \\r\\nAcknowledged=countif(State==\\\"Acknowledged\\\"), \\r\\nClosed=countif(State==\\\"Closed\\\") \\r\\nby Severity=tostring(properties.essentials.severity)\\r\\n| order by Severity asc\",\"size\":3,\"title\":\"Alert Summary\",\"noDataMessage\":\"No alerts found\",\"exportMultipleValues\":true,\"exportedParameters\":[{\"fieldName\":\"Severity\",\"parameterName\":\"Severity\",\"parameterType\":1}],\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"{subscriptionId}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"Severity\",\"formatter\":11},{\"columnMatch\":\"Count\",\"formatter\":3,\"formatOptions\":{\"min\":0,\"palette\":\"blue\",\"aggregation\":\"Sum\"},\"numberFormat\":{\"unit\":17,\"options\":{\"style\":\"decimal\",\"maximumFractionDigits\":2}}},{\"columnMatch\":\"State\",\"formatter\":1}]}},\"showPin\":true,\"name\":\"query - 6\"},{\"type\":1,\"content\":{\"json\":\"## Azure Arc-enabled Kubernetes\"},\"name\":\"text - 9\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{resource}\"],\"parameters\":[{\"id\":\"e2b5cd30-7276-477f-a6bb-07da25ba5e5f\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"timeRange\",\"label\":\"Time Range\",\"type\":4,\"description\":\"Filter data by time range\",\"isRequired\":true,\"value\":{\"durationMs\":7776000000},\"typeSettings\":{\"selectableValues\":[{\"durationMs\":300000},{\"durationMs\":900000},{\"durationMs\":1800000},{\"durationMs\":3600000},{\"durationMs\":14400000},{\"durationMs\":43200000},{\"durationMs\":86400000},{\"durationMs\":172800000},{\"durationMs\":259200000},{\"durationMs\":604800000},{\"durationMs\":1209600000},{\"durationMs\":2419200000},{\"durationMs\":2592000000},{\"durationMs\":5184000000},{\"durationMs\":7776000000}],\"allowCustom\":true}},{\"id\":\"b8b76ad0-de1a-4b7c-90a8-f4eb277bb878\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscription\",\"label\":\"Subscription\",\"type\":6,\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"6b8d59ca-08c5-40fb-9962-5061b3e6e779\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workspaceName\",\"label\":\"Log Analytics Workspace\",\"type\":5,\"query\":\"resources\\r\\n| where type contains 'microsoft.operationalinsights/workspaces'\\r\\n| project id\",\"crossComponentResources\":[\"{subscription}\"],\"value\":\"\",\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"7aa94d19-4c5b-40e2-b14f-e29736a8f90c\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resource\",\"label\":\"Azure Arc-enabled K8S cluster\",\"type\":5,\"query\":\" Resources\\r\\n  | where type =~ 'microsoft.kubernetes/connectedclusters'\\r\\n  | project id\",\"crossComponentResources\":[\"{subscription}\"],\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"value\":\"\"},{\"id\":\"3a3fdabe-6173-4e2b-8658-38c0195fd7e2\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resourceType\",\"type\":7,\"isRequired\":true,\"query\":\"{\\\"version\\\":\\\"1.0.0\\\",\\\"content\\\":\\\"\\\\\\\"{resource:resourcetype}\\\\\\\"\\\",\\\"transformers\\\":null}\",\"typeSettings\":{\"additionalResourceOptions\":[\"value::1\"],\"showDefault\":false},\"defaultValue\":\"value::1\",\"queryType\":8},{\"id\":\"9767de49-ba31-4847-9ffc-714c02e7523c\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"clusterId\",\"type\":1,\"description\":\"Filter workspace by cluster id\",\"isHiddenWhenLocked\":true,\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"cba109cf-db6e-4261-8d3a-fe038593622d\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"clusterIdWhereClause\",\"type\":1,\"description\":\"Add to queries to filter by cluster id\",\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"criteriaContext\":{\"leftOperand\":\"resourceType\",\"operator\":\"contains\",\"rightValType\":\"static\",\"rightVal\":\"microsoft.operationalinsights/workspaces\",\"resultValType\":\"static\",\"resultVal\":\"| where ClusterId =~ '{clusterId}'\"}},{\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"ee080bd8-83dc-4fa0-b688-b2f16b956b92\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadType\",\"label\":\"Workload Type\",\"type\":2,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n| distinct ControllerKind\\r\\n| where isempty(ControllerKind) == false\\r\\n| order by ControllerKind asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::all\",\"queryType\":0,\"resourceType\":\"microsoft.kubernetes/connectedclusters\"},{\"id\":\"cf611d4b-aa93-4949-a7a1-c1d174af29ca\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadKindWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"condition\":\"if (workloadType is not empty ), result = '| where ControllerKind in ({workloadType})'\",\"criteriaContext\":{\"leftOperand\":\"workloadType\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where ControllerKind in ({workloadType})\"}},{\"condition\":\"else result = '| where \\\"a\\\" == \\\"a\\\"'\",\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"034caae5-bee3-4b66-8f80-c120a2a25c77\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"namespace\",\"label\":\"Namespace\",\"type\":2,\"description\":\"Filter the workbook by namespace\",\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n| distinct Namespace\\r\\n| where isnotempty(Namespace)\\r\\n| order by Namespace asc\",\"crossComponentResources\":[\"{Workspace}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"},{\"id\":\"faeee248-e4c3-4fae-b435-ef5fb6dabe3b\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"namespaceWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"condition\":\"if (namespace is not empty ), result = '| where Namespace in ({namespace})'\",\"criteriaContext\":{\"leftOperand\":\"namespace\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where Namespace in ({namespace})\"}},{\"condition\":\"else result = '| where \\\"a\\\" == \\\"a\\\"'\",\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"8943e259-1dde-44cd-a00b-e815eea9de34\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadName\",\"label\":\"Workload Name\",\"type\":2,\"description\":\"Filter the data for a particular workload\",\"isRequired\":true,\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{namespaceWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n| distinct ControllerName\\r\\n| where isnotempty(ControllerName)\\r\\n| order by ControllerName asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::1\"],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::1\",\"queryType\":0,\"resourceType\":\"microsoft.kubernetes/connectedclusters\"},{\"id\":\"00a9be6c-ab0b-400b-b195-9775a47ecddd\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podStatus\",\"label\":\"Pod Status\",\"type\":2,\"description\":\"Filter by Pod status like Pending/Running/Failed etc.\",\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n| where ControllerName == '{workloadName}'\\r\\n| distinct PodStatus\\r\\n| where isnotempty(PodStatus)\\r\\n| order by PodStatus asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::all\",\"queryType\":0,\"resourceType\":\"{resourceType}\",\"value\":[\"value::all\"]},{\"id\":\"388ea6aa-12d8-485a-8e80-b4d7b8994bd8\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podStatusWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"criteriaContext\":{\"leftOperand\":\"podStatus\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where PodStatus in ({podStatus})\"}},{\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":2592000000},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"64de23e6-96b5-4105-b65d-36e40f73f4ec\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podName\",\"label\":\"Pod Name\",\"type\":2,\"description\":\"Filter by pod name \",\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n| where ControllerName == '{workloadName:value}'\\r\\n{podStatusWhereClause}\\r\\n| summarize arg_max(TimeGenerated, PodStatus) by Name\\r\\n| project Name\\r\\n| where isempty(Name) == false\\r\\n| order by Name asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::all\",\"queryType\":0,\"resourceType\":\"{resourceType}\",\"value\":[\"value::all\"]},{\"id\":\"4f7059c2-ebd7-4fc2-86c4-c51e66703582\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podNameWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"condition\":\"if (podName is not empty ), result = '| where PodName in ({podName})'\",\"criteriaContext\":{\"leftOperand\":\"podName\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where PodName in ({podName})\"}},{\"condition\":\"else result = '| where \\\"a\\\" == \\\"a\\\"'\",\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"e60298ff-36da-485e-acea-73c0692b8446\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadNamespaceText\",\"type\":1,\"description\":\"For displaying name space of the selected workload\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where ControllerName == '{workloadName}'\\r\\n| summarize Namespaces=make_set(Namespace)\\r\\n| extend Namespaces = strcat_array(Namespaces, ', ')\",\"crossComponentResources\":[\"{resource}\"],\"isHiddenWhenLocked\":true,\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"{resourceType}\"},{\"id\":\"9f8d0d65-d7bc-42c9-bc5c-b394288b5216\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadTypeText\",\"type\":1,\"description\":\"For displaying workload type of the selected workload\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n| where ControllerName == '{workloadName}'\\r\\n| summarize ControllerKinds=make_set(ControllerKind)\\r\\n| extend ControllerKinds = strcat_array(ControllerKinds, ', ')\",\"crossComponentResources\":[\"{resource}\"],\"isHiddenWhenLocked\":true,\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"{resourceType}\"}],\"style\":\"above\",\"queryType\":0,\"resourceType\":\"microsoft.kubernetes/connectedclusters\"},\"name\":\"pills\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"parameters\":[{\"id\":\"55cc0c6d-51df-4e58-9543-c8b21bc71e29\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podTileStatusWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"criteriaContext\":{\"leftOperand\":\"podStatusTileText\",\"operator\":\"!=\",\"rightValType\":\"static\",\"rightVal\":\"All\",\"resultValType\":\"static\",\"resultVal\":\"| where PodStatus == '{podStatusTileText}'\"}},{\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\"}],\"style\":\"pills\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"asas\"},\"name\":\"pod-status-tile-text\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let endDateTime = {timeRange:end};\\r\\nlet startDateTime = {timeRange:start};\\r\\nlet trendBinSize = {timeRange:grain};\\r\\nlet controllerName= '{workloadName}';\\r\\nKubePodInventory\\r\\n| where TimeGenerated >= startDateTime\\r\\n| where TimeGenerated < endDateTime\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where isnotempty(ClusterName)\\r\\n| where isnotempty(Namespace)\\r\\n| where ControllerName == controllerName\\r\\n| extend PodName = Name\\r\\n{podStatusWhereClause}\\r\\n{podTileStatusWhereClause}\\r\\n{podNameWhereClause}\\r\\n| summarize PodRestartCount=max(PodRestartCount) by PodName, bin(TimeGenerated, trendBinSize)\\r\\n| order by PodName asc nulls last, TimeGenerated asc\\r\\n| serialize \\r\\n| extend prevValue=iif(prev(PodName) == PodName, prev(PodRestartCount), PodRestartCount)\\r\\n| extend RestartCount=PodRestartCount - prevValue\\r\\n| extend RestartCount=iif(RestartCount < 0, 0, RestartCount) \\r\\n| project TimeGenerated, PodName, RestartCount\\r\\n| render timechart\",\"size\":0,\"aggregation\":5,\"showAnalytics\":true,\"title\":\"Azure Arc-enabled kubernetes - Pod Restart Trend\",\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"]},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"pod-restart-trend-chart\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let endDateTime = {timeRange:end};\\r\\nlet startDateTime = {timeRange:start};\\r\\nlet trendBinSize = {timeRange:grain};\\r\\nlet controllerName= '{workloadName:value}';\\r\\nKubePodInventory\\r\\n| where TimeGenerated >= startDateTime\\r\\n| where TimeGenerated < endDateTime\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where isnotempty(ClusterName)\\r\\n| where isnotempty(Namespace)\\r\\n| where ControllerName == controllerName\\r\\n| extend PodName = Name\\r\\n{podStatusWhereClause}\\r\\n{podTileStatusWhereClause}\\r\\n{podNameWhereClause}\\r\\n| extend ContainerName=tostring(split(ContainerName, '/')[1])\\r\\n| where isempty(ContainerName) == false\\r\\n| summarize ContainerRestartCount=sum(ContainerRestartCount) by ContainerName, bin(TimeGenerated, 1tick)\\r\\n| order by ContainerName asc nulls last, TimeGenerated asc\\r\\n| serialize \\r\\n| extend prevValue=iif(prev(ContainerName) == ContainerName, prev(ContainerRestartCount), ContainerRestartCount)\\r\\n| extend RestartCount=ContainerRestartCount - prevValue\\r\\n| extend RestartCount=iif(RestartCount < 0, 0, RestartCount) \\r\\n| project TimeGenerated, ContainerName, RestartCount\\r\\n| summarize RestartCount=sum(RestartCount) by ContainerName, bin(TimeGenerated, trendBinSize)\",\"size\":0,\"aggregation\":5,\"showAnalytics\":true,\"title\":\"Azure Arc-enabled kubernetes - Container restart trend\",\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"timechart\"},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"container-restart-trend-chart\",\"styleSettings\":{\"showBorder\":true}},{\"type\":10,\"content\":{\"chartId\":\"workbook3e0e301c-50cf-4e53-ac2a-40f5eed823a0\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":3600000},\"metrics\":[{\"namespace\":\"insights.container/pods\",\"metric\":\"insights.container/pods--PodCount\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled kubernetes - Pod Count\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 19\"},{\"type\":10,\"content\":{\"chartId\":\"workbook167c4490-9cde-4fcd-be0f-401070f13ccd\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":3600000},\"metrics\":[{\"namespace\":\"insights.container/pods\",\"metric\":\"insights.container/pods--PodReadyPercentage\",\"aggregation\":4,\"splitBy\":null},{\"namespace\":\"insights.container/pods\",\"metric\":\"insights.container/pods--restartingContainerCount\",\"aggregation\":4}],\"title\":\"Azure Arc-enabled Kubernetes - Pod status\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 20\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let endDateTime = {timeRange:end};\\r\\nlet startDateTime = {timeRange:start};\\r\\nlet trendBinSize = {timeRange:grain};\\r\\nlet controllerName= '{workloadName}';\\r\\nKubePodInventory\\r\\n| where TimeGenerated >= startDateTime\\r\\n| where TimeGenerated < endDateTime\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where isnotempty(ClusterName)\\r\\n| where isnotempty(Namespace)\\r\\n| extend PodName = Name\\r\\n{podStatusWhereClause}\\r\\n{podNameWhereClause}\\r\\n| where ControllerName == controllerName\\r\\n| extend InstanceName = strcat(ClusterId, '/', ContainerName),\\r\\n         ContainerName = strcat(Name, '/', tostring(split(ContainerName, '/')[1]))\\r\\n| summarize arg_max(TimeGenerated, *) by ContainerName, Name\\r\\n{podTileStatusWhereClause}\\r\\n| extend ContainerLastStatus = todynamic(ContainerLastStatus) \\r\\n| project TimeGenerated, ContainerName, PodStatus, ContainerStatus, LastState=ContainerLastStatus.lastState, LastStateReason=ContainerLastStatus.reason, LastStateStartTime=ContainerLastStatus.startedAt,\\r\\nLastStateFinishTime=ContainerLastStatus.finishedAt\\r\\n\",\"size\":0,\"aggregation\":5,\"showAnalytics\":true,\"title\":\"Azure Arc-enabled kubernetes - Container Status for Pods\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"TimeGenerated\",\"formatter\":6,\"formatOptions\":{},\"dateFormat\":{\"showUtcTime\":null,\"formatName\":\"shortDateTimePattern\"}},{\"columnMatch\":\"PodStatus\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"Running\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"Pending\",\"representation\":\"pending\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"Failed\",\"representation\":\"failed\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Blank\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"ContainerStatus\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"Running\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"waiting\",\"representation\":\"pending\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"success\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"LastState\",\"formatter\":0,\"formatOptions\":{},\"numberFormat\":{\"unit\":0,\"options\":{\"style\":\"decimal\"},\"emptyValCustomText\":\"-\"}},{\"columnMatch\":\"LastStateReason\",\"formatter\":0,\"formatOptions\":{},\"numberFormat\":{\"unit\":0,\"options\":{\"style\":\"decimal\"},\"emptyValCustomText\":\"-\"}},{\"columnMatch\":\"LastStateStartTime\",\"formatter\":6,\"formatOptions\":{},\"dateFormat\":{\"showUtcTime\":null,\"formatName\":\"shortDateTimePattern\"}},{\"columnMatch\":\"LastStateFinishTime\",\"formatter\":6,\"formatOptions\":{},\"dateFormat\":{\"showUtcTime\":null,\"formatName\":\"shortDateTimePattern\"}}]},\"sortBy\":[]},\"showPin\":true,\"name\":\"container-status-for-pods-chart\"},{\"type\":10,\"content\":{\"chartId\":\"workbook87327d65-b260-4473-9f2b-5d90b1100543\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":2592000000},\"metrics\":[{\"namespace\":\"insights.container/nodes\",\"metric\":\"insights.container/nodes--cpuUsagePercentage\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled kubernetes cluster - Node CPU usage %\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 17\"},{\"type\":10,\"content\":{\"chartId\":\"workbook2f202f95-1281-4077-a49b-31c3e3d3271b\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":3600000},\"metrics\":[{\"namespace\":\"insights.container/nodes\",\"metric\":\"insights.container/nodes--memoryWorkingSetPercentage\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled kubernetes cluster - Node memory working set %\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 18\"},{\"type\":1,\"content\":{\"json\":\"## Azure Arc-enabled SQL Managed Instance\"},\"name\":\"text - 18\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{subscription}\"],\"parameters\":[{\"id\":\"be802690-79de-4708-8629-4c57b0d78085\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscriptionId\",\"label\":\"Subscription\",\"type\":6,\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"3bd2e749-7c3f-47fd-9f8a-7ab118be8850\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workspaceName\",\"label\":\"Log Analytics Workspace\",\"type\":5,\"query\":\"resources\\r\\n| where type contains 'microsoft.operationalinsights/workspaces'\\r\\n| project id\",\"crossComponentResources\":[\"{subscription}\"],\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"a308510f-a9f5-4ee4-a4b1-a175aa96b290\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"SQLMI\",\"label\":\"Azure Arc-enabled SQL MI\",\"type\":5,\"query\":\" Resources\\r\\n  | where type =~ 'Microsoft.AzureArcData/sqlManagedInstances'\\r\\n  | project id\",\"crossComponentResources\":[\"{subscription}\"],\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"}],\"style\":\"above\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},\"name\":\"pills - Copy\"},{\"type\":10,\"content\":{\"chartId\":\"789dd9d3-afbc-4440-8e31-7fe124f7b9ce\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.azurearcdata/sqlmanagedinstances\",\"metricScope\":0,\"resourceParameter\":\"SQLMI\",\"resourceIds\":[\"{SQLMI}\"],\"timeContext\":{\"durationMs\":86400000},\"metrics\":[{\"namespace\":\"sql server\",\"metric\":\"sql server--CPU Usage: pod-0\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled SQL MI - CPU usage\",\"gridSettings\":{\"rowLimit\":10000}},\"name\":\"metric - 0\"},{\"type\":10,\"content\":{\"chartId\":\"540fb39f-7903-4cc8-af49-679ee1f331fe\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.azurearcdata/sqlmanagedinstances\",\"metricScope\":0,\"resourceParameter\":\"SQLMI\",\"resourceIds\":[\"{SQLMI}\"],\"timeContext\":{\"durationMs\":86400000},\"metrics\":[{\"namespace\":\"sql server\",\"metric\":\"sql server--Memory Usage: pod-0\",\"aggregation\":4,\"splitBy\":null}],\"gridSettings\":{\"rowLimit\":10000}},\"name\":\"metric - 0\"},{\"type\":10,\"content\":{\"chartId\":\"31b401d2-6d90-4a57-a61a-d6e458523448\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.azurearcdata/sqlmanagedinstances\",\"metricScope\":0,\"resourceParameter\":\"SQLMI\",\"resourceIds\":[\"{SQLMI}\"],\"timeContext\":{\"durationMs\":86400000},\"metrics\":[{\"namespace\":\"sql server\",\"metric\":\"sql server--Transactions/second: pod-0\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled SQL MI - Transactions per Second\",\"gridSettings\":{\"rowLimit\":10000}},\"name\":\"metric - 0\"}]},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"Monitoring\"},\"name\":\"Monitoring\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"## Jumpstart ArcBox resource inventory\\r\\n\\r\\n💡 Select your Azure ArcBox subscription and Resource Group to see more information.\"},\"name\":\"text - 4\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{subscriptionId}\"],\"parameters\":[{\"id\":\"984514df-fff0-434c-a373-7090566e8c44\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscriptionId\",\"type\":6,\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":86400000},\"label\":\"Subscription\"},{\"id\":\"cb849a6b-937d-4e93-8d09-770554777009\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resourceGroup\",\"label\":\"Resource Group\",\"type\":2,\"query\":\"Resources\\r\\n| summarize by resourceGroup\\r\\n| order by resourceGroup asc\\r\\n| project id=resourceGroup, resourceGroup\",\"crossComponentResources\":[\"{subscriptionId}\"],\"value\":\"arcboxdataops\",\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":86400000},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"0fd9f40f-ffe0-4894-adc7-64866aa4b1e4\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"ResourceType\",\"label\":\"Resources\",\"type\":7,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":86400000},\"value\":[\"value::all\"]}],\"style\":\"pills\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},\"name\":\"parameters - 1\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Resources \\r\\n| where resourceGroup == \\\"{resourceGroup}\\\"\\r\\n| extend type = case(\\r\\ntype contains 'microsoft.netapp/netappaccounts', 'NetApp Accounts',\\r\\ntype contains \\\"microsoft.compute\\\", \\\"Azure Compute\\\",\\r\\ntype contains \\\"microsoft.logic\\\", \\\"LogicApps\\\",\\r\\ntype contains 'microsoft.keyvault/vaults', \\\"Key Vaults\\\",\\r\\ntype contains 'microsoft.storage/storageaccounts', \\\"Storage Accounts\\\",\\r\\ntype contains 'microsoft.compute/availabilitysets', 'Availability Sets',\\r\\ntype contains 'microsoft.operationalinsights/workspaces', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.operationsmanagement', 'Operations Management Resources',\\r\\ntype contains 'microsoft.insights', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.desktopvirtualization/applicationgroups', 'WVD Application Groups',\\r\\ntype contains 'microsoft.desktopvirtualization/workspaces', 'WVD Workspaces',\\r\\ntype contains 'microsoft.desktopvirtualization/hostpools', 'WVD Hostpools',\\r\\ntype contains 'microsoft.recoveryservices/vaults', 'Backup Vaults',\\r\\ntype contains 'microsoft.web', 'App Services',\\r\\ntype contains 'microsoft.managedidentity/userassignedidentities','Managed Identities',\\r\\ntype contains 'microsoft.storagesync/storagesyncservices', 'Azure File Sync',\\r\\ntype contains 'microsoft.hybridcompute/machines', 'Azure Arc-enabled servers ',\\r\\ntype contains 'Microsoft.EventHub', 'Event Hub',\\r\\ntype contains 'Microsoft.EventGrid', 'Event Grid',\\r\\ntype contains 'Microsoft.Sql', 'SQL Resources',\\r\\ntype contains 'Microsoft.HDInsight/clusters', 'HDInsight Clusters',\\r\\ntype contains 'microsoft.devtestlab', 'DevTest Labs Resources',\\r\\ntype contains 'microsoft.containerinstance', 'Container Instances Resources',\\r\\ntype contains 'microsoft.portal/dashboards', 'Azure Dashboards',\\r\\ntype contains 'microsoft.containerregistry/registries', 'Container Registry',\\r\\ntype contains 'microsoft.automation', 'Automation Resources',\\r\\ntype contains 'sendgrid.email/accounts', 'SendGrid Accounts',\\r\\ntype contains 'microsoft.datafactory/factories', 'Data Factory',\\r\\ntype contains 'microsoft.databricks/workspaces', 'Databricks Workspaces',\\r\\ntype contains 'microsoft.machinelearningservices/workspaces', 'Machine Learnings Workspaces',\\r\\ntype contains 'microsoft.alertsmanagement/smartdetectoralertrules', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.apimanagement/service', 'API Management Services',\\r\\ntype contains 'microsoft.dbforpostgresql', 'PostgreSQL Resources',\\r\\ntype contains 'microsoft.scheduler/jobcollections', 'Scheduler Job Collections',\\r\\ntype contains 'microsoft.visualstudio/account', 'Azure DevOps Organization',\\r\\ntype contains 'microsoft.network/', 'Network Resources',\\r\\ntype contains 'microsoft.migrate/' or type contains 'microsoft.offazure', 'Azure Migrate Resources',\\r\\ntype contains 'microsoft.servicebus/namespaces', 'Service Bus Namespaces',\\r\\ntype contains 'microsoft.classic', 'ASM Obsolete Resources',\\r\\ntype contains 'microsoft.resources/templatespecs', 'Template Spec Resources',\\r\\ntype contains 'microsoft.virtualmachineimages', 'VM Image Templates',\\r\\ntype contains 'microsoft.documentdb', 'CosmosDB DB Resources',\\r\\ntype contains 'microsoft.alertsmanagement/actionrules', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.kubernetes/connectedclusters', 'Azure Arc-enabled Kubernetes',\\r\\ntype contains 'microsoft.purview', 'Purview Resources',\\r\\ntype contains 'microsoft.security', 'Security Resources',\\r\\ntype contains 'microsoft.cdn', 'CDN Resources',\\r\\ntype contains 'microsoft.devices','IoT Resources',\\r\\ntype contains 'microsoft.datamigration', 'Data Migraiton Services',\\r\\ntype contains 'microsoft.cognitiveservices', 'Congitive Services',\\r\\ntype contains 'microsoft.customproviders', 'Custom Providers',\\r\\ntype contains 'microsoft.appconfiguration', 'App Services',\\r\\ntype contains 'microsoft.search', 'Search Services',\\r\\ntype contains 'microsoft.maps', 'Maps',\\r\\ntype contains 'microsoft.containerservice/managedclusters', 'AKS',\\r\\ntype contains 'microsoft.signalrservice', 'SignalR',\\r\\ntype contains 'microsoft.resourcegraph/queries', 'Resource Graph Queries',\\r\\ntype contains 'microsoft.batch', 'MS Batch',\\r\\ntype contains 'microsoft.analysisservices', 'Analysis Services',\\r\\ntype contains 'microsoft.synapse/workspaces', 'Synapse Workspaces',\\r\\ntype contains 'microsoft.synapse/workspaces/sqlpools', 'Synapse SQL Pools',\\r\\ntype contains 'microsoft.kusto/clusters', 'ADX Clusters',\\r\\ntype contains 'microsoft.resources/deploymentscripts', 'Deployment Scripts',\\r\\ntype contains 'microsoft.aad/domainservices', 'AD Domain Services',\\r\\ntype contains 'microsoft.labservices/labaccounts', 'Lab Accounts',\\r\\ntype contains 'microsoft.automanage/accounts', 'Automanage Accounts',\\r\\ntype contains 'microsoft.extendedlocation/customlocations', 'Azure Arc Custom Locations',\\r\\ntype contains 'microsoft.azurearcdata/postgresinstances', 'Azure Arc-enabled PostgresSQL',\\r\\ntype contains 'microsoft.azurearcdata/sqlmanagedinstances', 'Azure Arc-enabled SQL Managed Instance',\\r\\ntype contains 'microsoft.azurearcdata/datacontrollers', 'Azure Arc-enabled data controller',\\r\\ntype contains 'microsoft.azurearcdata/sqlserverinstances', 'Azure Arc-enabled SQL server',\\r\\nstrcat(\\\"Not Translated: \\\", type))\\r\\n| summarize count() by type\",\"size\":1,\"title\":\"Resource Count by Type\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"{subscriptionId}\"],\"visualization\":\"tiles\",\"tileSettings\":{\"titleContent\":{\"columnMatch\":\"type\",\"formatter\":1},\"leftContent\":{\"columnMatch\":\"count_\",\"formatter\":12,\"formatOptions\":{\"palette\":\"auto\"},\"numberFormat\":{\"unit\":17,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumFractionDigits\":2,\"maximumSignificantDigits\":3}}},\"showBorder\":true,\"sortCriteriaField\":\"count_\",\"sortOrderField\":2}},\"name\":\"query - Overview Resource Counts by type\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Resources\\r\\n| where type in~ ({ResourceType})\\r\\n| where resourceGroup == \\\"{resourceGroup}\\\"\\r\\n| project Resource = id, Subscription = subscriptionId, ['Resource group'] = strcat('/subscriptions/', subscriptionId, '/resourceGroups/', resourceGroup), Location = location, tags\",\"size\":2,\"title\":\"Resources List\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"{subscriptionId}\"]},\"name\":\"query - 2\"}]},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"Inventory\"},\"name\":\"Inventory\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"## Jumpstart ArcBox security overview\"},\"name\":\"text - 5\"},{\"type\":1,\"content\":{\"json\":\"💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\\r\\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\\r\\n2. Select the specific Azure subscription for which you want to configure the data export.\\r\\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\\r\\n4. Set the export target to **Log Analytics workspace**.\\r\\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\\r\\n6. From the export frequency options, select **Streaming** and **Snapshots**.\\r\\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\\r\\n\\r\\n[Learn more](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\\r\\n\\r\\n> **Notes**\\r\\n* To get full visibility, wait at least one week for the first snapshot to be exported.\\r\\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export).\"},\"showPin\":false,\"name\":\"Instructions\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{workspaceName}\"],\"parameters\":[{\"id\":\"ae721cb1-e030-4e02-8839-9c6a00f66c8a\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workspaceName\",\"type\":5,\"description\":\"Select at least one workspace that contains continuous export data based on the selected subscriptions\",\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"resources\\r\\n| where type =~ 'microsoft.operationalinsights/workspaces'\\r\\n| project id\",\"crossComponentResources\":[\"value::selected\"],\"value\":[\"value::all\"],\"typeSettings\":{\"resourceTypeFilter\":{\"microsoft.operationalinsights/workspaces\":true},\"additionalResourceOptions\":[\"value::all\"],\"showDefault\":false},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"label\":\"Log Analytics Workspace\"},{\"id\":\"4f3a03fd-9968-4ee7-b6bc-d04d3bbe14a8\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"TimeRange\",\"label\":\"Time Range\",\"type\":4,\"description\":\"Filter the data of this report to one of these predefined time ranges\",\"isRequired\":true,\"value\":{\"durationMs\":2592000000},\"typeSettings\":{\"selectableValues\":[{\"durationMs\":259200000},{\"durationMs\":604800000},{\"durationMs\":1209600000},{\"durationMs\":2419200000},{\"durationMs\":2592000000}],\"allowCustom\":true}},{\"id\":\"0117bdc3-a4e2-476b-b7cc-3d1f486e67cf\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"ErrorHandle\",\"type\":1,\"query\":\"let MissingTable = view () { print isMissing=1 };\\r\\nunion isfuzzy=true MissingTable, (SecureScores | getschema | summarize c=count() | project isMissing=iff(c > 0, 0, 1))\\r\\n| top 1 by isMissing asc\",\"crossComponentResources\":[\"{workspaceName}\"],\"isHiddenWhenLocked\":true,\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"}],\"style\":\"above\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"},\"name\":\"Parameters\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 19 19\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"#1b93eb\\\" d=\\\"M16.82 8.886c0 4.81-5.752 8.574-7.006 9.411a.477.477 0 01-.523 0C8.036 17.565 2.18 13.7 2.18 8.886V3.135a.451.451 0 01.42-.419C7.2 2.612 6.154.625 9.5.625s2.3 1.987 6.8 2.091a.479.479 0 01.523.419z\\\"></path><path fill=\\\"url(#0024423711759027356)\\\" d=\\\"M16.192 8.99c0 4.392-5.333 7.947-6.483 8.575a.319.319 0 01-.418 0c-1.15-.732-6.483-4.183-6.483-8.575V3.762a.575.575 0 01.313-.523C7.2 3.135 6.258 1.357 9.4 1.357s2.2 1.882 6.274 1.882a.45.45 0 01.419.418z\\\"></path><path d=\\\"M9.219 5.378a.313.313 0 01.562 0l.875 1.772a.314.314 0 00.236.172l1.957.284a.314.314 0 01.174.535l-1.416 1.38a.312.312 0 00-.09.278l.334 1.949a.313.313 0 01-.455.33l-1.75-.92a.314.314 0 00-.292 0l-1.75.92a.313.313 0 01-.455-.33L7.483 9.8a.312.312 0 00-.09-.278L5.977 8.141a.314.314 0 01.174-.535l1.957-.284a.314.314 0 00.236-.172z\\\" class=\\\"msportalfx-svg-c01\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px -304px 0px 0px;position: relative;top:-5px\\\"> Current score trends per subscription (not affected by the time range parameter)\\r\\n</span>\"},\"customWidth\":\"50\",\"name\":\"text - 3\"},{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 19 19\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"#1b93eb\\\" d=\\\"M16.82 8.886c0 4.81-5.752 8.574-7.006 9.411a.477.477 0 01-.523 0C8.036 17.565 2.18 13.7 2.18 8.886V3.135a.451.451 0 01.42-.419C7.2 2.612 6.154.625 9.5.625s2.3 1.987 6.8 2.091a.479.479 0 01.523.419z\\\"></path><path fill=\\\"url(#0024423711759027356)\\\" d=\\\"M16.192 8.99c0 4.392-5.333 7.947-6.483 8.575a.319.319 0 01-.418 0c-1.15-.732-6.483-4.183-6.483-8.575V3.762a.575.575 0 01.313-.523C7.2 3.135 6.258 1.357 9.4 1.357s2.2 1.882 6.274 1.882a.45.45 0 01.419.418z\\\"></path><path d=\\\"M9.219 5.378a.313.313 0 01.562 0l.875 1.772a.314.314 0 00.236.172l1.957.284a.314.314 0 01.174.535l-1.416 1.38a.312.312 0 00-.09.278l.334 1.949a.313.313 0 01-.455.33l-1.75-.92a.314.314 0 00-.292 0l-1.75.92a.313.313 0 01-.455-.33L7.483 9.8a.312.312 0 00-.09-.278L5.977 8.141a.314.314 0 01.174-.535l1.957-.284a.314.314 0 00.236-.172z\\\" class=\\\"msportalfx-svg-c01\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px 0px 0px 0px;position: relative;top:-3px;left:-4px;\\\"> Aggregated score for selected subscriptions over time\\r\\n</span>\"},\"customWidth\":\"50\",\"name\":\"text - 4\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Current score trends per subscription (show current, 7-day change from the current score as %, 30-day change from the current score as %)\\r\\nlet startOfToday = startofday(now()); \\r\\nlet offsetWeek = 6d; \\r\\nlet offsetMonth = 29d; \\r\\nlet lookbackDurationWeek = 14d; \\r\\nlet lookbackDurationMonth = 45d; \\r\\nlet endTimeWeek = startOfToday - offsetWeek; \\r\\nlet startTimeWeek = endTimeWeek - lookbackDurationWeek; \\r\\nlet endTimeMonth = startOfToday - offsetMonth; \\r\\nlet startTimeMonth = endTimeMonth - lookbackDurationMonth; \\r\\nSecureScores \\r\\n| extend Day = startofday(TimeGenerated) \\r\\n| summarize arg_max(TimeGenerated, *) by Day, SecureScoresSubscriptionId \\r\\n| summarize arg_max(Day, *) by SecureScoresSubscriptionId \\r\\n| join kind = fullouter( \\r\\n    SecureScores \\r\\n    | extend Day = startofday(TimeGenerated) \\r\\n    | where TimeGenerated > startTimeWeek and TimeGenerated <= endTimeWeek \\r\\n    | summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId \\r\\n    | project OldScoreSevenDays = PercentageScore, SecureScoresSubscriptionId \\r\\n    ) \\r\\n    on SecureScoresSubscriptionId \\r\\n| join kind = fullouter( \\r\\n    SecureScores \\r\\n    | extend Day = startofday(TimeGenerated) \\r\\n    | where TimeGenerated > startTimeMonth and TimeGenerated <= endTimeMonth \\r\\n    | summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId \\r\\n    | project OldMonthScore = PercentageScore, SecureScoresSubscriptionId \\r\\n    ) \\r\\n    on SecureScoresSubscriptionId \\r\\n| extend DiffSevenDays = tostring(((PercentageScore - OldScoreSevenDays) / OldScoreSevenDays) * 100) \\r\\n| extend DiffSevenDays = iff(isempty(DiffSevenDays), \\\"\\\", DiffSevenDays) \\r\\n| extend DiffMonth = tostring(((PercentageScore - OldMonthScore) / OldMonthScore) * 100) \\r\\n| extend DiffMonth = iff(isempty(DiffMonth), \\\"\\\", DiffMonth) \\r\\n| project SecureScoresSubscriptionId, CurrentScore = PercentageScore * 100, todouble(DiffSevenDays), todouble(DiffMonth)\",\"size\":0,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"exportFieldName\":\"SecureScoresSubscriptionId\",\"exportParameterName\":\"selectedSubscription\",\"exportDefaultValue\":\"All\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"SecureScoresSubscriptionId\",\"formatter\":15,\"formatOptions\":{\"linkTarget\":null,\"showIcon\":true,\"customColumnWidthSetting\":\"25ch\"}},{\"columnMatch\":\"CurrentScore\",\"formatter\":4,\"formatOptions\":{\"min\":0,\"max\":100,\"palette\":\"redGreen\",\"customColumnWidthSetting\":\"20ch\"},\"numberFormat\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumSignificantDigits\":2}}},{\"columnMatch\":\"DiffSevenDays\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"<\",\"thresholdValue\":\"0\",\"representation\":\"trenddown\",\"text\":\"{0}{1}\"},{\"operator\":\">\",\"thresholdValue\":\"0\",\"representation\":\"trendup\",\"text\":\"{0}{1}\"},{\"operator\":\"is Empty\",\"thresholdValue\":\"0\",\"representation\":\"Normal\",\"text\":\"N/A\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Blank\",\"text\":\"{0}{1}\"}],\"customColumnWidthSetting\":\"20ch\"},\"numberFormat\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumSignificantDigits\":2}}},{\"columnMatch\":\"DiffMonth\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"<\",\"thresholdValue\":\"0\",\"representation\":\"trenddown\",\"text\":\"{0}{1}\"},{\"operator\":\">\",\"thresholdValue\":\"0\",\"representation\":\"trendup\",\"text\":\"{0}{1}\"},{\"operator\":\"is Empty\",\"thresholdValue\":\"0\",\"representation\":\"Normal\",\"text\":\"N/A\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Blank\",\"text\":\"{0}{1}\"}],\"customColumnWidthSetting\":\"20ch\"},\"numberFormat\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumSignificantDigits\":2}}}],\"rowLimit\":500,\"sortBy\":[{\"itemKey\":\"$gen_link_SecureScoresSubscriptionId_0\",\"sortOrder\":1}],\"labelSettings\":[{\"columnId\":\"SecureScoresSubscriptionId\",\"label\":\"Subscription name\"},{\"columnId\":\"CurrentScore\",\"label\":\"Current score %\"},{\"columnId\":\"DiffSevenDays\",\"label\":\"7-day change\"},{\"columnId\":\"DiffMonth\",\"label\":\"30-day change\"}]},\"sortBy\":[{\"itemKey\":\"$gen_link_SecureScoresSubscriptionId_0\",\"sortOrder\":1}]},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"ScoreTrends\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Aggregated score for all subscriptions over time\\r\\nSecureScores\\r\\n| where '{selectedSubscription}' == 'All' or SecureScoresSubscriptionId == '{selectedSubscription}'\\r\\n| where MaxScore>0\\r\\n| extend subscriptionScore = CurrentScore/MaxScore \\r\\n| extend subScoreXsubWeight = subscriptionScore*Weight \\r\\n| extend Day = startofday(TimeGenerated) \\r\\n| summarize upperValue = sum(subScoreXsubWeight), underValue = sum(todouble(Weight)) by Day\\r\\n| extend OverallScore = 100*((upperValue)/(underValue))\\r\\n| project OverallScore, Day\",\"size\":0,\"aggregation\":5,\"showAnnotations\":true,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"timeBrushParameterName\":\"TimeRange\",\"timeBrushExportOnlyWhenBrushed\":true,\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"timechart\",\"chartSettings\":{\"seriesLabelSettings\":[{\"seriesName\":\"overallScore\",\"label\":\"Overall Score\",\"color\":\"lightBlue\"}],\"ySettings\":{\"min\":0,\"max\":100}}},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"ScoreOvertime\"}],\"exportParameters\":true},\"conditionalVisibilities\":[{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"},{\"parameterName\":\"ErrorHandle\",\"comparison\":\"isNotEqualTo\",\"value\":\"1\"}],\"name\":\"SecureScore\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 18 18\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"url(#ae5004eb-b3cc-4afc-9498-a0eb145de4dc)\\\" d=\\\"M6.437 1.856l-.292-.292a.5.5 0 00-.707 0L2.606 4.392 1.441 3.229a.5.5 0 00-.707 0l-.293.293a.5.5 0 000 .707l1.812 1.815a.5.5 0 00.354.146.5.5 0 00.353-.146l3.477-3.481a.5.5 0 000-.707z\\\"></path><rect width=\\\"10.366\\\" height=\\\"1.895\\\" x=\\\"7.339\\\" y=\\\"2.949\\\" fill=\\\"#a3a3a3\\\" rx=\\\".923\\\"></rect><rect width=\\\"10.366\\\" height=\\\"1.895\\\" x=\\\"7.339\\\" y=\\\"8.073\\\" fill=\\\"#a3a3a3\\\" rx=\\\".923\\\"></rect><rect width=\\\"10.366\\\" height=\\\"1.895\\\" x=\\\"7.339\\\" y=\\\"13.196\\\" fill=\\\"#a3a3a3\\\" rx=\\\".923\\\"></rect><path fill=\\\"url(#a1226368-080a-4756-9af4-a472e9b2c59c)\\\" d=\\\"M6.437 7.053l-.292-.293a.5.5 0 00-.707 0L2.606 9.588 1.441 8.425a.5.5 0 00-.707 0l-.293.293a.5.5 0 000 .707l1.812 1.815a.5.5 0 00.354.147.5.5 0 00.353-.147l3.477-3.48a.5.5 0 000-.707z\\\"></path><path fill=\\\"url(#a87a55b1-552d-4fae-9ce3-1c309da31213)\\\" d=\\\"M6.437 12.249l-.292-.293a.5.5 0 00-.354-.146.494.494 0 00-.353.146l-2.832 2.828-1.165-1.163a.5.5 0 00-.707 0l-.293.292a.5.5 0 000 .707l1.812 1.815a.5.5 0 00.707 0l3.477-3.48a.5.5 0 000-.706z\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px -304px 0px 0px;position: relative;top:-5px\\\"> Top recommendations with recent increase in unhealthy resources\\r\\n</span> <br>\\r\\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Recommendations with the most resources that have become unhealthy in the periods shown\"},\"customWidth\":\"50\",\"name\":\"UnhealthyRecommendations\"},{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 34 28\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"#949494\\\" d=\\\"M2.44 22.93a.19.19 0 000 .13.24.24 0 00.09.08l1.73 1 2.93 1.69a.25.25 0 00.19 0 .31.31 0 00.16-.11l1-1.68a.21.21 0 000-.17.22.22 0 00-.11-.14L5 21.78a.24.24 0 01-.08-.09.21.21 0 010-.12V6.14a.16.16 0 010-.12.24.24 0 01.08-.09L8.46 4a.22.22 0 00.11-.14.2.2 0 000-.17L7.57 2l-.06-.08h-.09a.17.17 0 00-.1 0h-.1L4.35 3.53l-1.79 1a.24.24 0 00-.09.08.18.18 0 000 .12z\\\"></path><path fill=\\\"#a3a3a3\\\" d=\\\"M4.89 6L5 5.93 8.42 4a.18.18 0 00.07 0 .18.18 0 000-.08.17.17 0 000-.1.11.11 0 000-.08L7.52 2a.22.22 0 000-.08.16.16 0 00-.08-.06h-.1a.29.29 0 00-.1 0L4.31 3.53l-1.78 1a.09.09 0 00-.09.08l1.34.77zm3.53 17.7L5 21.75a.35.35 0 01-.11-.13l-2.44 1.49h.08l1.72 1 3 1.66a.19.19 0 00.09 0h.09l.09-.05.06-.07 1-1.68a.15.15 0 000-.09.24.24 0 000-.08.18.18 0 00-.05-.07s-.08-.03-.11-.03z\\\"></path><path fill=\\\"#949494\\\" d=\\\"M32.51 22.93a.21.21 0 010 .12.2.2 0 01-.09.09l-1.73 1-2.93 1.69a.25.25 0 01-.19 0 .31.31 0 01-.16-.11l-1-1.68a.25.25 0 010-.17.21.21 0 01.1-.14l3.45-1.95a.26.26 0 00.11-.21V6.14A.19.19 0 0030 6l-.08-.08L26.48 4a.21.21 0 01-.1-.14.25.25 0 010-.17l1-1.68.06-.08h.09a.16.16 0 01.1 0h.1l2.87 1.6 1.79 1a.24.24 0 01.09.08.27.27 0 010 .12z\\\"></path><path fill=\\\"#a3a3a3\\\" d=\\\"M30.06 6L30 5.93 26.53 4h-.08v-.08a.34.34 0 010-.1.2.2 0 010-.08l1-1.68a.22.22 0 01.05-.08.16.16 0 01.08-.06h.1a.29.29 0 01.1 0l2.88 1.66 1.78 1a.09.09 0 01.09.08l-1.34.77zm-3.53 17.7L30 21.75a.26.26 0 00.1-.13l2.43 1.49h-.08l-1.72 1-3 1.66h-.18a.26.26 0 01-.09-.05l-.06-.07-1-1.68a.28.28 0 010-.09.24.24 0 010-.08.18.18 0 01.05-.07.12.12 0 01.08-.03z\\\"></path><path d=\\\"M25.57 14.31H14.48a.86.86 0 01-.87-.77.79.79 0 01.87-.67h11.09a.79.79 0 01.87.67.86.86 0 01-.87.77zm0-5.61H14.48a.86.86 0 01-.87-.77.79.79 0 01.87-.67h11.09a.79.79 0 01.87.67.86.86 0 01-.87.77zm0 11.22H14.48a.86.86 0 01-.87-.77.79.79 0 01.87-.67h11.09a.79.79 0 01.87.67.86.86 0 01-.87.77z\\\" class=\\\"msportalfx-svg-c03\\\"></path><path d=\\\"M8.44 7.73l.62-.63 1.27 1.26 2.52-2.52.63.63-3.15 3.15zm0 5.62l.62-.63L10.33 14l2.52-2.52.63.63-3.15 3.15zm0 5.61l.62-.63 1.27 1.26 2.52-2.52.63.63-3.15 3.15z\\\" class=\\\"msportalfx-svg-c13\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px -304px 0px 0px;position: relative;top:-5px\\\"> Security controls scores over time (weekly)\\r\\n</span>\\r\\n\\r\\n\"},\"customWidth\":\"50\",\"name\":\"text - 3\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Top recommendations with recent increase in unhealthy resources\\r\\nSecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState  =~ \\\"Unhealthy\\\"\\r\\n| summarize UnhealthyAssessedResources = dcount(AssessedResourceId),RecommendationName = any(RecommendationName) by RecommendationId\\r\\n| project  RecommendationName, UnhealthyAssessedResources\\r\\n| sort by UnhealthyAssessedResources desc\\r\\n| take 10\",\"size\":0,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"table\",\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"RecommendationName\",\"formatter\":0,\"formatOptions\":{\"customColumnWidthSetting\":\"70ch\"},\"numberFormat\":{\"unit\":0,\"options\":{\"style\":\"decimal\",\"useGrouping\":false}},\"tooltipFormat\":{\"tooltip\":\"View recommendation '{0}'\"}},{\"columnMatch\":\"UnhealthyAssessedResources\",\"formatter\":4,\"formatOptions\":{\"min\":0,\"palette\":\"blue\",\"compositeBarSettings\":{\"labelText\":\"\",\"columnSettings\":[]},\"customColumnWidthSetting\":\"25ch\"}},{\"columnMatch\":\"RecommendationId\",\"formatter\":5}],\"labelSettings\":[{\"columnId\":\"RecommendationName\",\"label\":\"Recommendation name\"},{\"columnId\":\"UnhealthyAssessedResources\",\"label\":\"Unhealthy count\"}]},\"tileSettings\":{\"showBorder\":false,\"titleContent\":{\"columnMatch\":\"RecommendationName\",\"formatter\":1},\"leftContent\":{\"columnMatch\":\"UnhealthyCount\",\"formatter\":12,\"formatOptions\":{\"palette\":\"auto\"},\"numberFormat\":{\"unit\":17,\"options\":{\"maximumSignificantDigits\":3,\"maximumFractionDigits\":2}}}},\"graphSettings\":{\"type\":0,\"topContent\":{\"columnMatch\":\"RecommendationName\",\"formatter\":1},\"centerContent\":{\"columnMatch\":\"UnhealthyCount\",\"formatter\":1,\"numberFormat\":{\"unit\":17,\"options\":{\"maximumSignificantDigits\":3,\"maximumFractionDigits\":2}}}}},\"customWidth\":\"50\",\"name\":\"query - 7\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Security controls score over time (weekly) \\r\\nlet subscriptionsWeight = \\r\\n    SecureScores\\r\\n    | where '{selectedSubscription}' == 'All' or SecureScoresSubscriptionId == '{selectedSubscription}'\\r\\n    | summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId \\r\\n    | project SecureScoresSubscriptionId, SubscriptionWeight = Weight; \\r\\nSecureScoreControls \\r\\n| where MaxScore > 0\\r\\n| where IsSnapshot == true\\r\\n| extend Week = startofweek(TimeGenerated) \\r\\n| summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId, ControlId, Week \\r\\n| join kind=inner(\\r\\n    subscriptionsWeight\\r\\n  ) on SecureScoresSubscriptionId \\r\\n| extend WeightedControlScore = PercentageScore * SubscriptionWeight \\r\\n| summarize WeightedScoreAvg = sum(WeightedControlScore)/sum(SubscriptionWeight)*100, ControlName = any(ControlName) by ControlId, Week\\r\\n| order by WeightedScoreAvg desc\",\"size\":0,\"aggregation\":5,\"showAnnotations\":true,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"timechart\",\"graphSettings\":{\"type\":0,\"topContent\":{\"columnMatch\":\"ControlId\",\"formatter\":1},\"centerContent\":{\"columnMatch\":\"WeightedAvgPerControl\",\"formatter\":1,\"numberFormat\":{\"unit\":17,\"options\":{\"maximumSignificantDigits\":3,\"maximumFractionDigits\":2}}}},\"chartSettings\":{\"group\":\"ControlName\",\"createOtherGroup\":0,\"showLegend\":true,\"ySettings\":{\"numberFormatSettings\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":true}},\"min\":0,\"max\":100}}},\"customWidth\":\"50\",\"name\":\"Controls\"}]},\"conditionalVisibilities\":[{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"},{\"parameterName\":\"ErrorHandle\",\"comparison\":\"isNotEqualTo\",\"value\":\"1\"}],\"name\":\"group - 8\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 18 18\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"url(#18748923018756614)\\\" d=\\\"M1.9.947h14.21v16.106a.947.947 0 01-.947.947H2.842a.947.947 0 01-.947-.947z\\\"></path><path d=\\\"M3.8.944h10.42V15.2a.949.949 0 01-.947.95H4.746a.949.949 0 01-.946-.95z\\\" class=\\\"msportalfx-svg-c01\\\"></path><path fill=\\\"#0078d4\\\" d=\\\"M7.579.474a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm-1.895 0a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm5.684 0a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm-1.894 0a.474.474 0 00-.948 0v.947a.474.474 0 00.948 0zm3.789 0a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0z\\\"></path><path fill=\\\"#005ba1\\\" d=\\\"M11.368 13.737a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm1.895-2.837a.474.474 0 10-.947 0v3.789a.474.474 0 10.947 0zm-7.579 2.837a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm1.895-1.895a.474.474 0 10-.947 0v2.842a.474.474 0 10.947 0zm1.895.947a.474.474 0 00-.948 0v1.895a.474.474 0 00.948 0z\\\"></path><path fill=\\\"#b796f9\\\" d=\\\"M10.976 12.147l-3.824-1.912-1.774 1.775-.335-.335L7.059 9.66l3.754 1.877 1.779-2.668.395.262-2.011 3.016z\\\"></path><path fill=\\\"#773adc\\\" d=\\\"M7.105 10.421a.474.474 0 10-.473-.474.474.474 0 00.473.474zM9 11.374a.477.477 0 10-.474-.476.475.475 0 00.474.476zm1.9.948a.477.477 0 10-.474-.477.475.475 0 00.474.477zm-5.689-.006a.474.474 0 10-.474-.474.474.474 0 00.474.474zm7.578-2.837A.477.477 0 1012.316 9a.475.475 0 00.473.479z\\\"></path><path fill=\\\"#1b93eb\\\" d=\\\"M11.368 5.487c0 1.541-1.86 2.746-2.266 3.014a.154.154 0 01-.17 0c-.406-.234-2.3-1.473-2.3-3.014V3.646a.144.144 0 01.135-.134c1.489-.034 1.15-.67 2.233-.67s.744.636 2.2.67a.154.154 0 01.169.134z\\\"></path><path fill=\\\"url(#381967167170842)\\\" d=\\\"M10.9 5.52c0 1.284-1.489 2.288-1.814 2.512a.119.119 0 01-.135 0C8.621 7.836 7.105 6.8 7.105 5.52V3.986a.118.118 0 01.109-.112c1.186-.028.92-.558 1.786-.558s.6.53 1.759.558a.125.125 0 01.136.112z\\\"></path><path d=\\\"M8.914 3.972a.1.1 0 01.172 0l.332.707a.094.094 0 00.071.054l.75.114a.1.1 0 01.053.16l-.548.562a.1.1 0 00-.026.081l.129.789a.1.1 0 01-.139.1l-.662-.366a.1.1 0 00-.092 0l-.662.366a.1.1 0 01-.139-.1l.129-.789a.1.1 0 00-.026-.081l-.548-.562a.1.1 0 01.053-.16l.75-.114a.094.094 0 00.071-.054z\\\" class=\\\"msportalfx-svg-c01\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px 0px 0px 0px;position: relative;top:-3px;left:-4px;\\\"> Resources changed over time\\r\\n</span> <br>\\r\\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Select a recommendation to see its changes\"},\"name\":\"text - 2\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Recommendations changes over time (count how many resources have been changed to unhealthy, heathy, and not applicable, per recommendation) \\r\\nlet unhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Unhealthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet healthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Healthy' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet notApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'NotApplicable' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notUnhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Unhealthy' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notHealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Healthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notNotApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'NotApplicable' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notHealthyToHealthy =  \\r\\n    notHealthy \\r\\n    | join (\\r\\n        healthy\\r\\n      ) on RecommendationId, AssessedResourceId \\r\\n    | where TimeGenerated < TimeGenerated1 \\r\\n    | summarize ToHealthyCount = count(), RecommendationName=any(RecommendationName) by RecommendationId;\\r\\nlet notUnhealthyToUnhealthy =  \\r\\n    notUnhealthy \\r\\n    | join ( \\r\\n        unhealthy\\r\\n     ) on RecommendationId, AssessedResourceId \\r\\n    | where TimeGenerated < TimeGenerated1 \\r\\n    | summarize ToUnhealthyCount = count(), RecommendationName=any(RecommendationName) by RecommendationId;\\r\\nlet notNotApplicableToNotApplicable =  \\r\\n    notNotApplicable \\r\\n    | join (\\r\\n        notApplicable\\r\\n     ) on RecommendationId, AssessedResourceId \\r\\n    | where TimeGenerated < TimeGenerated1 \\r\\n    | summarize ToNotApplicableCount = count(), RecommendationName=any(RecommendationName) by RecommendationId;\\r\\n// Union \\r\\nunion notHealthyToHealthy, notUnhealthyToUnhealthy, notNotApplicableToNotApplicable\\r\\n| summarize RecommendationName=any(RecommendationName), ToUnhealthyCount = sum(ToUnhealthyCount), ToHealthyCount = sum(ToHealthyCount), ToNotApplicableCount = sum(ToNotApplicableCount) by RecommendationId\\r\\n| order by ToUnhealthyCount desc\",\"size\":0,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"exportedParameters\":[{\"fieldName\":\"RecommendationId\",\"parameterName\":\"RecommendationId\"},{\"fieldName\":\"RecommendationName\",\"parameterName\":\"RecommendationName\",\"parameterType\":1}],\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"RecommendationId\",\"formatter\":5},{\"columnMatch\":\"RecommendationName\",\"formatter\":7,\"formatOptions\":{\"linkTarget\":\"Url\",\"bladeOpenContext\":{\"bladeName\":\"RecommendationsBlade\",\"extensionName\":\"Microsoft_Azure_Security\",\"bladeParameters\":[{\"name\":\"assessmentKey\",\"source\":\"column\",\"value\":\"RecommendationId\"}]},\"customColumnWidthSetting\":\"100ch\"}},{\"columnMatch\":\"UnhealthyCount\",\"formatter\":8,\"formatOptions\":{\"palette\":\"redBright\"}},{\"columnMatch\":\"HealthyCount\",\"formatter\":8,\"formatOptions\":{\"palette\":\"green\"}},{\"columnMatch\":\"NotApplicableCount\",\"formatter\":8,\"formatOptions\":{\"palette\":\"gray\"}},{\"columnMatch\":\"AssessedResourceId\",\"formatter\":13,\"formatOptions\":{\"linkTarget\":null,\"showIcon\":true}}],\"labelSettings\":[{\"columnId\":\"RecommendationName\",\"label\":\"Recommendation name\"},{\"columnId\":\"ToUnhealthyCount\",\"label\":\"To unhealthy\"},{\"columnId\":\"ToHealthyCount\",\"label\":\"To healthy\"},{\"columnId\":\"ToNotApplicableCount\",\"label\":\"To not applicable\"}]},\"sortBy\":[]},\"name\":\"RecommendationStatusChanges\"},{\"type\":1,\"content\":{\"json\":\"To view changes over time on a specific recommendation, please select any from the list above.\",\"style\":\"info\"},\"conditionalVisibility\":{\"parameterName\":\"RecommendationId\",\"comparison\":\"isEqualTo\"},\"name\":\"ChangeLogBanner\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let unhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Unhealthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId\\r\\n| project UnhealthyRecommendationId = RecommendationId, UnhealthyResourceId = AssessedResourceId, UnhealhyTime =  TimeGenerated, tostring(SubscriptionId);\\r\\nlet notApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'NotApplicable'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId\\r\\n| project NARecommendationId = RecommendationId, NAResourceId = AssessedResourceId, NATime =  TimeGenerated, tostring(SubscriptionId);\\r\\nlet healthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Healthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId\\r\\n| project HealthyRecommendationId = RecommendationId, HealthyResourceId = AssessedResourceId, HealhyTime =  TimeGenerated, tostring(SubscriptionId);\\r\\nlet NotHealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Healthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet NotUnhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Unhealthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet NotNotApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'NotApplicable'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet 1_to_Healthy = \\r\\n    NotHealthy\\r\\n    | extend orignalState = RecommendationState\\r\\n    | join healthy on $left.RecommendationId == $right.HealthyRecommendationId, $left.AssessedResourceId == $right.HealthyResourceId\\r\\n    | where TimeGenerated < HealhyTime\\r\\n    | extend update = \\\"To healthy\\\"\\r\\n    | project RecommendationId, RecommendationName, Description, OriginalState = RecommendationState, update, TimeGenerated, RecommendationSeverity, tostring(SubscriptionId), AssessedResourceId, RecommendationLink;\\r\\n//1_to_Healthy\\r\\nlet 2_to_Unhealthy = \\r\\n    NotUnhealthy\\r\\n    | extend orignalState = RecommendationState\\r\\n    | join unhealthy on $left.RecommendationId == $right.UnhealthyRecommendationId, $left.AssessedResourceId == $right.UnhealthyResourceId\\r\\n    | where TimeGenerated < UnhealhyTime\\r\\n    | extend update = \\\"To unhealthy\\\"\\r\\n    | project RecommendationId, RecommendationName, Description, OriginalState = RecommendationState, update, TimeGenerated, RecommendationSeverity, tostring(SubscriptionId), AssessedResourceId, RecommendationLink;\\r\\n//2_to_Unhealthy\\r\\nlet 3_to_NotApplicable = \\r\\n    NotNotApplicable\\r\\n    | extend orignalState = RecommendationState\\r\\n    | join notApplicable on $left.RecommendationId == $right.NARecommendationId, $left.AssessedResourceId == $right.NAResourceId\\r\\n    | where TimeGenerated < NATime\\r\\n    | extend update = \\\"To not applicable\\\"\\r\\n    | extend NotApplicableReason = iff(isempty(NotApplicableReason), \\\"NA\\\", NotApplicableReason)\\r\\n    | project RecommendationId, RecommendationName, Description, OriginalState = RecommendationState, update, TimeGenerated, RecommendationSeverity, tostring(SubscriptionId), AssessedResourceId, RecommendationLink, NotApplicableReason;\\r\\n// JOIN\\r\\nunion 1_to_Healthy, 2_to_Unhealthy, 3_to_NotApplicable\\r\\n| extend FullRecommendationLink = strcat(\\\"http://\\\",RecommendationLink)\\r\\n| extend AssessedResourceId = iff(AssessedResourceId==\\\"N/A\\\", extract(\\\".*onPremiseMachines/(.+)\\\",1, url_decode(RecommendationLink)), AssessedResourceId)\\r\\n| project-away RecommendationLink\\r\\n| where RecommendationId == '{RecommendationId}'\",\"size\":0,\"title\":\"Changes for \\\"{RecommendationName}\\\"\",\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"showExportToExcel\":true,\"exportToExcelOptions\":\"all\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"RecommendationId\",\"formatter\":5},{\"columnMatch\":\"RecommendationName\",\"formatter\":5},{\"columnMatch\":\"Description\",\"formatter\":5},{\"columnMatch\":\"SubscriptionId\",\"formatter\":15,\"formatOptions\":{\"linkTarget\":null,\"showIcon\":true}},{\"columnMatch\":\"NotApplicableReason\",\"formatter\":0,\"formatOptions\":{\"customColumnWidthSetting\":\"30ch\"}},{\"columnMatch\":\"FullRecommendationLink\",\"formatter\":7,\"formatOptions\":{\"linkTarget\":\"Url\",\"linkLabel\":\"View\",\"linkIsContextBlade\":false}}],\"rowLimit\":1000,\"hierarchySettings\":{\"treeType\":1,\"groupBy\":[\"update\"]},\"labelSettings\":[{\"columnId\":\"RecommendationName\",\"label\":\"Recommendation name\"},{\"columnId\":\"OriginalState\",\"label\":\"Original state\"},{\"columnId\":\"update\",\"label\":\"Updated state\"},{\"columnId\":\"TimeGenerated\",\"label\":\"Time of change\"},{\"columnId\":\"RecommendationSeverity\",\"label\":\"Severity\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription\"},{\"columnId\":\"AssessedResourceId\",\"label\":\"Resource\"},{\"columnId\":\"NotApplicableReason\",\"label\":\"Reason\"},{\"columnId\":\"FullRecommendationLink\",\"label\":\"View recommendation\"}]},\"sortBy\":[]},\"conditionalVisibility\":{\"parameterName\":\"RecommendationId\",\"comparison\":\"isNotEqualTo\"},\"name\":\"ChangeLogDetails\"}]},\"conditionalVisibilities\":[{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"},{\"parameterName\":\"ErrorHandle\",\"comparison\":\"isNotEqualTo\",\"value\":\"1\"}],\"name\":\"ChangeLog\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"title\":\"Machines not sending current heartbeats\",\"items\":[{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-15m)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 15 minutes\",\"noDataMessage\":\"No machines found not reporting for more than 15 minutes.\",\"timeContext\":{\"durationMs\":86400000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 0\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-24h)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 24 hours\",\"noDataMessage\":\"No machines found not reporting for more than 24 hours.\",\"timeContext\":{\"durationMs\":172800000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 1\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-48h)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 48 hours\",\"noDataMessage\":\"No machines found not reporting for more than 48 hours.\",\"timeContext\":{\"durationMs\":604800000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 2\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-7d)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 7 days\",\"noDataMessage\":\"No machines found not reporting for more than 7 days.\",\"timeContext\":{\"durationMs\":2592000000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 3\",\"styleSettings\":{\"showBorder\":true}}]},\"conditionalVisibilities\":[{\"parameterName\":\"SelectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"NotReportingTab\"},{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"}],\"name\":\"MachinesNotReporting\",\"styleSettings\":{\"showBorder\":true}},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"title\":\"Protection Status\",\"items\":[{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"securityresources\\n| where type =~ \\\"microsoft.security/assessments\\\" or type =~ \\\"microsoft.security/softwareInventories\\\"\\n| extend assessmentStatusCode = case(type =~ \\\"microsoft.security/assessments\\\", tostring(properties.status.code), \\\"\\\")\\n| extend severity = case(assessmentStatusCode =~ \\\"unhealthy\\\", tolower(tostring(properties.metadata.severity)), tolower(assessmentStatusCode))\\n| extend exemptionType = case(tolower(type) != \\\"microsoft.security/assessments\\\",\\\"N/A\\\", case(properties.status.cause =~ \\\"exempt\\\", \\\"Yes\\\", \\\"No\\\"))\\n| extend source = case(type =~ \\\"microsoft.security/assessments\\\", tostring(properties.resourceDetails.Source), \\\"\\\")\\n| extend resourceId = trim(\\\" \\\", tolower(tostring(case(source =~ \\\"azure\\\", properties.resourceDetails.Id,\\n                                                                            source =~ \\\"aws\\\" and isnotempty(tostring(properties.resourceDetails.ConnectorId)), properties.resourceDetails.Id,\\n                                                                            source =~ \\\"aws\\\", properties.resourceDetails.AzureResourceId,\\n                                                                            source =~ \\\"gcp\\\", properties.resourceDetails.AzureResourceId,\\n                                                                            type =~ \\\"microsoft.security/assessments\\\", extract(\\\"^(.+)/providers/Microsoft.Security/assessments/.+$\\\",1,id),extract(\\\"^(.+)/providers/Microsoft.Security/softwareInventories/.+$\\\",1,id)))))\\n| extend resourceName = iff(source =~ \\\"aws\\\" and isnotempty(tostring(properties.resourceDetails.ConnectorId)), tostring(properties.additionalData.ResourceName), extract(@\\\"(.+)/(.+)\\\", 2, resourceId))\\n| extend regexResourceId = extract_all(@\\\"/providers/([^/]+)(?:/([^/]+)/[^/]+(?:/([^/]+)/[^/]+)?)?/([^/]+)/[^/]+$\\\", resourceId)\\n| extend RegexResourceType = regexResourceId[0]\\n| extend mainType = RegexResourceType[1], extendedType = RegexResourceType[2], resourceType = RegexResourceType[3]\\n| extend providerName = RegexResourceType[0],\\n                        mainType = case(mainType !~ \\\"\\\", strcat(\\\"/\\\",mainType), \\\"\\\"),\\n                        extendedType = case(extendedType!~ \\\"\\\", strcat(\\\"/\\\",extendedType), \\\"\\\"),\\n                        resourceType = case(resourceType!~ \\\"\\\", strcat(\\\"/\\\",resourceType), \\\"\\\")\\n| extend array = split(resourceId, '/')\\n| extend typeFullPath = case(\\n                    array_length(array) == 3, 'subscription',\\n                    array_length(array) == 5, 'resourcegroups',\\n                    source =~ \\\"aws\\\" and isnotempty(tostring(properties.resourceDetails.ConnectorId)), tolower(strcat(providerName, mainType, \\\"/\\\", tostring(properties.additionalData.ResourceProvider), tostring(properties.additionalData.ResourceType))),\\n                    strcat(providerName, mainType, extendedType, resourceType))\\n| extend resourceType = case(typeFullPath =~ 'resourcegroups' or typeFullPath =~ 'subscription', typeFullPath, tolower(trim(\\\"/\\\", resourceType)))\\n| extend assessmentKey = case(type =~ \\\"microsoft.security/assessments\\\", tostring(name), \\\"\\\")\\n| extend softwareVendorName = case(type =~ \\\"microsoft.security/softwareInventories\\\", tostring(properties.vendor), \\\"\\\")\\n| extend softwareName = case(type =~ \\\"microsoft.security/softwareInventories\\\", tostring(properties.softwareName), \\\"\\\")\\n| extend softwareVersion = case(type =~ \\\"microsoft.security/softwareInventories\\\", tostring(properties.version), \\\"\\\")\\n| extend softwareNameIdentifier = case(type =~ \\\"microsoft.security/softwareInventories\\\", strcat(softwareVendorName, \\\",\\\", softwareName, \\\",\\\", softwareVersion), \\\"\\\")\\n| extend environment = case(type =~ \\\"microsoft.security/assessments\\\", properties.resourceDetails[\\\"Source\\\"], \\\"\\\")\\n| extend environment = case(environment =~ \\\"onpremise\\\", tolower(\\\"Non-Azure\\\"), tolower(environment))\\n| extend osTypeProperty = properties.additionalData[\\\"OS Type\\\"]\\n| extend osType = case(isnotempty(osTypeProperty), osTypeProperty, \\\"\\\")\\n| extend hasAgent = case(assessmentKey == \\\"d1db3318-01ff-16de-29eb-28b344515626\\\" or assessmentKey == \\\"45cfe080-ceb1-a91e-9743-71551ed24e94\\\" or assessmentKey == \\\"720a3e77-0b9a-4fa9-98b6-ddf0fd7e32c1\\\" or assessmentKey == \\\"27ac71b1-75c5-41c2-adc2-858f5db45b08\\\", assessmentStatusCode, \\\"\\\")\\n| extend hasAgent = case(assessmentKey == \\\"4ab6e3c5-74dd-8b35-9ab9-f61b30875b27\\\" or assessmentKey == \\\"181ac480-f7c4-544b-9865-11b8ffe87f47\\\" or assessmentKey == \\\"4fb67663-9ab9-475d-b026-8c544cced439\\\" , \\\"healthy\\\", hasAgent)\\n| extend workspaceAzureResourceId = case(hasAgent !~ \\\"\\\", properties.additionalData[\\\"Reporting workspace azure id\\\"], \\\"\\\")\\n| extend workspaceName = case(workspaceAzureResourceId !~ \\\"\\\", extract(@\\\"(.+)/(.+)\\\", 2, workspaceAzureResourceId), \\\"\\\")\\n| extend assessmentDisplayName = case(type =~ \\\"microsoft.security/assessments\\\", case(isnotempty(properties.displayName), properties.displayName, properties.metadata.displayName), \\\"\\\")\\n| extend assessmentIdentifier = case(type =~ \\\"microsoft.security/assessments\\\", strcat(assessmentKey, \\\",\\\" , assessmentDisplayName, \\\",\\\", severity), \\\"\\\")\\n| summarize assessmentsCount = count() , assessmentsIdentifier = make_list(assessmentIdentifier), softwareNamesIdentifier = make_list(softwareNameIdentifier), hasAgent = max(hasAgent), workspaceName = max(workspaceName), environment = max(environment), osType = max(osType), exemptionType = max(exemptionType)  by resourceId, subscriptionId, resourceName, resourceType, typeFullPath, severity\\n| extend packAssessments = pack(severity, assessmentsCount)\\n| summarize assessmentsSummary = make_bag(packAssessments), assessmentsIdentifier = make_set(assessmentsIdentifier), softwareNamesIdentifier = make_set(softwareNamesIdentifier), hasAgent = max(hasAgent), workspaceName= max(workspaceName), environment = max(environment), osType= max(osType), exemptionType = max(exemptionType)  by resourceId, subscriptionId, resourceName, resourceType, typeFullPath\\n| extend agentMonitoring = case(hasAgent =~ \\\"NotApplicable\\\" or hasAgent =~ \\\"\\\", '',\\n                                                hasAgent =~ \\\"Unhealthy\\\", \\\"notInstalled\\\",\\n                                                \\\"installed\\\")\\n| join kind=leftouter (\\n                    securityresources\\n                    | where type =~ \\\"microsoft.security/pricings\\\"\\n                    | project subscriptionId, bundleName = tolower(name), freeTrialRemainingTime = properties.freeTrialRemainingTime, pricingTier = tolower(properties.pricingTier)\\n                    | extend bundlesPricing = pack(bundleName, pricingTier)\\n                    | summarize subscriptionPricing = make_bag(bundlesPricing) by subscriptionId\\n                ) on subscriptionId\\n| extend hasNoSoftwareData = case(array_length(softwareNamesIdentifier) == 1, case(set_has_element(softwareNamesIdentifier, \\\"\\\"), true, false), false)\\n| extend softwareNamesIdentifier = case(hasNoSoftwareData, softwareNamesIdentifier, set_difference(softwareNamesIdentifier, pack_array(\\\"\\\")))\\n| extend AssessmentsHigh = case(isnull(assessmentsSummary.high), 0 , toint(assessmentsSummary.high))\\n| extend AssessmentsMedium = case(isnull(assessmentsSummary.medium), 0 , toint(assessmentsSummary.medium))\\n| extend AssessmentsLow = case(isnull(assessmentsSummary.low), 0 , toint(assessmentsSummary.low))\\n| extend unhealthyAssessmentsCount = AssessmentsHigh + AssessmentsMedium + AssessmentsLow\\n| extend virtualmachines = case(isnull(subscriptionPricing), '' , subscriptionPricing.virtualmachines)\\n| extend virtualmachines = case(virtualmachines == 'free', 'off', 'on')\\n| extend sqlservers = case(isnull(subscriptionPricing), '' , subscriptionPricing.sqlservers)\\n| extend sqlservers = case(sqlservers == 'free', 'off', 'on')\\n| extend kubernetesservice = case(isnull(subscriptionPricing), '' , subscriptionPricing.kubernetesservice)\\n| extend kubernetesservice = case(kubernetesservice == 'free', 'off', 'on')\\n| extend containerregistry = case(isnull(subscriptionPricing), '' , subscriptionPricing.containerregistry)\\n| extend containerregistry = case(containerregistry == 'free', 'off', 'on')\\n| extend connectedcontainerregistry = case(isnull(subscriptionPricing), '' , subscriptionPricing.connectedcontainerregistry)\\n| extend connectedcontainerregistry = case(connectedcontainerregistry == 'free', 'off', 'on')\\n| extend sqlservervirtualmachines = case(isnull(subscriptionPricing), '' , subscriptionPricing.sqlservervirtualmachines)\\n| extend sqlservervirtualmachines = case(sqlservervirtualmachines == 'free', 'off', 'on')\\n| extend appservices = case(isnull(subscriptionPricing), '' , subscriptionPricing.appservices)\\n| extend appservices = case(appservices == 'free', 'off', 'on')\\n| extend storageaccounts = case(isnull(subscriptionPricing), '' , subscriptionPricing.storageaccounts)\\n| extend storageaccounts = case(storageaccounts == 'free', 'off', 'on')\\n| extend keyvaults = case(isnull(subscriptionPricing), '' , subscriptionPricing.keyvaults)\\n| extend keyvaults = case(keyvaults == 'free', 'off', 'on')\\n| extend opensourcerelationaldatabases = case(isnull(subscriptionPricing), '' , subscriptionPricing.opensourcerelationaldatabases)\\n| extend opensourcerelationaldatabases = case(opensourcerelationaldatabases == 'free', 'off', 'on')\\n| extend calculatedSubscriptionPricing = case(resourceType =~ \\\"subscription\\\" and isempty(subscriptionPricing) == false , iff(subscriptionPricing has \\\"free\\\" and subscriptionPricing has \\\"standard\\\", \\\"partial\\\", iff(subscriptionPricing has \\\"free\\\", \\\"off\\\", \\\"on\\\")), \\\"\\\")\\n| extend resourcePricing = case(typeFullPath =~ \\\"microsoft.classiccompute/virtualmachines\\\", virtualmachines, typeFullPath =~ \\\"microsoft.compute/virtualmachines\\\", virtualmachines, typeFullPath =~ \\\"microsoft.hybridcompute/machines\\\", virtualmachines, typeFullPath =~ \\\"microsoft.sql/servers\\\", sqlservers, typeFullPath =~ \\\"microsoft.containerservice/managedclusters\\\", kubernetesservice, typeFullPath =~ \\\"microsoft.kubernetes/connectedclusters\\\", kubernetesservice, typeFullPath =~ \\\"microsoft.containerregistry/registries\\\", containerregistry, typeFullPath =~ \\\"microsoft.security/connectedcontainerregistries\\\", connectedcontainerregistry, typeFullPath =~ \\\"microsoft.sqlvirtualmachine/sqlvirtualmachines\\\", sqlservervirtualmachines, typeFullPath =~ \\\"microsoft.web/sites\\\", appservices, typeFullPath =~ \\\"microsoft.storage/storageaccounts\\\", storageaccounts, typeFullPath =~ \\\"microsoft.compute/virtualmachinescalesets\\\", virtualmachines, typeFullPath =~ \\\"microsoft.keyvault/vaults\\\", keyvaults, typeFullPath =~ \\\"microsoft.dbforpostgresql/servers\\\", opensourcerelationaldatabases, typeFullPath =~ \\\"microsoft.dbformysql/servers\\\", opensourcerelationaldatabases, typeFullPath =~ \\\"microsoft.dbformariadb/servers\\\", opensourcerelationaldatabases, calculatedSubscriptionPricing)\\n| extend pricing = case(resourceType =~ \\\"subscription\\\" , calculatedSubscriptionPricing , resourcePricing)\\n| extend selectedSoftware = \\\"\\\"\\n| project resourceType, exemptionType, typeFullPath, resourceId, resourceName, subscriptionId, environment, osType, workspaceName, agentMonitoring, assessmentsIdentifier, assessmentsSummary, subscriptionPricing, unhealthyAssessmentsCount, pricing, softwareNamesIdentifier, selectedSoftware\\n| extend resourceGroup = tolower(tostring(split(resourceId, \\\"/\\\")[4]))\\n| order by unhealthyAssessmentsCount, subscriptionId, resourceType, resourceId\\n| where typeFullPath in ('microsoft.compute/virtualmachines', 'microsoft.hybridcompute/machines')\\n| where isnotempty(resourceId)\",\"size\":3,\"showAnalytics\":true,\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"value::all\"],\"visualization\":\"table\",\"showExpandCollapseGrid\":true,\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"resourceType\",\"formatter\":5},{\"columnMatch\":\"exemptionType\",\"formatter\":5},{\"columnMatch\":\"typeFullPath\",\"formatter\":5},{\"columnMatch\":\"resourceName\",\"formatter\":5},{\"columnMatch\":\"agentMonitoring\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"installed\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"Unhealthy\",\"representation\":\"2\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"NotApplicable\",\"representation\":\"cancelled\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"notInstalled\",\"representation\":\"disabled\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Disable\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"assessmentsIdentifier\",\"formatter\":5},{\"columnMatch\":\"assessmentsSummary\",\"formatter\":5},{\"columnMatch\":\"subscriptionPricing\",\"formatter\":5},{\"columnMatch\":\"unhealthyAssessmentsCount\",\"formatter\":3,\"formatOptions\":{\"min\":0,\"max\":15,\"palette\":\"greenRed\"}},{\"columnMatch\":\"pricing\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"on\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"off\",\"representation\":\"disabled\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"disabled\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"softwareNamesIdentifier\",\"formatter\":5},{\"columnMatch\":\"selectedSoftware\",\"formatter\":5},{\"columnMatch\":\"resourceGroup\",\"formatter\":5}],\"rowLimit\":1000,\"filter\":true,\"sortBy\":[{\"itemKey\":\"$gen_link_resourceId_3\",\"sortOrder\":2}],\"labelSettings\":[{\"columnId\":\"exemptionType\",\"label\":\"Resource Exemption exists\"},{\"columnId\":\"resourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"subscriptionId\",\"label\":\"Subscription ID\"},{\"columnId\":\"environment\",\"label\":\"Environment\"},{\"columnId\":\"osType\",\"label\":\"OS Type\"},{\"columnId\":\"workspaceName\",\"label\":\"Workspace Name\"},{\"columnId\":\"agentMonitoring\",\"label\":\"Log Analytics agent status\"},{\"columnId\":\"unhealthyAssessmentsCount\",\"label\":\"Open Recommendations\"},{\"columnId\":\"pricing\",\"label\":\"Azure Defender status\"}]},\"sortBy\":[{\"itemKey\":\"$gen_link_resourceId_3\",\"sortOrder\":2}]},\"name\":\"query - 0\",\"styleSettings\":{\"showBorder\":true}}]},\"conditionalVisibility\":{\"parameterName\":\"SelectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"SecurityTab\"},\"name\":\"protectionStatus\",\"styleSettings\":{\"showBorder\":true}}]},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"Security\"},\"name\":\"Security\"}],\"isLocked\":false,\"fallbackResourceIds\":[\"workbookresourceid-stage\"]}",
+        "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":{\"json\":\"# Jumpstart ArcBox Workbook DataOps\\r\\n\\r\\nKeep track of your ArcBox resources by selecting one of the tabs below:\\r\\n____________________________________________________________________________________________________\\r\\n\"},\"name\":\"text - 3\"},{\"type\":11,\"content\":{\"version\":\"LinkItem/1.0\",\"style\":\"tabs\",\"links\":[{\"id\":\"001e53e2-be76-428e-9081-da7ce60368d4\",\"cellValue\":\"selectedTab\",\"linkTarget\":\"parameter\",\"linkLabel\":\"Inventory\",\"subTarget\":\"Inventory\",\"style\":\"link\"},{\"id\":\"547c6d68-f351-4898-bd7f-de56cd1ea984\",\"cellValue\":\"selectedTab\",\"linkTarget\":\"parameter\",\"linkLabel\":\"Monitoring\",\"subTarget\":\"Monitoring\",\"style\":\"link\"},{\"id\":\"942dd542-ac90-4ee4-bb5d-477c931c05b4\",\"cellValue\":\"selectedTab\",\"linkTarget\":\"parameter\",\"linkLabel\":\"Security\",\"subTarget\":\"Security\",\"style\":\"link\"}]},\"customWidth\":\"100\",\"name\":\"links - 7\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"\"},\"name\":\"text - 4\"},{\"type\":1,\"content\":{\"json\":\"## Jumpstart ArcBox Metrics and Alerts\\r\\n\\r\\n💡 Select your Azure ArcBox subscription and Resource Group to see more information.\"},\"name\":\"text - 1\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{subscriptionId}\"],\"parameters\":[{\"id\":\"1f74ed9a-e3ed-498d-bd5b-f68f3836a117\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscriptionId\",\"label\":\"Subscriptions\",\"type\":6,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"includeAll\":true,\"showDefault\":false}},{\"id\":\"b616a3a3-4271-4208-b1a9-a92a78efed08\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resourceGroup\",\"label\":\"Resource groups\",\"type\":2,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"Resources\\r\\n| summarize by resourceGroup\\r\\n| order by resourceGroup asc\\r\\n| project id=resourceGroup, resourceGroup\",\"crossComponentResources\":[\"{subscriptionId}\"],\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"*\",\"showDefault\":false},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"0e85e0e4-a7e8-4ea8-b291-e444c317843a\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"ResourceTypes\",\"label\":\"Resource types\",\"type\":7,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"includeAll\":true,\"selectAllValue\":\"*\",\"showDefault\":false}},{\"id\":\"f60ea0a0-3703-44ca-a59b-df0246423f41\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"Resources\",\"type\":5,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"Resources\\r\\n| where \\\"*\\\" in ({ResourceTypes}) or type in~({ResourceTypes})\\r\\n| where '*' in~({resourceGroup}) or resourceGroup in~({resourceGroup}) \\r\\n| order by name asc\\r\\n| extend Rank = row_number()\\r\\n| project value = id, label = name, selected = Rank <= 10, group = resourceGroup\",\"crossComponentResources\":[\"{subscriptionId}\"],\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"*\",\"showDefault\":false},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"015d1a5e-357f-4e01-ac77-598e7b493db0\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"timeRange\",\"label\":\"Time Range\",\"type\":4,\"isRequired\":true,\"value\":{\"durationMs\":3600000},\"typeSettings\":{\"selectableValues\":[{\"durationMs\":300000},{\"durationMs\":900000},{\"durationMs\":1800000},{\"durationMs\":3600000},{\"durationMs\":14400000},{\"durationMs\":43200000},{\"durationMs\":86400000},{\"durationMs\":172800000},{\"durationMs\":259200000},{\"durationMs\":604800000},{\"durationMs\":1209600000},{\"durationMs\":2419200000},{\"durationMs\":2592000000}],\"allowCustom\":true}},{\"id\":\"bd6d6075-dc8f-43d3-829f-7e2245a3eb21\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"State\",\"type\":2,\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"{\\\"version\\\":\\\"1.0.0\\\",\\\"content\\\":\\\"[ \\\\r\\\\n    {\\\\\\\"id\\\\\\\":\\\\\\\"New\\\\\\\", \\\\\\\"label\\\\\\\": \\\\\\\"New\\\\\\\"},\\\\r\\\\n    {\\\\\\\"id\\\\\\\":\\\\\\\"Acknowledged\\\\\\\", \\\\\\\"label\\\\\\\": \\\\\\\"Acknowledged\\\\\\\"},\\\\r\\\\n    {\\\\\\\"id\\\\\\\":\\\\\\\"Closed\\\\\\\", \\\\\\\"label\\\\\\\": \\\\\\\"Closed\\\\\\\"}\\\\r\\\\n]\\\",\\\"transformers\\\":null}\",\"crossComponentResources\":[\"{Subscription}\"],\"value\":[\"value::all\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"*\",\"showDefault\":false},\"queryType\":8}],\"style\":\"above\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},\"name\":\"parameters\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"AlertsManagementResources | where type =~ 'microsoft.alertsmanagement/alerts'\\r\\n| where todatetime(properties.essentials.startDateTime) {timeRange}  \\r\\n| where \\\"*\\\" in ({resourceGroup}) or properties.essentials.targetResourceGroup in~ ({resourceGroup})\\r\\n| where \\\"*\\\" in ({ResourceTypes}) or properties.essentials.targetResourceType in~ ({ResourceTypes})\\r\\n| where \\\"*\\\" in ({Resources}) or properties.essentials.targetResource in~ ({Resources})\\r\\n| extend State=tostring(properties.essentials.alertState)\\r\\n| where \\\"*\\\" in ({State}) or State in ({State})\\r\\n| summarize Count=count(), New=countif(State==\\\"New\\\"), \\r\\nAcknowledged=countif(State==\\\"Acknowledged\\\"), \\r\\nClosed=countif(State==\\\"Closed\\\") \\r\\nby Severity=tostring(properties.essentials.severity)\\r\\n| order by Severity asc\",\"size\":3,\"title\":\"Alert Summary\",\"noDataMessage\":\"No alerts found\",\"exportMultipleValues\":true,\"exportedParameters\":[{\"fieldName\":\"Severity\",\"parameterName\":\"Severity\",\"parameterType\":1}],\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"{subscriptionId}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"Severity\",\"formatter\":11},{\"columnMatch\":\"Count\",\"formatter\":3,\"formatOptions\":{\"min\":0,\"palette\":\"blue\",\"aggregation\":\"Sum\"},\"numberFormat\":{\"unit\":17,\"options\":{\"style\":\"decimal\",\"maximumFractionDigits\":2}}},{\"columnMatch\":\"State\",\"formatter\":1}]}},\"showPin\":true,\"name\":\"query - 6\"},{\"type\":1,\"content\":{\"json\":\"## Azure Arc-enabled Kubernetes\"},\"name\":\"text - 9\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{resource}\"],\"parameters\":[{\"id\":\"e2b5cd30-7276-477f-a6bb-07da25ba5e5f\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"timeRange\",\"label\":\"Time Range\",\"type\":4,\"description\":\"Filter data by time range\",\"isRequired\":true,\"value\":{\"durationMs\":7776000000},\"typeSettings\":{\"selectableValues\":[{\"durationMs\":300000},{\"durationMs\":900000},{\"durationMs\":1800000},{\"durationMs\":3600000},{\"durationMs\":14400000},{\"durationMs\":43200000},{\"durationMs\":86400000},{\"durationMs\":172800000},{\"durationMs\":259200000},{\"durationMs\":604800000},{\"durationMs\":1209600000},{\"durationMs\":2419200000},{\"durationMs\":2592000000},{\"durationMs\":5184000000},{\"durationMs\":7776000000}],\"allowCustom\":true}},{\"id\":\"b8b76ad0-de1a-4b7c-90a8-f4eb277bb878\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscription\",\"label\":\"Subscription\",\"type\":6,\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"6b8d59ca-08c5-40fb-9962-5061b3e6e779\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workspaceName\",\"label\":\"Log Analytics Workspace\",\"type\":5,\"query\":\"resources\\r\\n| where type contains 'microsoft.operationalinsights/workspaces'\\r\\n| project id\",\"crossComponentResources\":[\"{subscription}\"],\"value\":\"\",\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"7aa94d19-4c5b-40e2-b14f-e29736a8f90c\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resource\",\"label\":\"Azure Arc-enabled K8S cluster\",\"type\":5,\"query\":\" Resources\\r\\n  | where type =~ 'microsoft.kubernetes/connectedclusters'\\r\\n  | project id\",\"crossComponentResources\":[\"{subscription}\"],\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"value\":\"\"},{\"id\":\"3a3fdabe-6173-4e2b-8658-38c0195fd7e2\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resourceType\",\"type\":7,\"isRequired\":true,\"query\":\"{\\\"version\\\":\\\"1.0.0\\\",\\\"content\\\":\\\"\\\\\\\"{resource:resourcetype}\\\\\\\"\\\",\\\"transformers\\\":null}\",\"typeSettings\":{\"additionalResourceOptions\":[\"value::1\"],\"showDefault\":false},\"defaultValue\":\"value::1\",\"queryType\":8},{\"id\":\"9767de49-ba31-4847-9ffc-714c02e7523c\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"clusterId\",\"type\":1,\"description\":\"Filter workspace by cluster id\",\"isHiddenWhenLocked\":true,\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"cba109cf-db6e-4261-8d3a-fe038593622d\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"clusterIdWhereClause\",\"type\":1,\"description\":\"Add to queries to filter by cluster id\",\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"criteriaContext\":{\"leftOperand\":\"resourceType\",\"operator\":\"contains\",\"rightValType\":\"static\",\"rightVal\":\"microsoft.operationalinsights/workspaces\",\"resultValType\":\"static\",\"resultVal\":\"| where ClusterId =~ '{clusterId}'\"}},{\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"ee080bd8-83dc-4fa0-b688-b2f16b956b92\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadType\",\"label\":\"Workload Type\",\"type\":2,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n| distinct ControllerKind\\r\\n| where isempty(ControllerKind) == false\\r\\n| order by ControllerKind asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::all\",\"queryType\":0,\"resourceType\":\"microsoft.kubernetes/connectedclusters\"},{\"id\":\"cf611d4b-aa93-4949-a7a1-c1d174af29ca\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadKindWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"condition\":\"if (workloadType is not empty ), result = '| where ControllerKind in ({workloadType})'\",\"criteriaContext\":{\"leftOperand\":\"workloadType\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where ControllerKind in ({workloadType})\"}},{\"condition\":\"else result = '| where \\\"a\\\" == \\\"a\\\"'\",\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"034caae5-bee3-4b66-8f80-c120a2a25c77\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"namespace\",\"label\":\"Namespace\",\"type\":2,\"description\":\"Filter the workbook by namespace\",\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n| distinct Namespace\\r\\n| where isnotempty(Namespace)\\r\\n| order by Namespace asc\",\"crossComponentResources\":[\"{Workspace}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"},{\"id\":\"faeee248-e4c3-4fae-b435-ef5fb6dabe3b\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"namespaceWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"condition\":\"if (namespace is not empty ), result = '| where Namespace in ({namespace})'\",\"criteriaContext\":{\"leftOperand\":\"namespace\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where Namespace in ({namespace})\"}},{\"condition\":\"else result = '| where \\\"a\\\" == \\\"a\\\"'\",\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"8943e259-1dde-44cd-a00b-e815eea9de34\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadName\",\"label\":\"Workload Name\",\"type\":2,\"description\":\"Filter the data for a particular workload\",\"isRequired\":true,\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{namespaceWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n| distinct ControllerName\\r\\n| where isnotempty(ControllerName)\\r\\n| order by ControllerName asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::1\"],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::1\",\"queryType\":0,\"resourceType\":\"microsoft.kubernetes/connectedclusters\"},{\"id\":\"00a9be6c-ab0b-400b-b195-9775a47ecddd\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podStatus\",\"label\":\"Pod Status\",\"type\":2,\"description\":\"Filter by Pod status like Pending/Running/Failed etc.\",\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n| where ControllerName == '{workloadName}'\\r\\n| distinct PodStatus\\r\\n| where isnotempty(PodStatus)\\r\\n| order by PodStatus asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::all\",\"queryType\":0,\"resourceType\":\"{resourceType}\",\"value\":[\"value::all\"]},{\"id\":\"388ea6aa-12d8-485a-8e80-b4d7b8994bd8\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podStatusWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"criteriaContext\":{\"leftOperand\":\"podStatus\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where PodStatus in ({podStatus})\"}},{\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":2592000000},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"64de23e6-96b5-4105-b65d-36e40f73f4ec\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podName\",\"label\":\"Pod Name\",\"type\":2,\"description\":\"Filter by pod name \",\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n| where ControllerName == '{workloadName:value}'\\r\\n{podStatusWhereClause}\\r\\n| summarize arg_max(TimeGenerated, PodStatus) by Name\\r\\n| project Name\\r\\n| where isempty(Name) == false\\r\\n| order by Name asc\",\"crossComponentResources\":[\"{resource}\"],\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"selectAllValue\":\"\",\"showDefault\":false},\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\",\"defaultValue\":\"value::all\",\"queryType\":0,\"resourceType\":\"{resourceType}\",\"value\":[\"value::all\"]},{\"id\":\"4f7059c2-ebd7-4fc2-86c4-c51e66703582\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podNameWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"condition\":\"if (podName is not empty ), result = '| where PodName in ({podName})'\",\"criteriaContext\":{\"leftOperand\":\"podName\",\"operator\":\"isNotNull\",\"rightValType\":\"static\",\"rightVal\":\"unset\",\"resultValType\":\"static\",\"resultVal\":\"| where PodName in ({podName})\"}},{\"condition\":\"else result = '| where \\\"a\\\" == \\\"a\\\"'\",\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"e60298ff-36da-485e-acea-73c0692b8446\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadNamespaceText\",\"type\":1,\"description\":\"For displaying name space of the selected workload\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where ControllerName == '{workloadName}'\\r\\n| summarize Namespaces=make_set(Namespace)\\r\\n| extend Namespaces = strcat_array(Namespaces, ', ')\",\"crossComponentResources\":[\"{resource}\"],\"isHiddenWhenLocked\":true,\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"{resourceType}\"},{\"id\":\"9f8d0d65-d7bc-42c9-bc5c-b394288b5216\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workloadTypeText\",\"type\":1,\"description\":\"For displaying workload type of the selected workload\",\"query\":\"KubePodInventory\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n| where ControllerName == '{workloadName}'\\r\\n| summarize ControllerKinds=make_set(ControllerKind)\\r\\n| extend ControllerKinds = strcat_array(ControllerKinds, ', ')\",\"crossComponentResources\":[\"{resource}\"],\"isHiddenWhenLocked\":true,\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"{resourceType}\"}],\"style\":\"above\",\"queryType\":0,\"resourceType\":\"microsoft.kubernetes/connectedclusters\"},\"name\":\"pills\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"parameters\":[{\"id\":\"55cc0c6d-51df-4e58-9543-c8b21bc71e29\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"podTileStatusWhereClause\",\"type\":1,\"isHiddenWhenLocked\":true,\"criteriaData\":[{\"criteriaContext\":{\"leftOperand\":\"podStatusTileText\",\"operator\":\"!=\",\"rightValType\":\"static\",\"rightVal\":\"All\",\"resultValType\":\"static\",\"resultVal\":\"| where PodStatus == '{podStatusTileText}'\"}},{\"criteriaContext\":{\"operator\":\"Default\",\"rightValType\":\"param\",\"resultValType\":\"static\",\"resultVal\":\"| where \\\"a\\\" == \\\"a\\\"\"}}],\"timeContext\":{\"durationMs\":14400000},\"timeContextFromParameter\":\"timeRange\"}],\"style\":\"pills\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"asas\"},\"name\":\"pod-status-tile-text\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let endDateTime = {timeRange:end};\\r\\nlet startDateTime = {timeRange:start};\\r\\nlet trendBinSize = {timeRange:grain};\\r\\nlet controllerName= '{workloadName}';\\r\\nKubePodInventory\\r\\n| where TimeGenerated >= startDateTime\\r\\n| where TimeGenerated < endDateTime\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where isnotempty(ClusterName)\\r\\n| where isnotempty(Namespace)\\r\\n| where ControllerName == controllerName\\r\\n| extend PodName = Name\\r\\n{podStatusWhereClause}\\r\\n{podTileStatusWhereClause}\\r\\n{podNameWhereClause}\\r\\n| summarize PodRestartCount=max(PodRestartCount) by PodName, bin(TimeGenerated, trendBinSize)\\r\\n| order by PodName asc nulls last, TimeGenerated asc\\r\\n| serialize \\r\\n| extend prevValue=iif(prev(PodName) == PodName, prev(PodRestartCount), PodRestartCount)\\r\\n| extend RestartCount=PodRestartCount - prevValue\\r\\n| extend RestartCount=iif(RestartCount < 0, 0, RestartCount) \\r\\n| project TimeGenerated, PodName, RestartCount\\r\\n| render timechart\",\"size\":0,\"aggregation\":5,\"showAnalytics\":true,\"title\":\"Azure Arc-enabled kubernetes - Pod Restart Trend\",\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"]},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"pod-restart-trend-chart\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let endDateTime = {timeRange:end};\\r\\nlet startDateTime = {timeRange:start};\\r\\nlet trendBinSize = {timeRange:grain};\\r\\nlet controllerName= '{workloadName:value}';\\r\\nKubePodInventory\\r\\n| where TimeGenerated >= startDateTime\\r\\n| where TimeGenerated < endDateTime\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where isnotempty(ClusterName)\\r\\n| where isnotempty(Namespace)\\r\\n| where ControllerName == controllerName\\r\\n| extend PodName = Name\\r\\n{podStatusWhereClause}\\r\\n{podTileStatusWhereClause}\\r\\n{podNameWhereClause}\\r\\n| extend ContainerName=tostring(split(ContainerName, '/')[1])\\r\\n| where isempty(ContainerName) == false\\r\\n| summarize ContainerRestartCount=sum(ContainerRestartCount) by ContainerName, bin(TimeGenerated, 1tick)\\r\\n| order by ContainerName asc nulls last, TimeGenerated asc\\r\\n| serialize \\r\\n| extend prevValue=iif(prev(ContainerName) == ContainerName, prev(ContainerRestartCount), ContainerRestartCount)\\r\\n| extend RestartCount=ContainerRestartCount - prevValue\\r\\n| extend RestartCount=iif(RestartCount < 0, 0, RestartCount) \\r\\n| project TimeGenerated, ContainerName, RestartCount\\r\\n| summarize RestartCount=sum(RestartCount) by ContainerName, bin(TimeGenerated, trendBinSize)\",\"size\":0,\"aggregation\":5,\"showAnalytics\":true,\"title\":\"Azure Arc-enabled kubernetes - Container restart trend\",\"timeContextFromParameter\":\"timeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"timechart\"},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"container-restart-trend-chart\",\"styleSettings\":{\"showBorder\":true}},{\"type\":10,\"content\":{\"chartId\":\"workbook3e0e301c-50cf-4e53-ac2a-40f5eed823a0\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":3600000},\"metrics\":[{\"namespace\":\"insights.container/pods\",\"metric\":\"insights.container/pods--PodCount\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled kubernetes - Pod Count\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 19\"},{\"type\":10,\"content\":{\"chartId\":\"workbook167c4490-9cde-4fcd-be0f-401070f13ccd\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":3600000},\"metrics\":[{\"namespace\":\"insights.container/pods\",\"metric\":\"insights.container/pods--PodReadyPercentage\",\"aggregation\":4,\"splitBy\":null},{\"namespace\":\"insights.container/pods\",\"metric\":\"insights.container/pods--restartingContainerCount\",\"aggregation\":4}],\"title\":\"Azure Arc-enabled Kubernetes - Pod status\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 20\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let endDateTime = {timeRange:end};\\r\\nlet startDateTime = {timeRange:start};\\r\\nlet trendBinSize = {timeRange:grain};\\r\\nlet controllerName= '{workloadName}';\\r\\nKubePodInventory\\r\\n| where TimeGenerated >= startDateTime\\r\\n| where TimeGenerated < endDateTime\\r\\n{clusterIdWhereClause}\\r\\n{workloadKindWhereClause}\\r\\n{namespaceWhereClause}\\r\\n| where isnotempty(ClusterName)\\r\\n| where isnotempty(Namespace)\\r\\n| extend PodName = Name\\r\\n{podStatusWhereClause}\\r\\n{podNameWhereClause}\\r\\n| where ControllerName == controllerName\\r\\n| extend InstanceName = strcat(ClusterId, '/', ContainerName),\\r\\n         ContainerName = strcat(Name, '/', tostring(split(ContainerName, '/')[1]))\\r\\n| summarize arg_max(TimeGenerated, *) by ContainerName, Name\\r\\n{podTileStatusWhereClause}\\r\\n| extend ContainerLastStatus = todynamic(ContainerLastStatus) \\r\\n| project TimeGenerated, ContainerName, PodStatus, ContainerStatus, LastState=ContainerLastStatus.lastState, LastStateReason=ContainerLastStatus.reason, LastStateStartTime=ContainerLastStatus.startedAt,\\r\\nLastStateFinishTime=ContainerLastStatus.finishedAt\\r\\n\",\"size\":0,\"aggregation\":5,\"showAnalytics\":true,\"title\":\"Azure Arc-enabled kubernetes - Container Status for Pods\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"TimeGenerated\",\"formatter\":6,\"formatOptions\":{},\"dateFormat\":{\"showUtcTime\":null,\"formatName\":\"shortDateTimePattern\"}},{\"columnMatch\":\"PodStatus\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"Running\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"Pending\",\"representation\":\"pending\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"Failed\",\"representation\":\"failed\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Blank\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"ContainerStatus\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"Running\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"waiting\",\"representation\":\"pending\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"success\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"LastState\",\"formatter\":0,\"formatOptions\":{},\"numberFormat\":{\"unit\":0,\"options\":{\"style\":\"decimal\"},\"emptyValCustomText\":\"-\"}},{\"columnMatch\":\"LastStateReason\",\"formatter\":0,\"formatOptions\":{},\"numberFormat\":{\"unit\":0,\"options\":{\"style\":\"decimal\"},\"emptyValCustomText\":\"-\"}},{\"columnMatch\":\"LastStateStartTime\",\"formatter\":6,\"formatOptions\":{},\"dateFormat\":{\"showUtcTime\":null,\"formatName\":\"shortDateTimePattern\"}},{\"columnMatch\":\"LastStateFinishTime\",\"formatter\":6,\"formatOptions\":{},\"dateFormat\":{\"showUtcTime\":null,\"formatName\":\"shortDateTimePattern\"}}]},\"sortBy\":[]},\"showPin\":true,\"name\":\"container-status-for-pods-chart\"},{\"type\":10,\"content\":{\"chartId\":\"workbook87327d65-b260-4473-9f2b-5d90b1100543\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":2592000000},\"metrics\":[{\"namespace\":\"insights.container/nodes\",\"metric\":\"insights.container/nodes--cpuUsagePercentage\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled kubernetes cluster - Node CPU usage %\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 17\"},{\"type\":10,\"content\":{\"chartId\":\"workbook2f202f95-1281-4077-a49b-31c3e3d3271b\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.kubernetes/connectedclusters\",\"metricScope\":0,\"resourceParameter\":\"resource\",\"resourceIds\":[\"{resource}\"],\"timeContext\":{\"durationMs\":3600000},\"metrics\":[{\"namespace\":\"insights.container/nodes\",\"metric\":\"insights.container/nodes--memoryWorkingSetPercentage\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled kubernetes cluster - Node memory working set %\",\"gridSettings\":{\"rowLimit\":10000}},\"customWidth\":\"50\",\"name\":\"metric - 18\"},{\"type\":1,\"content\":{\"json\":\"## Azure Arc-enabled SQL Managed Instance\"},\"name\":\"text - 18\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{subscription}\"],\"parameters\":[{\"id\":\"be802690-79de-4708-8629-4c57b0d78085\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscriptionId\",\"label\":\"Subscription\",\"type\":6,\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\"},{\"id\":\"3bd2e749-7c3f-47fd-9f8a-7ab118be8850\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workspaceName\",\"label\":\"Log Analytics Workspace\",\"type\":5,\"query\":\"resources\\r\\n| where type contains 'microsoft.operationalinsights/workspaces'\\r\\n| project id\",\"crossComponentResources\":[\"{subscription}\"],\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"a308510f-a9f5-4ee4-a4b1-a175aa96b290\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"SQLMI\",\"label\":\"Azure Arc-enabled SQL MI\",\"type\":5,\"query\":\" Resources\\r\\n  | where type =~ 'Microsoft.AzureArcData/sqlManagedInstances'\\r\\n  | project id\",\"crossComponentResources\":[\"{subscription}\"],\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":0},\"timeContextFromParameter\":\"timeRange\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"}],\"style\":\"above\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},\"name\":\"pills - Copy\"},{\"type\":10,\"content\":{\"chartId\":\"789dd9d3-afbc-4440-8e31-7fe124f7b9ce\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.azurearcdata/sqlmanagedinstances\",\"metricScope\":0,\"resourceParameter\":\"SQLMI\",\"resourceIds\":[\"{SQLMI}\"],\"timeContext\":{\"durationMs\":86400000},\"metrics\":[{\"namespace\":\"sql server\",\"metric\":\"sql server--CPU Usage: pod-0\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled SQL MI - CPU usage\",\"gridSettings\":{\"rowLimit\":10000}},\"name\":\"metric - 0\"},{\"type\":10,\"content\":{\"chartId\":\"540fb39f-7903-4cc8-af49-679ee1f331fe\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.azurearcdata/sqlmanagedinstances\",\"metricScope\":0,\"resourceParameter\":\"SQLMI\",\"resourceIds\":[\"{SQLMI}\"],\"timeContext\":{\"durationMs\":86400000},\"metrics\":[{\"namespace\":\"sql server\",\"metric\":\"sql server--Memory Usage: pod-0\",\"aggregation\":4,\"splitBy\":null}],\"gridSettings\":{\"rowLimit\":10000}},\"name\":\"metric - 0\"},{\"type\":10,\"content\":{\"chartId\":\"31b401d2-6d90-4a57-a61a-d6e458523448\",\"version\":\"MetricsItem/2.0\",\"size\":0,\"chartType\":2,\"resourceType\":\"microsoft.azurearcdata/sqlmanagedinstances\",\"metricScope\":0,\"resourceParameter\":\"SQLMI\",\"resourceIds\":[\"{SQLMI}\"],\"timeContext\":{\"durationMs\":86400000},\"metrics\":[{\"namespace\":\"sql server\",\"metric\":\"sql server--Transactions/second: pod-0\",\"aggregation\":4,\"splitBy\":null}],\"title\":\"Azure Arc-enabled SQL MI - Transactions per Second\",\"gridSettings\":{\"rowLimit\":10000}},\"name\":\"metric - 0\"}]},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"Monitoring\"},\"name\":\"Monitoring\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"## Jumpstart ArcBox resource inventory\\r\\n\\r\\n💡 Select your Azure ArcBox subscription and Resource Group to see more information.\"},\"name\":\"text - 4\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{subscriptionId}\"],\"parameters\":[{\"id\":\"984514df-fff0-434c-a373-7090566e8c44\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"subscriptionId\",\"type\":6,\"value\":null,\"typeSettings\":{\"additionalResourceOptions\":[],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":86400000},\"label\":\"Subscription\"},{\"id\":\"cb849a6b-937d-4e93-8d09-770554777009\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"resourceGroup\",\"label\":\"Resource Group\",\"type\":2,\"query\":\"Resources\\r\\n| summarize by resourceGroup\\r\\n| order by resourceGroup asc\\r\\n| project id=resourceGroup, resourceGroup\",\"crossComponentResources\":[\"{subscriptionId}\"],\"value\":\"arcboxdataops\",\"typeSettings\":{\"additionalResourceOptions\":[],\"showDefault\":false},\"timeContext\":{\"durationMs\":86400000},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},{\"id\":\"0fd9f40f-ffe0-4894-adc7-64866aa4b1e4\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"ResourceType\",\"label\":\"Resources\",\"type\":7,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"typeSettings\":{\"additionalResourceOptions\":[\"value::all\"],\"includeAll\":true,\"showDefault\":false},\"timeContext\":{\"durationMs\":86400000},\"value\":[\"value::all\"]}],\"style\":\"pills\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\"},\"name\":\"parameters - 1\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Resources \\r\\n| where resourceGroup == \\\"{resourceGroup}\\\"\\r\\n| extend type = case(\\r\\ntype contains 'microsoft.netapp/netappaccounts', 'NetApp Accounts',\\r\\ntype contains \\\"microsoft.compute\\\", \\\"Azure Compute\\\",\\r\\ntype contains \\\"microsoft.logic\\\", \\\"LogicApps\\\",\\r\\ntype contains 'microsoft.keyvault/vaults', \\\"Key Vaults\\\",\\r\\ntype contains 'microsoft.storage/storageaccounts', \\\"Storage Accounts\\\",\\r\\ntype contains 'microsoft.compute/availabilitysets', 'Availability Sets',\\r\\ntype contains 'microsoft.operationalinsights/workspaces', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.operationsmanagement', 'Operations Management Resources',\\r\\ntype contains 'microsoft.insights', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.desktopvirtualization/applicationgroups', 'WVD Application Groups',\\r\\ntype contains 'microsoft.desktopvirtualization/workspaces', 'WVD Workspaces',\\r\\ntype contains 'microsoft.desktopvirtualization/hostpools', 'WVD Hostpools',\\r\\ntype contains 'microsoft.recoveryservices/vaults', 'Backup Vaults',\\r\\ntype contains 'microsoft.web', 'App Services',\\r\\ntype contains 'microsoft.managedidentity/userassignedidentities','Managed Identities',\\r\\ntype contains 'microsoft.storagesync/storagesyncservices', 'Azure File Sync',\\r\\ntype contains 'microsoft.hybridcompute/machines', 'Azure Arc-enabled servers ',\\r\\ntype contains 'Microsoft.EventHub', 'Event Hub',\\r\\ntype contains 'Microsoft.EventGrid', 'Event Grid',\\r\\ntype contains 'Microsoft.Sql', 'SQL Resources',\\r\\ntype contains 'Microsoft.HDInsight/clusters', 'HDInsight Clusters',\\r\\ntype contains 'microsoft.devtestlab', 'DevTest Labs Resources',\\r\\ntype contains 'microsoft.containerinstance', 'Container Instances Resources',\\r\\ntype contains 'microsoft.portal/dashboards', 'Azure Dashboards',\\r\\ntype contains 'microsoft.containerregistry/registries', 'Container Registry',\\r\\ntype contains 'microsoft.automation', 'Automation Resources',\\r\\ntype contains 'sendgrid.email/accounts', 'SendGrid Accounts',\\r\\ntype contains 'microsoft.datafactory/factories', 'Data Factory',\\r\\ntype contains 'microsoft.databricks/workspaces', 'Databricks Workspaces',\\r\\ntype contains 'microsoft.machinelearningservices/workspaces', 'Machine Learnings Workspaces',\\r\\ntype contains 'microsoft.alertsmanagement/smartdetectoralertrules', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.apimanagement/service', 'API Management Services',\\r\\ntype contains 'microsoft.dbforpostgresql', 'PostgreSQL Resources',\\r\\ntype contains 'microsoft.scheduler/jobcollections', 'Scheduler Job Collections',\\r\\ntype contains 'microsoft.visualstudio/account', 'Azure DevOps Organization',\\r\\ntype contains 'microsoft.network/', 'Network Resources',\\r\\ntype contains 'microsoft.migrate/' or type contains 'microsoft.offazure', 'Azure Migrate Resources',\\r\\ntype contains 'microsoft.servicebus/namespaces', 'Service Bus Namespaces',\\r\\ntype contains 'microsoft.classic', 'ASM Obsolete Resources',\\r\\ntype contains 'microsoft.resources/templatespecs', 'Template Spec Resources',\\r\\ntype contains 'microsoft.virtualmachineimages', 'VM Image Templates',\\r\\ntype contains 'microsoft.documentdb', 'CosmosDB DB Resources',\\r\\ntype contains 'microsoft.alertsmanagement/actionrules', 'Azure Monitor Resources',\\r\\ntype contains 'microsoft.kubernetes/connectedclusters', 'Azure Arc-enabled Kubernetes',\\r\\ntype contains 'microsoft.purview', 'Purview Resources',\\r\\ntype contains 'microsoft.security', 'Security Resources',\\r\\ntype contains 'microsoft.cdn', 'CDN Resources',\\r\\ntype contains 'microsoft.devices','IoT Resources',\\r\\ntype contains 'microsoft.datamigration', 'Data Migraiton Services',\\r\\ntype contains 'microsoft.cognitiveservices', 'Congitive Services',\\r\\ntype contains 'microsoft.customproviders', 'Custom Providers',\\r\\ntype contains 'microsoft.appconfiguration', 'App Services',\\r\\ntype contains 'microsoft.search', 'Search Services',\\r\\ntype contains 'microsoft.maps', 'Maps',\\r\\ntype contains 'microsoft.containerservice/managedclusters', 'AKS',\\r\\ntype contains 'microsoft.signalrservice', 'SignalR',\\r\\ntype contains 'microsoft.resourcegraph/queries', 'Resource Graph Queries',\\r\\ntype contains 'microsoft.batch', 'MS Batch',\\r\\ntype contains 'microsoft.analysisservices', 'Analysis Services',\\r\\ntype contains 'microsoft.synapse/workspaces', 'Synapse Workspaces',\\r\\ntype contains 'microsoft.synapse/workspaces/sqlpools', 'Synapse SQL Pools',\\r\\ntype contains 'microsoft.kusto/clusters', 'ADX Clusters',\\r\\ntype contains 'microsoft.resources/deploymentscripts', 'Deployment Scripts',\\r\\ntype contains 'microsoft.aad/domainservices', 'AD Domain Services',\\r\\ntype contains 'microsoft.labservices/labaccounts', 'Lab Accounts',\\r\\ntype contains 'microsoft.automanage/accounts', 'Automanage Accounts',\\r\\ntype contains 'microsoft.extendedlocation/customlocations', 'Azure Arc Custom Locations',\\r\\ntype contains 'microsoft.azurearcdata/postgresinstances', 'Azure Arc-enabled PostgresSQL',\\r\\ntype contains 'microsoft.azurearcdata/sqlmanagedinstances', 'Azure Arc-enabled SQL Managed Instance',\\r\\ntype contains 'microsoft.azurearcdata/datacontrollers', 'Azure Arc-enabled data controller',\\r\\ntype contains 'microsoft.azurearcdata/sqlserverinstances', 'Azure Arc-enabled SQL server',\\r\\nstrcat(\\\"Not Translated: \\\", type))\\r\\n| summarize count() by type\",\"size\":1,\"title\":\"Resource Count by Type\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"{subscriptionId}\"],\"visualization\":\"tiles\",\"tileSettings\":{\"titleContent\":{\"columnMatch\":\"type\",\"formatter\":1},\"leftContent\":{\"columnMatch\":\"count_\",\"formatter\":12,\"formatOptions\":{\"palette\":\"auto\"},\"numberFormat\":{\"unit\":17,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumFractionDigits\":2,\"maximumSignificantDigits\":3}}},\"showBorder\":true,\"sortCriteriaField\":\"count_\",\"sortOrderField\":2}},\"name\":\"query - Overview Resource Counts by type\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Resources\\r\\n| where type in~ ({ResourceType})\\r\\n| where resourceGroup == \\\"{resourceGroup}\\\"\\r\\n| project Resource = id, Subscription = subscriptionId, ['Resource group'] = strcat('/subscriptions/', subscriptionId, '/resourceGroups/', resourceGroup), Location = location, tags\",\"size\":2,\"title\":\"Resources List\",\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"{subscriptionId}\"]},\"name\":\"query - 2\"}]},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"Inventory\"},\"name\":\"Inventory\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"## Jumpstart ArcBox security overview\"},\"name\":\"text - 5\"},{\"type\":1,\"content\":{\"json\":\"💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\\r\\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\\r\\n2. Select the specific Azure subscription for which you want to configure the data export.\\r\\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\\r\\n4. Set the export target to **Log Analytics workspace**.\\r\\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\\r\\n6. From the export frequency options, select **Streaming** and **Snapshots**.\\r\\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\\r\\n\\r\\n[Learn more](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\\r\\n\\r\\n> **Notes**\\r\\n* To get full visibility, wait at least one week for the first snapshot to be exported.\\r\\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export).\"},\"showPin\":false,\"name\":\"Instructions\"},{\"type\":9,\"content\":{\"version\":\"KqlParameterItem/1.0\",\"crossComponentResources\":[\"{workspaceName}\"],\"parameters\":[{\"id\":\"ae721cb1-e030-4e02-8839-9c6a00f66c8a\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"workspaceName\",\"type\":5,\"description\":\"Select at least one workspace that contains continuous export data based on the selected subscriptions\",\"isRequired\":true,\"multiSelect\":true,\"quote\":\"'\",\"delimiter\":\",\",\"query\":\"resources\\r\\n| where type =~ 'microsoft.operationalinsights/workspaces'\\r\\n| project id\",\"crossComponentResources\":[\"value::selected\"],\"value\":[\"value::all\"],\"typeSettings\":{\"resourceTypeFilter\":{\"microsoft.operationalinsights/workspaces\":true},\"additionalResourceOptions\":[\"value::all\"],\"showDefault\":false},\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"label\":\"Log Analytics Workspace\"},{\"id\":\"4f3a03fd-9968-4ee7-b6bc-d04d3bbe14a8\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"TimeRange\",\"label\":\"Time Range\",\"type\":4,\"description\":\"Filter the data of this report to one of these predefined time ranges\",\"isRequired\":true,\"value\":{\"durationMs\":2592000000},\"typeSettings\":{\"selectableValues\":[{\"durationMs\":259200000},{\"durationMs\":604800000},{\"durationMs\":1209600000},{\"durationMs\":2419200000},{\"durationMs\":2592000000}],\"allowCustom\":true}},{\"id\":\"0117bdc3-a4e2-476b-b7cc-3d1f486e67cf\",\"version\":\"KqlParameterItem/1.0\",\"name\":\"ErrorHandle\",\"type\":1,\"query\":\"let MissingTable = view () { print isMissing=1 };\\r\\nunion isfuzzy=true MissingTable, (SecureScores | getschema | summarize c=count() | project isMissing=iff(c > 0, 0, 1))\\r\\n| top 1 by isMissing asc\",\"crossComponentResources\":[\"{workspaceName}\"],\"isHiddenWhenLocked\":true,\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"}],\"style\":\"above\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\"},\"name\":\"Parameters\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 19 19\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"#1b93eb\\\" d=\\\"M16.82 8.886c0 4.81-5.752 8.574-7.006 9.411a.477.477 0 01-.523 0C8.036 17.565 2.18 13.7 2.18 8.886V3.135a.451.451 0 01.42-.419C7.2 2.612 6.154.625 9.5.625s2.3 1.987 6.8 2.091a.479.479 0 01.523.419z\\\"></path><path fill=\\\"url(#0024423711759027356)\\\" d=\\\"M16.192 8.99c0 4.392-5.333 7.947-6.483 8.575a.319.319 0 01-.418 0c-1.15-.732-6.483-4.183-6.483-8.575V3.762a.575.575 0 01.313-.523C7.2 3.135 6.258 1.357 9.4 1.357s2.2 1.882 6.274 1.882a.45.45 0 01.419.418z\\\"></path><path d=\\\"M9.219 5.378a.313.313 0 01.562 0l.875 1.772a.314.314 0 00.236.172l1.957.284a.314.314 0 01.174.535l-1.416 1.38a.312.312 0 00-.09.278l.334 1.949a.313.313 0 01-.455.33l-1.75-.92a.314.314 0 00-.292 0l-1.75.92a.313.313 0 01-.455-.33L7.483 9.8a.312.312 0 00-.09-.278L5.977 8.141a.314.314 0 01.174-.535l1.957-.284a.314.314 0 00.236-.172z\\\" class=\\\"msportalfx-svg-c01\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px -304px 0px 0px;position: relative;top:-5px\\\"> Current score trends per subscription (not affected by the time range parameter)\\r\\n</span>\"},\"customWidth\":\"50\",\"name\":\"text - 3\"},{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 19 19\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"#1b93eb\\\" d=\\\"M16.82 8.886c0 4.81-5.752 8.574-7.006 9.411a.477.477 0 01-.523 0C8.036 17.565 2.18 13.7 2.18 8.886V3.135a.451.451 0 01.42-.419C7.2 2.612 6.154.625 9.5.625s2.3 1.987 6.8 2.091a.479.479 0 01.523.419z\\\"></path><path fill=\\\"url(#0024423711759027356)\\\" d=\\\"M16.192 8.99c0 4.392-5.333 7.947-6.483 8.575a.319.319 0 01-.418 0c-1.15-.732-6.483-4.183-6.483-8.575V3.762a.575.575 0 01.313-.523C7.2 3.135 6.258 1.357 9.4 1.357s2.2 1.882 6.274 1.882a.45.45 0 01.419.418z\\\"></path><path d=\\\"M9.219 5.378a.313.313 0 01.562 0l.875 1.772a.314.314 0 00.236.172l1.957.284a.314.314 0 01.174.535l-1.416 1.38a.312.312 0 00-.09.278l.334 1.949a.313.313 0 01-.455.33l-1.75-.92a.314.314 0 00-.292 0l-1.75.92a.313.313 0 01-.455-.33L7.483 9.8a.312.312 0 00-.09-.278L5.977 8.141a.314.314 0 01.174-.535l1.957-.284a.314.314 0 00.236-.172z\\\" class=\\\"msportalfx-svg-c01\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px 0px 0px 0px;position: relative;top:-3px;left:-4px;\\\"> Aggregated score for selected subscriptions over time\\r\\n</span>\"},\"customWidth\":\"50\",\"name\":\"text - 4\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Current score trends per subscription (show current, 7-day change from the current score as %, 30-day change from the current score as %)\\r\\nlet startOfToday = startofday(now()); \\r\\nlet offsetWeek = 6d; \\r\\nlet offsetMonth = 29d; \\r\\nlet lookbackDurationWeek = 14d; \\r\\nlet lookbackDurationMonth = 45d; \\r\\nlet endTimeWeek = startOfToday - offsetWeek; \\r\\nlet startTimeWeek = endTimeWeek - lookbackDurationWeek; \\r\\nlet endTimeMonth = startOfToday - offsetMonth; \\r\\nlet startTimeMonth = endTimeMonth - lookbackDurationMonth; \\r\\nSecureScores \\r\\n| extend Day = startofday(TimeGenerated) \\r\\n| summarize arg_max(TimeGenerated, *) by Day, SecureScoresSubscriptionId \\r\\n| summarize arg_max(Day, *) by SecureScoresSubscriptionId \\r\\n| join kind = fullouter( \\r\\n    SecureScores \\r\\n    | extend Day = startofday(TimeGenerated) \\r\\n    | where TimeGenerated > startTimeWeek and TimeGenerated <= endTimeWeek \\r\\n    | summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId \\r\\n    | project OldScoreSevenDays = PercentageScore, SecureScoresSubscriptionId \\r\\n    ) \\r\\n    on SecureScoresSubscriptionId \\r\\n| join kind = fullouter( \\r\\n    SecureScores \\r\\n    | extend Day = startofday(TimeGenerated) \\r\\n    | where TimeGenerated > startTimeMonth and TimeGenerated <= endTimeMonth \\r\\n    | summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId \\r\\n    | project OldMonthScore = PercentageScore, SecureScoresSubscriptionId \\r\\n    ) \\r\\n    on SecureScoresSubscriptionId \\r\\n| extend DiffSevenDays = tostring(((PercentageScore - OldScoreSevenDays) / OldScoreSevenDays) * 100) \\r\\n| extend DiffSevenDays = iff(isempty(DiffSevenDays), \\\"\\\", DiffSevenDays) \\r\\n| extend DiffMonth = tostring(((PercentageScore - OldMonthScore) / OldMonthScore) * 100) \\r\\n| extend DiffMonth = iff(isempty(DiffMonth), \\\"\\\", DiffMonth) \\r\\n| project SecureScoresSubscriptionId, CurrentScore = PercentageScore * 100, todouble(DiffSevenDays), todouble(DiffMonth)\",\"size\":0,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"exportFieldName\":\"SecureScoresSubscriptionId\",\"exportParameterName\":\"selectedSubscription\",\"exportDefaultValue\":\"All\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"SecureScoresSubscriptionId\",\"formatter\":15,\"formatOptions\":{\"linkTarget\":null,\"showIcon\":true,\"customColumnWidthSetting\":\"25ch\"}},{\"columnMatch\":\"CurrentScore\",\"formatter\":4,\"formatOptions\":{\"min\":0,\"max\":100,\"palette\":\"redGreen\",\"customColumnWidthSetting\":\"20ch\"},\"numberFormat\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumSignificantDigits\":2}}},{\"columnMatch\":\"DiffSevenDays\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"<\",\"thresholdValue\":\"0\",\"representation\":\"trenddown\",\"text\":\"{0}{1}\"},{\"operator\":\">\",\"thresholdValue\":\"0\",\"representation\":\"trendup\",\"text\":\"{0}{1}\"},{\"operator\":\"is Empty\",\"thresholdValue\":\"0\",\"representation\":\"Normal\",\"text\":\"N/A\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Blank\",\"text\":\"{0}{1}\"}],\"customColumnWidthSetting\":\"20ch\"},\"numberFormat\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumSignificantDigits\":2}}},{\"columnMatch\":\"DiffMonth\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"<\",\"thresholdValue\":\"0\",\"representation\":\"trenddown\",\"text\":\"{0}{1}\"},{\"operator\":\">\",\"thresholdValue\":\"0\",\"representation\":\"trendup\",\"text\":\"{0}{1}\"},{\"operator\":\"is Empty\",\"thresholdValue\":\"0\",\"representation\":\"Normal\",\"text\":\"N/A\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Blank\",\"text\":\"{0}{1}\"}],\"customColumnWidthSetting\":\"20ch\"},\"numberFormat\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":false,\"maximumSignificantDigits\":2}}}],\"rowLimit\":500,\"sortBy\":[{\"itemKey\":\"$gen_link_SecureScoresSubscriptionId_0\",\"sortOrder\":1}],\"labelSettings\":[{\"columnId\":\"SecureScoresSubscriptionId\",\"label\":\"Subscription name\"},{\"columnId\":\"CurrentScore\",\"label\":\"Current score %\"},{\"columnId\":\"DiffSevenDays\",\"label\":\"7-day change\"},{\"columnId\":\"DiffMonth\",\"label\":\"30-day change\"}]},\"sortBy\":[{\"itemKey\":\"$gen_link_SecureScoresSubscriptionId_0\",\"sortOrder\":1}]},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"ScoreTrends\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Aggregated score for all subscriptions over time\\r\\nSecureScores\\r\\n| where '{selectedSubscription}' == 'All' or SecureScoresSubscriptionId == '{selectedSubscription}'\\r\\n| where MaxScore>0\\r\\n| extend subscriptionScore = CurrentScore/MaxScore \\r\\n| extend subScoreXsubWeight = subscriptionScore*Weight \\r\\n| extend Day = startofday(TimeGenerated) \\r\\n| summarize upperValue = sum(subScoreXsubWeight), underValue = sum(todouble(Weight)) by Day\\r\\n| extend OverallScore = 100*((upperValue)/(underValue))\\r\\n| project OverallScore, Day\",\"size\":0,\"aggregation\":5,\"showAnnotations\":true,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"timeBrushParameterName\":\"TimeRange\",\"timeBrushExportOnlyWhenBrushed\":true,\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"timechart\",\"chartSettings\":{\"seriesLabelSettings\":[{\"seriesName\":\"overallScore\",\"label\":\"Overall Score\",\"color\":\"lightBlue\"}],\"ySettings\":{\"min\":0,\"max\":100}}},\"customWidth\":\"50\",\"showPin\":true,\"name\":\"ScoreOvertime\"}],\"exportParameters\":true},\"conditionalVisibilities\":[{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"},{\"parameterName\":\"ErrorHandle\",\"comparison\":\"isNotEqualTo\",\"value\":\"1\"}],\"name\":\"SecureScore\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 18 18\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"url(#ae5004eb-b3cc-4afc-9498-a0eb145de4dc)\\\" d=\\\"M6.437 1.856l-.292-.292a.5.5 0 00-.707 0L2.606 4.392 1.441 3.229a.5.5 0 00-.707 0l-.293.293a.5.5 0 000 .707l1.812 1.815a.5.5 0 00.354.146.5.5 0 00.353-.146l3.477-3.481a.5.5 0 000-.707z\\\"></path><rect width=\\\"10.366\\\" height=\\\"1.895\\\" x=\\\"7.339\\\" y=\\\"2.949\\\" fill=\\\"#a3a3a3\\\" rx=\\\".923\\\"></rect><rect width=\\\"10.366\\\" height=\\\"1.895\\\" x=\\\"7.339\\\" y=\\\"8.073\\\" fill=\\\"#a3a3a3\\\" rx=\\\".923\\\"></rect><rect width=\\\"10.366\\\" height=\\\"1.895\\\" x=\\\"7.339\\\" y=\\\"13.196\\\" fill=\\\"#a3a3a3\\\" rx=\\\".923\\\"></rect><path fill=\\\"url(#a1226368-080a-4756-9af4-a472e9b2c59c)\\\" d=\\\"M6.437 7.053l-.292-.293a.5.5 0 00-.707 0L2.606 9.588 1.441 8.425a.5.5 0 00-.707 0l-.293.293a.5.5 0 000 .707l1.812 1.815a.5.5 0 00.354.147.5.5 0 00.353-.147l3.477-3.48a.5.5 0 000-.707z\\\"></path><path fill=\\\"url(#a87a55b1-552d-4fae-9ce3-1c309da31213)\\\" d=\\\"M6.437 12.249l-.292-.293a.5.5 0 00-.354-.146.494.494 0 00-.353.146l-2.832 2.828-1.165-1.163a.5.5 0 00-.707 0l-.293.292a.5.5 0 000 .707l1.812 1.815a.5.5 0 00.707 0l3.477-3.48a.5.5 0 000-.706z\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px -304px 0px 0px;position: relative;top:-5px\\\"> Top recommendations with recent increase in unhealthy resources\\r\\n</span> <br>\\r\\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Recommendations with the most resources that have become unhealthy in the periods shown\"},\"customWidth\":\"50\",\"name\":\"UnhealthyRecommendations\"},{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 34 28\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"#949494\\\" d=\\\"M2.44 22.93a.19.19 0 000 .13.24.24 0 00.09.08l1.73 1 2.93 1.69a.25.25 0 00.19 0 .31.31 0 00.16-.11l1-1.68a.21.21 0 000-.17.22.22 0 00-.11-.14L5 21.78a.24.24 0 01-.08-.09.21.21 0 010-.12V6.14a.16.16 0 010-.12.24.24 0 01.08-.09L8.46 4a.22.22 0 00.11-.14.2.2 0 000-.17L7.57 2l-.06-.08h-.09a.17.17 0 00-.1 0h-.1L4.35 3.53l-1.79 1a.24.24 0 00-.09.08.18.18 0 000 .12z\\\"></path><path fill=\\\"#a3a3a3\\\" d=\\\"M4.89 6L5 5.93 8.42 4a.18.18 0 00.07 0 .18.18 0 000-.08.17.17 0 000-.1.11.11 0 000-.08L7.52 2a.22.22 0 000-.08.16.16 0 00-.08-.06h-.1a.29.29 0 00-.1 0L4.31 3.53l-1.78 1a.09.09 0 00-.09.08l1.34.77zm3.53 17.7L5 21.75a.35.35 0 01-.11-.13l-2.44 1.49h.08l1.72 1 3 1.66a.19.19 0 00.09 0h.09l.09-.05.06-.07 1-1.68a.15.15 0 000-.09.24.24 0 000-.08.18.18 0 00-.05-.07s-.08-.03-.11-.03z\\\"></path><path fill=\\\"#949494\\\" d=\\\"M32.51 22.93a.21.21 0 010 .12.2.2 0 01-.09.09l-1.73 1-2.93 1.69a.25.25 0 01-.19 0 .31.31 0 01-.16-.11l-1-1.68a.25.25 0 010-.17.21.21 0 01.1-.14l3.45-1.95a.26.26 0 00.11-.21V6.14A.19.19 0 0030 6l-.08-.08L26.48 4a.21.21 0 01-.1-.14.25.25 0 010-.17l1-1.68.06-.08h.09a.16.16 0 01.1 0h.1l2.87 1.6 1.79 1a.24.24 0 01.09.08.27.27 0 010 .12z\\\"></path><path fill=\\\"#a3a3a3\\\" d=\\\"M30.06 6L30 5.93 26.53 4h-.08v-.08a.34.34 0 010-.1.2.2 0 010-.08l1-1.68a.22.22 0 01.05-.08.16.16 0 01.08-.06h.1a.29.29 0 01.1 0l2.88 1.66 1.78 1a.09.09 0 01.09.08l-1.34.77zm-3.53 17.7L30 21.75a.26.26 0 00.1-.13l2.43 1.49h-.08l-1.72 1-3 1.66h-.18a.26.26 0 01-.09-.05l-.06-.07-1-1.68a.28.28 0 010-.09.24.24 0 010-.08.18.18 0 01.05-.07.12.12 0 01.08-.03z\\\"></path><path d=\\\"M25.57 14.31H14.48a.86.86 0 01-.87-.77.79.79 0 01.87-.67h11.09a.79.79 0 01.87.67.86.86 0 01-.87.77zm0-5.61H14.48a.86.86 0 01-.87-.77.79.79 0 01.87-.67h11.09a.79.79 0 01.87.67.86.86 0 01-.87.77zm0 11.22H14.48a.86.86 0 01-.87-.77.79.79 0 01.87-.67h11.09a.79.79 0 01.87.67.86.86 0 01-.87.77z\\\" class=\\\"msportalfx-svg-c03\\\"></path><path d=\\\"M8.44 7.73l.62-.63 1.27 1.26 2.52-2.52.63.63-3.15 3.15zm0 5.62l.62-.63L10.33 14l2.52-2.52.63.63-3.15 3.15zm0 5.61l.62-.63 1.27 1.26 2.52-2.52.63.63-3.15 3.15z\\\" class=\\\"msportalfx-svg-c13\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px -304px 0px 0px;position: relative;top:-5px\\\"> Security controls scores over time (weekly)\\r\\n</span>\\r\\n\\r\\n\"},\"customWidth\":\"50\",\"name\":\"text - 3\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Top recommendations with recent increase in unhealthy resources\\r\\nSecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState  =~ \\\"Unhealthy\\\"\\r\\n| summarize UnhealthyAssessedResources = dcount(AssessedResourceId),RecommendationName = any(RecommendationName) by RecommendationId\\r\\n| project  RecommendationName, UnhealthyAssessedResources\\r\\n| sort by UnhealthyAssessedResources desc\\r\\n| take 10\",\"size\":0,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"table\",\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"RecommendationName\",\"formatter\":0,\"formatOptions\":{\"customColumnWidthSetting\":\"70ch\"},\"numberFormat\":{\"unit\":0,\"options\":{\"style\":\"decimal\",\"useGrouping\":false}},\"tooltipFormat\":{\"tooltip\":\"View recommendation '{0}'\"}},{\"columnMatch\":\"UnhealthyAssessedResources\",\"formatter\":4,\"formatOptions\":{\"min\":0,\"palette\":\"blue\",\"compositeBarSettings\":{\"labelText\":\"\",\"columnSettings\":[]},\"customColumnWidthSetting\":\"25ch\"}},{\"columnMatch\":\"RecommendationId\",\"formatter\":5}],\"labelSettings\":[{\"columnId\":\"RecommendationName\",\"label\":\"Recommendation name\"},{\"columnId\":\"UnhealthyAssessedResources\",\"label\":\"Unhealthy count\"}]},\"tileSettings\":{\"showBorder\":false,\"titleContent\":{\"columnMatch\":\"RecommendationName\",\"formatter\":1},\"leftContent\":{\"columnMatch\":\"UnhealthyCount\",\"formatter\":12,\"formatOptions\":{\"palette\":\"auto\"},\"numberFormat\":{\"unit\":17,\"options\":{\"maximumSignificantDigits\":3,\"maximumFractionDigits\":2}}}},\"graphSettings\":{\"type\":0,\"topContent\":{\"columnMatch\":\"RecommendationName\",\"formatter\":1},\"centerContent\":{\"columnMatch\":\"UnhealthyCount\",\"formatter\":1,\"numberFormat\":{\"unit\":17,\"options\":{\"maximumSignificantDigits\":3,\"maximumFractionDigits\":2}}}}},\"customWidth\":\"50\",\"name\":\"query - 7\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Security controls score over time (weekly) \\r\\nlet subscriptionsWeight = \\r\\n    SecureScores\\r\\n    | where '{selectedSubscription}' == 'All' or SecureScoresSubscriptionId == '{selectedSubscription}'\\r\\n    | summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId \\r\\n    | project SecureScoresSubscriptionId, SubscriptionWeight = Weight; \\r\\nSecureScoreControls \\r\\n| where MaxScore > 0\\r\\n| where IsSnapshot == true\\r\\n| extend Week = startofweek(TimeGenerated) \\r\\n| summarize arg_max(TimeGenerated, *) by SecureScoresSubscriptionId, ControlId, Week \\r\\n| join kind=inner(\\r\\n    subscriptionsWeight\\r\\n  ) on SecureScoresSubscriptionId \\r\\n| extend WeightedControlScore = PercentageScore * SubscriptionWeight \\r\\n| summarize WeightedScoreAvg = sum(WeightedControlScore)/sum(SubscriptionWeight)*100, ControlName = any(ControlName) by ControlId, Week\\r\\n| order by WeightedScoreAvg desc\",\"size\":0,\"aggregation\":5,\"showAnnotations\":true,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"visualization\":\"timechart\",\"graphSettings\":{\"type\":0,\"topContent\":{\"columnMatch\":\"ControlId\",\"formatter\":1},\"centerContent\":{\"columnMatch\":\"WeightedAvgPerControl\",\"formatter\":1,\"numberFormat\":{\"unit\":17,\"options\":{\"maximumSignificantDigits\":3,\"maximumFractionDigits\":2}}}},\"chartSettings\":{\"group\":\"ControlName\",\"createOtherGroup\":0,\"showLegend\":true,\"ySettings\":{\"numberFormatSettings\":{\"unit\":1,\"options\":{\"style\":\"decimal\",\"useGrouping\":true}},\"min\":0,\"max\":100}}},\"customWidth\":\"50\",\"name\":\"Controls\"}]},\"conditionalVisibilities\":[{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"},{\"parameterName\":\"ErrorHandle\",\"comparison\":\"isNotEqualTo\",\"value\":\"1\"}],\"name\":\"group - 8\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"items\":[{\"type\":1,\"content\":{\"json\":\"<svg viewBox=\\\"0 0 18 18\\\" width=\\\"20\\\" class=\\\"fxt-escapeShadow\\\" role=\\\"presentation\\\" focusable=\\\"false\\\" xmlns:svg=\\\"http://www.w3.org/2000/svg\\\" xmlns:xlink=\\\"http://www.w3.org/1999/xlink\\\" aria-hidden=\\\"true\\\"><g><path fill=\\\"url(#18748923018756614)\\\" d=\\\"M1.9.947h14.21v16.106a.947.947 0 01-.947.947H2.842a.947.947 0 01-.947-.947z\\\"></path><path d=\\\"M3.8.944h10.42V15.2a.949.949 0 01-.947.95H4.746a.949.949 0 01-.946-.95z\\\" class=\\\"msportalfx-svg-c01\\\"></path><path fill=\\\"#0078d4\\\" d=\\\"M7.579.474a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm-1.895 0a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm5.684 0a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm-1.894 0a.474.474 0 00-.948 0v.947a.474.474 0 00.948 0zm3.789 0a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0z\\\"></path><path fill=\\\"#005ba1\\\" d=\\\"M11.368 13.737a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm1.895-2.837a.474.474 0 10-.947 0v3.789a.474.474 0 10.947 0zm-7.579 2.837a.474.474 0 10-.947 0v.947a.474.474 0 10.947 0zm1.895-1.895a.474.474 0 10-.947 0v2.842a.474.474 0 10.947 0zm1.895.947a.474.474 0 00-.948 0v1.895a.474.474 0 00.948 0z\\\"></path><path fill=\\\"#b796f9\\\" d=\\\"M10.976 12.147l-3.824-1.912-1.774 1.775-.335-.335L7.059 9.66l3.754 1.877 1.779-2.668.395.262-2.011 3.016z\\\"></path><path fill=\\\"#773adc\\\" d=\\\"M7.105 10.421a.474.474 0 10-.473-.474.474.474 0 00.473.474zM9 11.374a.477.477 0 10-.474-.476.475.475 0 00.474.476zm1.9.948a.477.477 0 10-.474-.477.475.475 0 00.474.477zm-5.689-.006a.474.474 0 10-.474-.474.474.474 0 00.474.474zm7.578-2.837A.477.477 0 1012.316 9a.475.475 0 00.473.479z\\\"></path><path fill=\\\"#1b93eb\\\" d=\\\"M11.368 5.487c0 1.541-1.86 2.746-2.266 3.014a.154.154 0 01-.17 0c-.406-.234-2.3-1.473-2.3-3.014V3.646a.144.144 0 01.135-.134c1.489-.034 1.15-.67 2.233-.67s.744.636 2.2.67a.154.154 0 01.169.134z\\\"></path><path fill=\\\"url(#381967167170842)\\\" d=\\\"M10.9 5.52c0 1.284-1.489 2.288-1.814 2.512a.119.119 0 01-.135 0C8.621 7.836 7.105 6.8 7.105 5.52V3.986a.118.118 0 01.109-.112c1.186-.028.92-.558 1.786-.558s.6.53 1.759.558a.125.125 0 01.136.112z\\\"></path><path d=\\\"M8.914 3.972a.1.1 0 01.172 0l.332.707a.094.094 0 00.071.054l.75.114a.1.1 0 01.053.16l-.548.562a.1.1 0 00-.026.081l.129.789a.1.1 0 01-.139.1l-.662-.366a.1.1 0 00-.092 0l-.662.366a.1.1 0 01-.139-.1l.129-.789a.1.1 0 00-.026-.081l-.548-.562a.1.1 0 01.053-.16l.75-.114a.094.094 0 00.071-.054z\\\" class=\\\"msportalfx-svg-c01\\\"></path></g></svg>&nbsp;<span style=\\\"font-family: Open Sans; font-weight: 620; font-size: 14px;font-style: bold;margin:-10px 0px 0px 0px;position: relative;top:-3px;left:-4px;\\\"> Resources changed over time\\r\\n</span> <br>\\r\\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Select a recommendation to see its changes\"},\"name\":\"text - 2\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"//Recommendations changes over time (count how many resources have been changed to unhealthy, heathy, and not applicable, per recommendation) \\r\\nlet unhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Unhealthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet healthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Healthy' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet notApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'NotApplicable' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notUnhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Unhealthy' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notHealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Healthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notNotApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'NotApplicable' \\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName) \\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId; \\r\\nlet notHealthyToHealthy =  \\r\\n    notHealthy \\r\\n    | join (\\r\\n        healthy\\r\\n      ) on RecommendationId, AssessedResourceId \\r\\n    | where TimeGenerated < TimeGenerated1 \\r\\n    | summarize ToHealthyCount = count(), RecommendationName=any(RecommendationName) by RecommendationId;\\r\\nlet notUnhealthyToUnhealthy =  \\r\\n    notUnhealthy \\r\\n    | join ( \\r\\n        unhealthy\\r\\n     ) on RecommendationId, AssessedResourceId \\r\\n    | where TimeGenerated < TimeGenerated1 \\r\\n    | summarize ToUnhealthyCount = count(), RecommendationName=any(RecommendationName) by RecommendationId;\\r\\nlet notNotApplicableToNotApplicable =  \\r\\n    notNotApplicable \\r\\n    | join (\\r\\n        notApplicable\\r\\n     ) on RecommendationId, AssessedResourceId \\r\\n    | where TimeGenerated < TimeGenerated1 \\r\\n    | summarize ToNotApplicableCount = count(), RecommendationName=any(RecommendationName) by RecommendationId;\\r\\n// Union \\r\\nunion notHealthyToHealthy, notUnhealthyToUnhealthy, notNotApplicableToNotApplicable\\r\\n| summarize RecommendationName=any(RecommendationName), ToUnhealthyCount = sum(ToUnhealthyCount), ToHealthyCount = sum(ToHealthyCount), ToNotApplicableCount = sum(ToNotApplicableCount) by RecommendationId\\r\\n| order by ToUnhealthyCount desc\",\"size\":0,\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"timeContextFromParameter\":\"TimeRange\",\"exportedParameters\":[{\"fieldName\":\"RecommendationId\",\"parameterName\":\"RecommendationId\"},{\"fieldName\":\"RecommendationName\",\"parameterName\":\"RecommendationName\",\"parameterType\":1}],\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"RecommendationId\",\"formatter\":5},{\"columnMatch\":\"RecommendationName\",\"formatter\":7,\"formatOptions\":{\"linkTarget\":\"Url\",\"bladeOpenContext\":{\"bladeName\":\"RecommendationsBlade\",\"extensionName\":\"Microsoft_Azure_Security\",\"bladeParameters\":[{\"name\":\"assessmentKey\",\"source\":\"column\",\"value\":\"RecommendationId\"}]},\"customColumnWidthSetting\":\"100ch\"}},{\"columnMatch\":\"UnhealthyCount\",\"formatter\":8,\"formatOptions\":{\"palette\":\"redBright\"}},{\"columnMatch\":\"HealthyCount\",\"formatter\":8,\"formatOptions\":{\"palette\":\"green\"}},{\"columnMatch\":\"NotApplicableCount\",\"formatter\":8,\"formatOptions\":{\"palette\":\"gray\"}},{\"columnMatch\":\"AssessedResourceId\",\"formatter\":13,\"formatOptions\":{\"linkTarget\":null,\"showIcon\":true}}],\"labelSettings\":[{\"columnId\":\"RecommendationName\",\"label\":\"Recommendation name\"},{\"columnId\":\"ToUnhealthyCount\",\"label\":\"To unhealthy\"},{\"columnId\":\"ToHealthyCount\",\"label\":\"To healthy\"},{\"columnId\":\"ToNotApplicableCount\",\"label\":\"To not applicable\"}]},\"sortBy\":[]},\"name\":\"RecommendationStatusChanges\"},{\"type\":1,\"content\":{\"json\":\"To view changes over time on a specific recommendation, please select any from the list above.\",\"style\":\"info\"},\"conditionalVisibility\":{\"parameterName\":\"RecommendationId\",\"comparison\":\"isEqualTo\"},\"name\":\"ChangeLogBanner\"},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"let unhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Unhealthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId\\r\\n| project UnhealthyRecommendationId = RecommendationId, UnhealthyResourceId = AssessedResourceId, UnhealhyTime =  TimeGenerated, tostring(SubscriptionId);\\r\\nlet notApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'NotApplicable'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId\\r\\n| project NARecommendationId = RecommendationId, NAResourceId = AssessedResourceId, NATime =  TimeGenerated, tostring(SubscriptionId);\\r\\nlet healthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState == 'Healthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId\\r\\n| project HealthyRecommendationId = RecommendationId, HealthyResourceId = AssessedResourceId, HealhyTime =  TimeGenerated, tostring(SubscriptionId);\\r\\nlet NotHealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Healthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet NotUnhealthy = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'Unhealthy'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet NotNotApplicable = SecurityRecommendation\\r\\n| extend SubscriptionId = iff(AssessedResourceId==\\\"N/A\\\", split(url_decode(RecommendationLink),'/')[9], split(AssessedResourceId, '/')[2])\\r\\n| where '{selectedSubscription}' == 'All' or SubscriptionId == '{selectedSubscription}'\\r\\n| where RecommendationState !~ 'NotApplicable'\\r\\n| where isnotempty(RecommendationId) and isnotempty(RecommendationName)\\r\\n| summarize arg_max(TimeGenerated, *) by RecommendationId, AssessedResourceId;\\r\\nlet 1_to_Healthy = \\r\\n    NotHealthy\\r\\n    | extend orignalState = RecommendationState\\r\\n    | join healthy on $left.RecommendationId == $right.HealthyRecommendationId, $left.AssessedResourceId == $right.HealthyResourceId\\r\\n    | where TimeGenerated < HealhyTime\\r\\n    | extend update = \\\"To healthy\\\"\\r\\n    | project RecommendationId, RecommendationName, Description, OriginalState = RecommendationState, update, TimeGenerated, RecommendationSeverity, tostring(SubscriptionId), AssessedResourceId, RecommendationLink;\\r\\n//1_to_Healthy\\r\\nlet 2_to_Unhealthy = \\r\\n    NotUnhealthy\\r\\n    | extend orignalState = RecommendationState\\r\\n    | join unhealthy on $left.RecommendationId == $right.UnhealthyRecommendationId, $left.AssessedResourceId == $right.UnhealthyResourceId\\r\\n    | where TimeGenerated < UnhealhyTime\\r\\n    | extend update = \\\"To unhealthy\\\"\\r\\n    | project RecommendationId, RecommendationName, Description, OriginalState = RecommendationState, update, TimeGenerated, RecommendationSeverity, tostring(SubscriptionId), AssessedResourceId, RecommendationLink;\\r\\n//2_to_Unhealthy\\r\\nlet 3_to_NotApplicable = \\r\\n    NotNotApplicable\\r\\n    | extend orignalState = RecommendationState\\r\\n    | join notApplicable on $left.RecommendationId == $right.NARecommendationId, $left.AssessedResourceId == $right.NAResourceId\\r\\n    | where TimeGenerated < NATime\\r\\n    | extend update = \\\"To not applicable\\\"\\r\\n    | extend NotApplicableReason = iff(isempty(NotApplicableReason), \\\"NA\\\", NotApplicableReason)\\r\\n    | project RecommendationId, RecommendationName, Description, OriginalState = RecommendationState, update, TimeGenerated, RecommendationSeverity, tostring(SubscriptionId), AssessedResourceId, RecommendationLink, NotApplicableReason;\\r\\n// JOIN\\r\\nunion 1_to_Healthy, 2_to_Unhealthy, 3_to_NotApplicable\\r\\n| extend FullRecommendationLink = strcat(\\\"http://\\\",RecommendationLink)\\r\\n| extend AssessedResourceId = iff(AssessedResourceId==\\\"N/A\\\", extract(\\\".*onPremiseMachines/(.+)\\\",1, url_decode(RecommendationLink)), AssessedResourceId)\\r\\n| project-away RecommendationLink\\r\\n| where RecommendationId == '{RecommendationId}'\",\"size\":0,\"title\":\"Changes for \\\"{RecommendationName}\\\"\",\"noDataMessage\":\"No data available. Check your continuous export configuration for the selected workspaces.\",\"showExportToExcel\":true,\"exportToExcelOptions\":\"all\",\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"RecommendationId\",\"formatter\":5},{\"columnMatch\":\"RecommendationName\",\"formatter\":5},{\"columnMatch\":\"Description\",\"formatter\":5},{\"columnMatch\":\"SubscriptionId\",\"formatter\":15,\"formatOptions\":{\"linkTarget\":null,\"showIcon\":true}},{\"columnMatch\":\"NotApplicableReason\",\"formatter\":0,\"formatOptions\":{\"customColumnWidthSetting\":\"30ch\"}},{\"columnMatch\":\"FullRecommendationLink\",\"formatter\":7,\"formatOptions\":{\"linkTarget\":\"Url\",\"linkLabel\":\"View\",\"linkIsContextBlade\":false}}],\"rowLimit\":1000,\"hierarchySettings\":{\"treeType\":1,\"groupBy\":[\"update\"]},\"labelSettings\":[{\"columnId\":\"RecommendationName\",\"label\":\"Recommendation name\"},{\"columnId\":\"OriginalState\",\"label\":\"Original state\"},{\"columnId\":\"update\",\"label\":\"Updated state\"},{\"columnId\":\"TimeGenerated\",\"label\":\"Time of change\"},{\"columnId\":\"RecommendationSeverity\",\"label\":\"Severity\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription\"},{\"columnId\":\"AssessedResourceId\",\"label\":\"Resource\"},{\"columnId\":\"NotApplicableReason\",\"label\":\"Reason\"},{\"columnId\":\"FullRecommendationLink\",\"label\":\"View recommendation\"}]},\"sortBy\":[]},\"conditionalVisibility\":{\"parameterName\":\"RecommendationId\",\"comparison\":\"isNotEqualTo\"},\"name\":\"ChangeLogDetails\"}]},\"conditionalVisibilities\":[{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"},{\"parameterName\":\"ErrorHandle\",\"comparison\":\"isNotEqualTo\",\"value\":\"1\"}],\"name\":\"ChangeLog\"},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"title\":\"Machines not sending current heartbeats\",\"items\":[{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-15m)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 15 minutes\",\"noDataMessage\":\"No machines found not reporting for more than 15 minutes.\",\"timeContext\":{\"durationMs\":86400000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 0\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-24h)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 24 hours\",\"noDataMessage\":\"No machines found not reporting for more than 24 hours.\",\"timeContext\":{\"durationMs\":172800000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 1\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-48h)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 48 hours\",\"noDataMessage\":\"No machines found not reporting for more than 48 hours.\",\"timeContext\":{\"durationMs\":604800000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 2\",\"styleSettings\":{\"showBorder\":true}},{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"Heartbeat\\n| join kind = leftanti (\\n    Heartbeat\\n    | where TimeGenerated > now(-7d)\\n) on SourceComputerId\\n| summarize arg_max(LatestTimestamp=TimeGenerated, SubscriptionId) by ResourceId\\n| order by LatestTimestamp\",\"size\":3,\"showAnalytics\":true,\"title\":\"Agent not reporting for more than 7 days\",\"noDataMessage\":\"No machines found not reporting for more than 7 days.\",\"timeContext\":{\"durationMs\":2592000000},\"queryType\":0,\"resourceType\":\"microsoft.operationalinsights/workspaces\",\"crossComponentResources\":[\"{workspaceName}\"],\"gridSettings\":{\"labelSettings\":[{\"columnId\":\"ResourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"LatestTimestamp\",\"label\":\"Latest Heartbeat\"},{\"columnId\":\"SubscriptionId\",\"label\":\"Subscription ID\"}]}},\"customWidth\":\"50\",\"name\":\"query - 3\",\"styleSettings\":{\"showBorder\":true}}]},\"conditionalVisibilities\":[{\"parameterName\":\"SelectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"NotReportingTab\"},{\"parameterName\":\"workspaceName\",\"comparison\":\"isNotEqualTo\"}],\"name\":\"MachinesNotReporting\",\"styleSettings\":{\"showBorder\":true}},{\"type\":12,\"content\":{\"version\":\"NotebookGroup/1.0\",\"groupType\":\"editable\",\"title\":\"Protection Status\",\"items\":[{\"type\":3,\"content\":{\"version\":\"KqlItem/1.0\",\"query\":\"securityresources\\n| where type =~ \\\"microsoft.security/assessments\\\" or type =~ \\\"microsoft.security/softwareInventories\\\"\\n| extend assessmentStatusCode = case(type =~ \\\"microsoft.security/assessments\\\", tostring(properties.status.code), \\\"\\\")\\n| extend severity = case(assessmentStatusCode =~ \\\"unhealthy\\\", tolower(tostring(properties.metadata.severity)), tolower(assessmentStatusCode))\\n| extend exemptionType = case(tolower(type) != \\\"microsoft.security/assessments\\\",\\\"N/A\\\", case(properties.status.cause =~ \\\"exempt\\\", \\\"Yes\\\", \\\"No\\\"))\\n| extend source = case(type =~ \\\"microsoft.security/assessments\\\", tostring(properties.resourceDetails.Source), \\\"\\\")\\n| extend resourceId = trim(\\\" \\\", tolower(tostring(case(source =~ \\\"azure\\\", properties.resourceDetails.Id,\\n                                                                            source =~ \\\"aws\\\" and isnotempty(tostring(properties.resourceDetails.ConnectorId)), properties.resourceDetails.Id,\\n                                                                            source =~ \\\"aws\\\", properties.resourceDetails.AzureResourceId,\\n                                                                            source =~ \\\"gcp\\\", properties.resourceDetails.AzureResourceId,\\n                                                                            type =~ \\\"microsoft.security/assessments\\\", extract(\\\"^(.+)/providers/Microsoft.Security/assessments/.+$\\\",1,id),extract(\\\"^(.+)/providers/Microsoft.Security/softwareInventories/.+$\\\",1,id)))))\\n| extend resourceName = iff(source =~ \\\"aws\\\" and isnotempty(tostring(properties.resourceDetails.ConnectorId)), tostring(properties.additionalData.ResourceName), extract(@\\\"(.+)/(.+)\\\", 2, resourceId))\\n| extend regexResourceId = extract_all(@\\\"/providers/([^/]+)(?:/([^/]+)/[^/]+(?:/([^/]+)/[^/]+)?)?/([^/]+)/[^/]+$\\\", resourceId)\\n| extend RegexResourceType = regexResourceId[0]\\n| extend mainType = RegexResourceType[1], extendedType = RegexResourceType[2], resourceType = RegexResourceType[3]\\n| extend providerName = RegexResourceType[0],\\n                        mainType = case(mainType !~ \\\"\\\", strcat(\\\"/\\\",mainType), \\\"\\\"),\\n                        extendedType = case(extendedType!~ \\\"\\\", strcat(\\\"/\\\",extendedType), \\\"\\\"),\\n                        resourceType = case(resourceType!~ \\\"\\\", strcat(\\\"/\\\",resourceType), \\\"\\\")\\n| extend array = split(resourceId, '/')\\n| extend typeFullPath = case(\\n                    array_length(array) == 3, 'subscription',\\n                    array_length(array) == 5, 'resourcegroups',\\n                    source =~ \\\"aws\\\" and isnotempty(tostring(properties.resourceDetails.ConnectorId)), tolower(strcat(providerName, mainType, \\\"/\\\", tostring(properties.additionalData.ResourceProvider), tostring(properties.additionalData.ResourceType))),\\n                    strcat(providerName, mainType, extendedType, resourceType))\\n| extend resourceType = case(typeFullPath =~ 'resourcegroups' or typeFullPath =~ 'subscription', typeFullPath, tolower(trim(\\\"/\\\", resourceType)))\\n| extend assessmentKey = case(type =~ \\\"microsoft.security/assessments\\\", tostring(name), \\\"\\\")\\n| extend softwareVendorName = case(type =~ \\\"microsoft.security/softwareInventories\\\", tostring(properties.vendor), \\\"\\\")\\n| extend softwareName = case(type =~ \\\"microsoft.security/softwareInventories\\\", tostring(properties.softwareName), \\\"\\\")\\n| extend softwareVersion = case(type =~ \\\"microsoft.security/softwareInventories\\\", tostring(properties.version), \\\"\\\")\\n| extend softwareNameIdentifier = case(type =~ \\\"microsoft.security/softwareInventories\\\", strcat(softwareVendorName, \\\",\\\", softwareName, \\\",\\\", softwareVersion), \\\"\\\")\\n| extend environment = case(type =~ \\\"microsoft.security/assessments\\\", properties.resourceDetails[\\\"Source\\\"], \\\"\\\")\\n| extend environment = case(environment =~ \\\"onpremise\\\", tolower(\\\"Non-Azure\\\"), tolower(environment))\\n| extend osTypeProperty = properties.additionalData[\\\"OS Type\\\"]\\n| extend osType = case(isnotempty(osTypeProperty), osTypeProperty, \\\"\\\")\\n| extend hasAgent = case(assessmentKey == \\\"d1db3318-01ff-16de-29eb-28b344515626\\\" or assessmentKey == \\\"45cfe080-ceb1-a91e-9743-71551ed24e94\\\" or assessmentKey == \\\"720a3e77-0b9a-4fa9-98b6-ddf0fd7e32c1\\\" or assessmentKey == \\\"27ac71b1-75c5-41c2-adc2-858f5db45b08\\\", assessmentStatusCode, \\\"\\\")\\n| extend hasAgent = case(assessmentKey == \\\"4ab6e3c5-74dd-8b35-9ab9-f61b30875b27\\\" or assessmentKey == \\\"181ac480-f7c4-544b-9865-11b8ffe87f47\\\" or assessmentKey == \\\"4fb67663-9ab9-475d-b026-8c544cced439\\\" , \\\"healthy\\\", hasAgent)\\n| extend workspaceAzureResourceId = case(hasAgent !~ \\\"\\\", properties.additionalData[\\\"Reporting workspace azure id\\\"], \\\"\\\")\\n| extend workspaceName = case(workspaceAzureResourceId !~ \\\"\\\", extract(@\\\"(.+)/(.+)\\\", 2, workspaceAzureResourceId), \\\"\\\")\\n| extend assessmentDisplayName = case(type =~ \\\"microsoft.security/assessments\\\", case(isnotempty(properties.displayName), properties.displayName, properties.metadata.displayName), \\\"\\\")\\n| extend assessmentIdentifier = case(type =~ \\\"microsoft.security/assessments\\\", strcat(assessmentKey, \\\",\\\" , assessmentDisplayName, \\\",\\\", severity), \\\"\\\")\\n| summarize assessmentsCount = count() , assessmentsIdentifier = make_list(assessmentIdentifier), softwareNamesIdentifier = make_list(softwareNameIdentifier), hasAgent = max(hasAgent), workspaceName = max(workspaceName), environment = max(environment), osType = max(osType), exemptionType = max(exemptionType)  by resourceId, subscriptionId, resourceName, resourceType, typeFullPath, severity\\n| extend packAssessments = pack(severity, assessmentsCount)\\n| summarize assessmentsSummary = make_bag(packAssessments), assessmentsIdentifier = make_set(assessmentsIdentifier), softwareNamesIdentifier = make_set(softwareNamesIdentifier), hasAgent = max(hasAgent), workspaceName= max(workspaceName), environment = max(environment), osType= max(osType), exemptionType = max(exemptionType)  by resourceId, subscriptionId, resourceName, resourceType, typeFullPath\\n| extend agentMonitoring = case(hasAgent =~ \\\"NotApplicable\\\" or hasAgent =~ \\\"\\\", '',\\n                                                hasAgent =~ \\\"Unhealthy\\\", \\\"notInstalled\\\",\\n                                                \\\"installed\\\")\\n| join kind=leftouter (\\n                    securityresources\\n                    | where type =~ \\\"microsoft.security/pricings\\\"\\n                    | project subscriptionId, bundleName = tolower(name), freeTrialRemainingTime = properties.freeTrialRemainingTime, pricingTier = tolower(properties.pricingTier)\\n                    | extend bundlesPricing = pack(bundleName, pricingTier)\\n                    | summarize subscriptionPricing = make_bag(bundlesPricing) by subscriptionId\\n                ) on subscriptionId\\n| extend hasNoSoftwareData = case(array_length(softwareNamesIdentifier) == 1, case(set_has_element(softwareNamesIdentifier, \\\"\\\"), true, false), false)\\n| extend softwareNamesIdentifier = case(hasNoSoftwareData, softwareNamesIdentifier, set_difference(softwareNamesIdentifier, pack_array(\\\"\\\")))\\n| extend AssessmentsHigh = case(isnull(assessmentsSummary.high), 0 , toint(assessmentsSummary.high))\\n| extend AssessmentsMedium = case(isnull(assessmentsSummary.medium), 0 , toint(assessmentsSummary.medium))\\n| extend AssessmentsLow = case(isnull(assessmentsSummary.low), 0 , toint(assessmentsSummary.low))\\n| extend unhealthyAssessmentsCount = AssessmentsHigh + AssessmentsMedium + AssessmentsLow\\n| extend virtualmachines = case(isnull(subscriptionPricing), '' , subscriptionPricing.virtualmachines)\\n| extend virtualmachines = case(virtualmachines == 'free', 'off', 'on')\\n| extend sqlservers = case(isnull(subscriptionPricing), '' , subscriptionPricing.sqlservers)\\n| extend sqlservers = case(sqlservers == 'free', 'off', 'on')\\n| extend kubernetesservice = case(isnull(subscriptionPricing), '' , subscriptionPricing.kubernetesservice)\\n| extend kubernetesservice = case(kubernetesservice == 'free', 'off', 'on')\\n| extend containerregistry = case(isnull(subscriptionPricing), '' , subscriptionPricing.containerregistry)\\n| extend containerregistry = case(containerregistry == 'free', 'off', 'on')\\n| extend connectedcontainerregistry = case(isnull(subscriptionPricing), '' , subscriptionPricing.connectedcontainerregistry)\\n| extend connectedcontainerregistry = case(connectedcontainerregistry == 'free', 'off', 'on')\\n| extend sqlservervirtualmachines = case(isnull(subscriptionPricing), '' , subscriptionPricing.sqlservervirtualmachines)\\n| extend sqlservervirtualmachines = case(sqlservervirtualmachines == 'free', 'off', 'on')\\n| extend appservices = case(isnull(subscriptionPricing), '' , subscriptionPricing.appservices)\\n| extend appservices = case(appservices == 'free', 'off', 'on')\\n| extend storageaccounts = case(isnull(subscriptionPricing), '' , subscriptionPricing.storageaccounts)\\n| extend storageaccounts = case(storageaccounts == 'free', 'off', 'on')\\n| extend keyvaults = case(isnull(subscriptionPricing), '' , subscriptionPricing.keyvaults)\\n| extend keyvaults = case(keyvaults == 'free', 'off', 'on')\\n| extend opensourcerelationaldatabases = case(isnull(subscriptionPricing), '' , subscriptionPricing.opensourcerelationaldatabases)\\n| extend opensourcerelationaldatabases = case(opensourcerelationaldatabases == 'free', 'off', 'on')\\n| extend calculatedSubscriptionPricing = case(resourceType =~ \\\"subscription\\\" and isempty(subscriptionPricing) == false , iff(subscriptionPricing has \\\"free\\\" and subscriptionPricing has \\\"standard\\\", \\\"partial\\\", iff(subscriptionPricing has \\\"free\\\", \\\"off\\\", \\\"on\\\")), \\\"\\\")\\n| extend resourcePricing = case(typeFullPath =~ \\\"microsoft.classiccompute/virtualmachines\\\", virtualmachines, typeFullPath =~ \\\"microsoft.compute/virtualmachines\\\", virtualmachines, typeFullPath =~ \\\"microsoft.hybridcompute/machines\\\", virtualmachines, typeFullPath =~ \\\"microsoft.sql/servers\\\", sqlservers, typeFullPath =~ \\\"microsoft.containerservice/managedclusters\\\", kubernetesservice, typeFullPath =~ \\\"microsoft.kubernetes/connectedclusters\\\", kubernetesservice, typeFullPath =~ \\\"microsoft.containerregistry/registries\\\", containerregistry, typeFullPath =~ \\\"microsoft.security/connectedcontainerregistries\\\", connectedcontainerregistry, typeFullPath =~ \\\"microsoft.sqlvirtualmachine/sqlvirtualmachines\\\", sqlservervirtualmachines, typeFullPath =~ \\\"microsoft.web/sites\\\", appservices, typeFullPath =~ \\\"microsoft.storage/storageaccounts\\\", storageaccounts, typeFullPath =~ \\\"microsoft.compute/virtualmachinescalesets\\\", virtualmachines, typeFullPath =~ \\\"microsoft.keyvault/vaults\\\", keyvaults, typeFullPath =~ \\\"microsoft.dbforpostgresql/servers\\\", opensourcerelationaldatabases, typeFullPath =~ \\\"microsoft.dbformysql/servers\\\", opensourcerelationaldatabases, typeFullPath =~ \\\"microsoft.dbformariadb/servers\\\", opensourcerelationaldatabases, calculatedSubscriptionPricing)\\n| extend pricing = case(resourceType =~ \\\"subscription\\\" , calculatedSubscriptionPricing , resourcePricing)\\n| extend selectedSoftware = \\\"\\\"\\n| project resourceType, exemptionType, typeFullPath, resourceId, resourceName, subscriptionId, environment, osType, workspaceName, agentMonitoring, assessmentsIdentifier, assessmentsSummary, subscriptionPricing, unhealthyAssessmentsCount, pricing, softwareNamesIdentifier, selectedSoftware\\n| extend resourceGroup = tolower(tostring(split(resourceId, \\\"/\\\")[4]))\\n| order by unhealthyAssessmentsCount, subscriptionId, resourceType, resourceId\\n| where typeFullPath in ('microsoft.compute/virtualmachines', 'microsoft.hybridcompute/machines')\\n| where isnotempty(resourceId)\",\"size\":3,\"showAnalytics\":true,\"queryType\":1,\"resourceType\":\"microsoft.resourcegraph/resources\",\"crossComponentResources\":[\"value::all\"],\"visualization\":\"table\",\"showExpandCollapseGrid\":true,\"gridSettings\":{\"formatters\":[{\"columnMatch\":\"resourceType\",\"formatter\":5},{\"columnMatch\":\"exemptionType\",\"formatter\":5},{\"columnMatch\":\"typeFullPath\",\"formatter\":5},{\"columnMatch\":\"resourceName\",\"formatter\":5},{\"columnMatch\":\"agentMonitoring\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"installed\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"Unhealthy\",\"representation\":\"2\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"NotApplicable\",\"representation\":\"cancelled\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"notInstalled\",\"representation\":\"disabled\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"Disable\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"assessmentsIdentifier\",\"formatter\":5},{\"columnMatch\":\"assessmentsSummary\",\"formatter\":5},{\"columnMatch\":\"subscriptionPricing\",\"formatter\":5},{\"columnMatch\":\"unhealthyAssessmentsCount\",\"formatter\":3,\"formatOptions\":{\"min\":0,\"max\":15,\"palette\":\"greenRed\"}},{\"columnMatch\":\"pricing\",\"formatter\":18,\"formatOptions\":{\"thresholdsOptions\":\"icons\",\"thresholdsGrid\":[{\"operator\":\"==\",\"thresholdValue\":\"on\",\"representation\":\"success\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"text\":\"{0}{1}\"},{\"operator\":\"==\",\"thresholdValue\":\"off\",\"representation\":\"disabled\",\"text\":\"{0}{1}\"},{\"operator\":\"Default\",\"thresholdValue\":null,\"representation\":\"disabled\",\"text\":\"{0}{1}\"}]}},{\"columnMatch\":\"softwareNamesIdentifier\",\"formatter\":5},{\"columnMatch\":\"selectedSoftware\",\"formatter\":5},{\"columnMatch\":\"resourceGroup\",\"formatter\":5}],\"rowLimit\":1000,\"filter\":true,\"sortBy\":[{\"itemKey\":\"$gen_link_resourceId_3\",\"sortOrder\":2}],\"labelSettings\":[{\"columnId\":\"exemptionType\",\"label\":\"Resource Exemption exists\"},{\"columnId\":\"resourceId\",\"label\":\"Resource ID\"},{\"columnId\":\"subscriptionId\",\"label\":\"Subscription ID\"},{\"columnId\":\"environment\",\"label\":\"Environment\"},{\"columnId\":\"osType\",\"label\":\"OS Type\"},{\"columnId\":\"workspaceName\",\"label\":\"Workspace Name\"},{\"columnId\":\"agentMonitoring\",\"label\":\"Log Analytics agent status\"},{\"columnId\":\"unhealthyAssessmentsCount\",\"label\":\"Open Recommendations\"},{\"columnId\":\"pricing\",\"label\":\"Azure Defender status\"}]},\"sortBy\":[{\"itemKey\":\"$gen_link_resourceId_3\",\"sortOrder\":2}]},\"name\":\"query - 0\",\"styleSettings\":{\"showBorder\":true}}]},\"conditionalVisibility\":{\"parameterName\":\"SelectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"SecurityTab\"},\"name\":\"protectionStatus\",\"styleSettings\":{\"showBorder\":true}}]},\"conditionalVisibility\":{\"parameterName\":\"selectedTab\",\"comparison\":\"isEqualTo\",\"value\":\"Security\"},\"name\":\"Security\"}],\"isLocked\":false,\"fallbackResourceIds\":[\"workbookresourceid-stage\"]}",
         "version": "1.0",
         "sourceId": "[parameters('workbookResourceId')]",
         "category": "[parameters('workbookType')]"
diff --git a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDevOps.json b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDevOps.json
index 6a14f5d8af..89745f3ee8 100644
--- a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDevOps.json
+++ b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookDevOps.json
@@ -1400,7 +1400,7 @@
               {
                 "type": 1,
                 "content": {
-                  "json": "💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\r\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\r\n2. Select the specific Azure subscription for which you want to configure the data export.\r\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\r\n4. Set the export target to **Log Analytics workspace**.\r\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\r\n6. From the export frequency options, select **Streaming** and **Snapshots**.\r\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\r\n\r\n[Learn more](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\r\n\r\n> **Notes**\r\n* To get full visibility, wait at least one week for the first snapshot to be exported.\r\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export)."
+                  "json": "💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\r\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\r\n2. Select the specific Azure subscription for which you want to configure the data export.\r\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\r\n4. Set the export target to **Log Analytics workspace**.\r\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\r\n6. From the export frequency options, select **Streaming** and **Snapshots**.\r\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\r\n\r\n[Learn more](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\r\n\r\n> **Notes**\r\n* To get full visibility, wait at least one week for the first snapshot to be exported.\r\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export)."
                 },
                 "showPin": false,
                 "name": "Instructions"
diff --git a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookFull.json b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookFull.json
index ea0fed94ff..1de21157ea 100644
--- a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookFull.json
+++ b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookFull.json
@@ -1607,7 +1607,7 @@
               {
                 "type": 1,
                 "content": {
-                  "json": "💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\r\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\r\n2. Select the specific Azure subscription for which you want to configure the data export.\r\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\r\n4. Set the export target to **Log Analytics workspace**.\r\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\r\n6. From the export frequency options, select **Streaming** and **Snapshots**.\r\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\r\n\r\n[Learn more](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\r\n\r\n> **Notes**\r\n* To get full visibility, wait at least one week for the first snapshot to be exported.\r\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export)."
+                  "json": "💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\r\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\r\n2. Select the specific Azure subscription for which you want to configure the data export.\r\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\r\n4. Set the export target to **Log Analytics workspace**.\r\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\r\n6. From the export frequency options, select **Streaming** and **Snapshots**.\r\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\r\n\r\n[Learn more](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\r\n\r\n> **Notes**\r\n* To get full visibility, wait at least one week for the first snapshot to be exported.\r\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export)."
                 },
                 "showPin": false,
                 "name": "Instructions"
diff --git a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookITPro.json b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookITPro.json
index f7cafe50df..2beb6c41c6 100644
--- a/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookITPro.json
+++ b/azure_jumpstart_arcbox/artifacts/mgmtMonitorWorkbookITPro.json
@@ -750,7 +750,7 @@
               {
                 "type": 1,
                 "content": {
-                  "json": "💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\r\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\r\n2. Select the specific Azure subscription for which you want to configure the data export.\r\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\r\n4. Set the export target to **Log Analytics workspace**.\r\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\r\n6. From the export frequency options, select **Streaming** and **Snapshots**.\r\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\r\n\r\n[Learn more](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\r\n\r\n> **Notes**\r\n* To get full visibility, wait at least one week for the first snapshot to be exported.\r\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://docs.microsoft.com/en-us/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export)."
+                  "json": "💡 To use this workbook, you'll need to configure **continuous export** to export data to a Log Analytics workspace:\r\n1. From Microsoft Defender for Cloud's sidebar, select **Environment Settings**.\r\n2. Select the specific Azure subscription for which you want to configure the data export.\r\n3. From the sidebar of the settings page for that subscription, select **Continuous Export**.\r\n4. Set the export target to **Log Analytics workspace**.\r\n5. Select the following data types: **Security recommendations** and **Secure Score (Preview)**.\r\n6. From the export frequency options, select **Streaming** and **Snapshots**.\r\n7. Make sure to select ArcBox's subscription, resource group and Log Analytics workspace as the export target. Select Save.\r\n\r\n[Learn more](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-portal#set-up-a-continuous-export)\r\n\r\n> **Notes**\r\n* To get full visibility, wait at least one week for the first snapshot to be exported.\r\n* To configure continuous export across your organization, use the supplied Azure Policy 'DeployIfNotExist' policies described [here](https://learn.microsoft.com/azure/security-center/continuous-export?tabs=azure-policy#set-up-a-continuous-export)."
                 },
                 "showPin": false,
                 "name": "Instructions"
diff --git a/azure_jumpstart_hcibox/artifacts/SDN/CertHelpers.ps1 b/azure_jumpstart_hcibox/artifacts/SDN/CertHelpers.ps1
index 5e89d5b776..94e0acb7cb 100644
--- a/azure_jumpstart_hcibox/artifacts/SDN/CertHelpers.ps1
+++ b/azure_jumpstart_hcibox/artifacts/SDN/CertHelpers.ps1
@@ -1,5 +1,5 @@
 # --------------------------------------------------------------
-#  Copyright � Microsoft Corporation.  All Rights Reserved.
+#  Copyright � Microsoft Corporation.  All Rights Reserved.
 #  Microsoft Corporation (or based on where you live, one of its affiliates) licenses this sample code for your internal testing purposes only.
 #  Microsoft provides the following sample code AS IS without warranty of any kind. The sample code arenot supported under any Microsoft standard support program or services.
 #  Microsoft further disclaims all implied warranties including, without limitation, any implied warranties of merchantability or of fitness for a particular purpose.
@@ -118,7 +118,7 @@ Function AddCertToLocalMachineStore($certFullPath, $storeName, $securePassword)
     }
     else 
     {
-        # https://msdn.microsoft.com/en-us/library/system.security.cryptography.x509certificates.x509keystorageflags(v=vs.110).aspx
+        # https://msdn.microsoft.com/library/system.security.cryptography.x509certificates.x509keystorageflags(v=vs.110).aspx
         $certificate.import($certFullPath, $securePassword, "MachineKeySet,PersistKeySet")
     }
     
diff --git a/azure_jumpstart_hcibox/artifacts/SDN/SDNExpressUI.psm1 b/azure_jumpstart_hcibox/artifacts/SDN/SDNExpressUI.psm1
index 9c9fe02336..849f094176 100644
--- a/azure_jumpstart_hcibox/artifacts/SDN/SDNExpressUI.psm1
+++ b/azure_jumpstart_hcibox/artifacts/SDN/SDNExpressUI.psm1
@@ -420,7 +420,7 @@ function SDNExpressUI {
             </StackPanel>
             <TextBlock  Margin="179.149,0,0,74.328" HorizontalAlignment="Left" VerticalAlignment="Bottom">
                 <Run Text="For additional help and guidance, refer to the "/>
-                <Hyperlink Name="uri1" NavigateUri="https://docs.microsoft.com/en-us/windows-server/networking/sdn/plan/plan-software-defined-networking">Plan SDN topic on docs.microsoft.com.</Hyperlink>
+                <Hyperlink Name="uri1" NavigateUri="https://learn.microsoft.com/windows-server/networking/sdn/plan/plan-software-defined-networking">Plan SDN topic on docs.microsoft.com.</Hyperlink>
             </TextBlock>
             <Button Name="btnBack1" Content="Back" Margin="0,0,168.868,10" HorizontalAlignment="Right" Width="153.868" Height="34.328" VerticalAlignment="Bottom"/>
             <Button Name="btnNext1" Content="Next" Margin="0,0,10,10" HorizontalAlignment="Right" Width="153.868" Height="34.328" VerticalAlignment="Bottom"/>
diff --git a/docs/FAQ/_index.md b/docs/FAQ/_index.md
deleted file mode 100644
index 0cfa99e92d..0000000000
--- a/docs/FAQ/_index.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-type: docs
-title: "Jumpstart FAQ"
-linkTitle: "Jumpstart FAQ"
-weight: 8
----
-
-# Jumpstart Frequently Asked Questions (FAQ)
-
-## General
-
-### Can I contribute to the Jumpstart?
-
-Absolutely! The Jumpstart is a community-driven open-source project, and all contributions are welcomed. To get started, review the [Jumpstart Scenario Write-up Guidelines](https://azurearcjumpstart.io/scenario_guidelines/) and our [Code of Conduct](https://azurearcjumpstart.io/code_of_conduct/).
-
-## Jumpstart ArcBox
-
-### What are the use cases for ArcBox?
-
-ArcBox is a virtual hybrid sandbox that can be used to explore Azure Arc capabilities, build quick demo environments, support proof-of-concept projects, and even provide a testing platform for specific hybrid scenarios. Many partners and customers use ArcBox to quickly get hands-on with Azure Arc technology because its quick to deploy with minimal requirements.
-
-### What is required to deploy ArcBox?
-
-ArcBox deployment requires an Azure service principal with Contributor or Owner role-based access control (RBAC) on an Azure subscription and resource group. You can deploy ArcBox using the Azure portal, Az CLI, Bicep, or Terraform. The service principal is required to run the automation scripts that deploy and configure ArcBox features. You can view how the service principal is used by exploring the ArcBox code on our [public GitHub repository](https://github.com/microsoft/azure_arc).
-
-### What Azure regions can ArcBox be deployed to?
-
-ArcBox can be deployed to the following regions:
-
-- East US
-- East US 2
-- Central US
-- West US 2
-- North Europe
-- West Europe
-- France Central
-- UK South
-- Australia East
-- Japan East
-- Korea Central
-- Southeast Asia
-
-### What are the different "flavors" of ArcBox?
-
-ArcBox offers three different configurations, or "flavors", that allow the user to choose their own experience.
-
-- [ArcBox "Full"](https://azurearcjumpstart.io/azure_jumpstart_arcbox/Full) - The core ArcBox experience with Azure Arc-enabled servers, Kubernetes, and data services capabilities.
-- [ArcBox for IT Pros](https://azurearcjumpstart.io/azure_jumpstart_arcbox/ITPro) - This essential Azure Arc-enabled servers sandbox includes a mix of Microsoft Windows and Linux servers managed using the included capabilities such Azure Monitor, Microsoft Defender for Cloud, Azure Policy, Update Management and more.
-- [ArcBox for DevOps](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps) - This essential Azure Arc-enabled Kubernetes sandbox with the included capabilities such as GitOps, Open Service Mesh (OSM), secretes management, monitoring, and more.
-- [ArcBox for DataOps](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps) - This essential Azure Arc-enabled SQL Managed Instance sandbox with the included capabilities such as AD authentication, disaster recovery, point-in-time restore, migration, and more.
-
-### What are the costs of using ArcBox?
-
-ArcBox incurs normal Azure consumption charges for various Azure resources, such as virtual machines and storage. Each flavor of ArcBox uses a different combination of Azure resources and therefore, costs vary depending on the flavor used. You can view example estimates of ArcBox costs per flavor by clicking the links below.
-
-- [ArcBox Full cost estimate](https://aka.ms/ArcBoxFullCost)
-- [ArcBox for ITPro cost estimate](https://aka.ms/ArcBoxITProCost)
-- [ArcBox for DevOps cost estimate](https://aka.ms/ArcBoxDevOpsCost)
-- [ArcBox for DataOps cost estimate](https://aka.ms/ArcBoxDataOpsCost)
-
-### Where can I go if I have trouble deploying or using ArcBox?
-
-Each ArcBox flavor has a troubleshooting section of its documentation that you can review for common issues:
-
-- [Troubleshooting ArcBox Full](https://azurearcjumpstart.io/azure_jumpstart_arcbox/full/#basic-troubleshooting)
-- [Troubleshooting ArcBox for IT Pros](https://azurearcjumpstart.io/azure_jumpstart_arcbox/ITPro/#basic-troubleshooting)
-- [Troubleshooting ArcBox for DevOps](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#basic-troubleshooting)
-- [Troubleshooting ArcBox for DataOps](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps/#basic-troubleshooting)
-
-If you're still stuck, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on our GitHub repository and the Jumpstart team will try to assist you.
-
-## Jumpstart HCIBox
-
-### What Azure regions can HCIBox be deployed to?
-
-HCIBox can be deployed to the following regions:
-
-- East US
-- East US 2
-- West US 2
-- North Europe
-
-### What are the costs of using HCIBox?
-
-HCIBox incurs normal Azure consumption charges for various Azure resources such as virtual machines and storage. You can view example estimates of HCIBox costs per flavor by clicking the links below.
-
-- [HCIBox cost estimate](https://aka.ms/HCIBoxCost)
diff --git a/docs/_index.md b/docs/_index.md
deleted file mode 100755
index b02db4d12b..0000000000
--- a/docs/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
----
-
-<!-- # Documentation -->
-
-# <img src="/img/jumpstart-logo.png" alt="jumpstart-logo" width=300>
diff --git a/docs/azure_arc_jumpstart/_index.md b/docs/azure_arc_jumpstart/_index.md
deleted file mode 100644
index 9218df8428..0000000000
--- a/docs/azure_arc_jumpstart/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-type: docs
-title: "Azure Arc Jumpstart Scenarios"
-linkTitle: "Jumpstart Scenarios"
-weight: 2
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/_index.md
deleted file mode 100644
index b0234b4895..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled app services"
-linkTitle: "Azure Arc-enabled app services"
-weight: 6
-description: >-
-  The deployment scenarios in this section will guide you through deploying and working with Azure Arc-enabled app services on multiple infrastructure platforms.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/_index.md
deleted file mode 100644
index b3119375f0..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Kubernetes Service"
-linkTitle: "Azure Kubernetes Service"
-weight: 1
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on creating an AKS cluster with Azure Arc-enabled app services integration in an automated fashion using ARM templates.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/_index.md
deleted file mode 100644
index bb84420a99..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/_index.md
+++ /dev/null
@@ -1,280 +0,0 @@
----
-type: docs
-title: "App Service (Container) ARM Template"
-linkTitle: "App Service (Container) ARM Template"
-weight: 2
-description: >
----
-
-## Deploy an App Service app using custom container on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled app services](https://docs.microsoft.com/azure/app-service/overview-arc-integration) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an App Service plan, a sample Web Application (Web App) and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled app services.
-
-> **NOTE: Currently, Azure Arc-enabled app services is in preview.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc app services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled app services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell script that deploy the AKS cluster and will configure Azure Arc-enabled app services Kubernetes environment on the AKS cluster.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**true**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**false**_.
-  - _`deployAPIMgmt`_ - Boolean that sets whether or not to deploy a self-hosted Azure API Management gateway.  For this scenario, we leave it set to _**false**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`adminEmail`_ - an email address that will be used on the Azure API Management deployment to receive all system notifications.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_app_services_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-AppSvc-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-AppSvc-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~10-20min**
-
-    > **NOTE: Since Azure Arc-enabled app services is [currently in preview](https://docs.microsoft.com/azure/app-service/overview-arc-integration#public-preview-limitations), deployment regions availability is limited to East US and West Europe.**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot showing the ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure web application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![Screenshot showing PowerShell logon script run](./11.png)
-
-    ![Screenshot showing PowerShell logon script run](./12.png)
-
-    ![Screenshot showing PowerShell logon script run](./13.png)
-
-    ![Screenshot showing PowerShell logon script run](./14.png)
-
-    ![Screenshot showing PowerShell logon script run](./15.png)
-
-    ![Screenshot showing PowerShell logon script run](./16.png)
-
-    ![Screenshot showing PowerShell logon script run](./17.png)
-
-    ![Screenshot showing PowerShell logon script run](./18.png)
-
-    ![Screenshot showing PowerShell logon script run](./19.png)
-
-    ![Screenshot showing PowerShell logon script run](./20.png)
-
-    ![Screenshot showing PowerShell logon script run](./21.png)
-
-    ![Screenshot showing PowerShell logon script run](./22.png)
-
-    ![Screenshot showing PowerShell logon script run](./23.png)
-
-    ![Screenshot showing PowerShell logon script run](./24.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the app service plan and the sample web application deployed on the cluster will be ready.
-
-    ![Screenshot showing desktop wallpaper change](./25.png)
-
-- Since this scenario is deploying both the app service plan and a sample web application, you will also notice additional, newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Functions also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for a web app to run.
-
-  - [**App Service**](https://docs.microsoft.com/azure/app-service/overview) - Azure App Service is an HTTP-based service for hosting web applications, REST APIs, and mobile back ends.
-
-  ![Screenshot showing additional Azure resources in the resource group](26.png)
-
-- In this scenario, **a Docker, custom container Linux-based** sample Jumpstart web application was deployed. To open the deployed web application in your web browser, simply click the App Service resource and the created URL or the Browse button.
-
-  ![Screenshot showing App Service resource in a resource group](./27.png)
-
-  ![Screenshot showing the web application URL](./28.png)
-
-  ![Screenshot showing the web application open in a web browser](./29.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Arc-enabled app services cluster extension was deployed and used throughout this scenario in order to deploy the app services infrastructure.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes resource](./30.png)
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes cluster extensions settings](./31.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing the Delete Azure resource group button](./32.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/_index.md
deleted file mode 100644
index 541769e3a3..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/_index.md
+++ /dev/null
@@ -1,313 +0,0 @@
----
-type: docs
-title: "Azure API Management Gateway ARM Template"
-linkTitle: "Azure API Management Gateway ARM Template"
-weight: 5
-description: >
----
-
-## Deploy an Azure API Management gateway on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [a self-hosted Azure API Management Gateway](https://docs.microsoft.com/azure/api-management/how-to-deploy-self-hosted-gateway-azure-arc) deployed on an [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster that has been onboarded as an [Azure Arc-enabled Kubernetes cluster](https://docs.microsoft.com/azure/azure-arc/kubernetes/overview) using an [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an Azure API Management gateway, a backend API and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with the Azure API Management gateway.
-
-> **NOTE: Currently, API Management self-hosted gateway on Azure Arc is in preview. The deployment time for this scenario can take ~60-90 minutes**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure API Management logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/AppServicesLogonScript.ps1) PowerShell script that deploy the AKS cluster and will configureAzure Arc-enabled app services Kubernetes environment on the AKS cluster.
-
-    > **NOTE: Notice the AKS cluster will be deployed via the PowerShell script automation.**
-
-## Deployment
-
-> **NOTE: The deployment time for this scenario can take ~60-90 minutes**
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`kubernetesVersion`_ - AKS version
-  - _`dnsPrefix`_ - AKS unique DNS prefix
-  - _`deployAppService`_  Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**false**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**false**_.
-    - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`deployAPIMgmt`_ - Boolean that sets whether or not to deploy a self-hosted Azure API Management gateway. For this scenario, we leave it set to _**true**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`adminEmail`_ - an email address that will be used on the Azure API Management deployment to receive all system notifications.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_app_services_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json- parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-API-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-API-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. At this point, the resource group should have **7 various Azure resources** deployed.
-
-    ![ARM template deployment completed](./01.png)
-
-    ![New Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure web application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![PowerShell logon script run](./11.png)
-
-    ![PowerShell logon script run](./12.png)
-
-    ![PowerShell logon script run](./13.png)
-
-    ![PowerShell logon script run](./14.png)
-
-    ![PowerShell logon script run](./15.png)
-
-    ![PowerShell logon script run](./16.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the API Management gateway and the sample API will be configured on the cluster.
-
-    ![Wallpaper change](./17.png)
-
-- There will be newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Functions also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for a web app to run.
-
-  - [**App Service**](https://docs.microsoft.com/azure/app-service/overview) - Azure App Service is an HTTP-based service for hosting web applications, REST APIs, and mobile back ends.
-
-  ![Additional Azure resources in the resource group](./18.png)
-
-## API Management self-hosted gateway
-
-In this scenario, the Azure Arc-enabled API Management cluster extension was deployed and used throughout this scenario in order to deploy the self-hosted API Management gateway services infrastructure.
-
-- In order to view cluster extensions, click on theAzure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Azure Arc-enabled Kubernetes resource](./19.png)
-
-  ![Azure Arc-enabled Kubernetes cluster extensions settings](./20.png)
-
-Deploying the API Management gateway extension to an Azure Arc-enabled Kubernetes cluster creates an Azure API Management self-hosted gateway. You can verify this from the portal by going to the Resource Group and selecting the API management service.
-
-  ![API management service](./21.png)
-
-Select Gateways on the Deployment + infrastructure section.
-
-  ![Self-hosted Gateway](./22.png)
-
-A self-hosted gateway should be deployed with one connected node.
-
-  ![Connected node on self-hosted gateway](./23.png)
-
-In this scenario, a sample Demo conference API was deployed. To view the deployed API, simply click on the self-hosted gateway resource and select on APIs.
-
-  ![Demo Conference API](./24.png)
-
-To demonstrate that the self-hosted gateway is processing API requests you need to identify two elements:
-
-- Public IP address of the self-hosted gateway, by running the command below from the client VM.
-
-    ```powershell
-    kubectl get svc -n apimgmt
-    ```
-
-  ![Self-hosted gateway public IP](./25.png)
-
-- API management subscription key, from the Azure portal on the API Management service resource select Subscriptions under APIs and select Show/hide keys for the one with display name "Built-in all-access subscription".
-
-  ![Self-hosted gateway subscriptions](./26.png)
-
-  ![Subscription key](./27.png)
-
-Once you have obtained these two parameters, replace them on the following code snippet and run it from the client VM PowerShell.
-
-  ```powershell
-    $publicip = <self hosted gateway public IP>
-    $subscription = <self hosted gateway subscription>
-    
-    $url = "http://$($publicip):5000/conference/topics"
-    $headers = @{
-    'Ocp-Apim-Subscription-Key' = $subscription
-    'Ocp-Apim-Trace' = 'true'
-    }
-    $i=1
-    While ($i -le 10)
-    {
-    Invoke-RestMethod -URI $url -Headers $headers
-    $i++
-    }
-  ```
-
-  ![API calls test](./28.png)
-
-In the Overview page of the API Management service, you can now see how the self-hosted gateway API requests are now shown.
-
-  ![API requests metrics](./29.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Delete Azure resource group](./30.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/_index.md
deleted file mode 100644
index 4bd388178a..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/_index.md
+++ /dev/null
@@ -1,316 +0,0 @@
----
-type: docs
-title: "Azure Function ARM Template"
-linkTitle: "Azure Function ARM Template"
-weight: 3
-description: >
----
-
-## Deploy Azure Function application on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled app services](https://docs.microsoft.com/azure/app-service/overview-arc-integration) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an App Service plan, a sample Azure Function application that sends messages to an Azure storage account queue and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled app services.
-
-> **NOTE: Currently, Azure Arc-enabled app services is in preview.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc app services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled app services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell script that deploy the AKS cluster and will configure Azure Arc-enabled app services Kubernetes environment on the AKS cluster.
-
-    > **NOTE: Notice the AKS cluster will be deployed via the PowerShell script automation.**
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**false**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**true**_.
-  - _`deployAPIMgmt`_ - Boolean that sets whether or not to deploy a self-hosted Azure API Management gateway.  For this scenario, we leave it set to _**false**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`adminEmail`_ - an email address that will be used on the Azure API Management deployment to receive all system notifications.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_app_services_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-AppSvc-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-AppSvc-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~10-20min**
-
-    > **NOTE: Since Azure Arc-enabled app services is [currently in preview](https://docs.microsoft.com/azure/app-service/overview-arc-integration#public-preview-limitations), deployment regions availability is limited to East US and West Europe.**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot showing the ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Function application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![Screenshot showing PowerShell logon script run](./11.png)
-
-    ![Screenshot showing PowerShell logon script run](./12.png)
-
-    ![Screenshot showing PowerShell logon script run](./13.png)
-
-    ![Screenshot showing PowerShell logon script run](./14.png)
-
-    ![Screenshot showing PowerShell logon script run](./15.png)
-
-    ![Screenshot showing PowerShell logon script run](./16.png)
-
-    ![Screenshot showing PowerShell logon script run](./17.png)
-
-    ![Screenshot showing PowerShell logon script run](./18.png)
-
-    ![Screenshot showing PowerShell logon script run](./19.png)
-
-    ![Screenshot showing PowerShell logon script run](./20.png)
-
-    ![Screenshot showing PowerShell logon script run](./21.png)
-
-    ![Screenshot showing PowerShell logon script run](./22.png)
-
-    ![Screenshot showing PowerShell logon script run](./23.png)
-
-    ![Screenshot showing PowerShell logon script run](./24.png)
-
-    ![Screenshot showing PowerShell logon script run](./25.png)
-
-    ![Screenshot showing PowerShell logon script run](./26.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the app service plan and the Azure Function application deployed on the cluster will be ready.
-
-    ![Screenshot showing desktop wallpaper change](./27.png)
-
-- Since this scenario is deploying both the app service plan and a sample Azure Function application, you will also notice additional, newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Functions also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for an Azure Function to run.
-
-  - [**Azure Function**](https://docs.microsoft.com/azure/azure-functions/functions-overview) - Azure Functions is a serverless solution that allows you to write less code, maintain less infrastructure, and save on costs.
-
-  - [Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/app-insights-overview) - Application Insights, a feature of Azure Monitor, is an extensible Application Performance Management (APM) service for developers and DevOps professionals. Use it to monitor your live applications.
-
-  - Azure Storage Account - The storage account deployed in this scenario is used for hosting the [queue storage](https://docs.microsoft.com/azure/storage/queues/storage-queues-introduction) where the Azure Function will be sending messages to that can be leveraged later in an application event-driven architecture.
-
-  ![Screenshot showing additional Azure resources in the resource group](./28.png)
-
-- In this scenario, **a sample Jumpstart Azure Function application** was deployed. To open the deployed Function application in your web browser, simply click the Azure Function resource and the created URL or the Browse button.
-
-  ![Screenshot showing the Azure Function URL](./29.png)
-
-  ![Screenshot showing the Azure Function open in a web browser](./30.png)
-
-- To demonstrate the messaging queuing element and to show how messages are stored in the queue storage, the Azure Function deployment script also generates 10 sample messages. To view it, click on the newly created storage account and go to the "Queues" section where you will see the new queue and the stored messages.
-
-  ![Screenshot showing the Azure storage account](./31.png)
-
-  ![Screenshot showing the Azure storage queue](./32.png)
-
-  ![Screenshot showing Azure Function messages in storage queue](./33.png)
-
-- Alternatively, you can view the same queue storage using the Azure Storage Explorer client application installed automatically in the Client VM or using the Azure Storage Browser portal-based view.
-
-  ![Screenshot showing Azure Storage Explorer client application storage queue](./34.png)
-
-  ![Screenshot showing Azure Storage Explorer portal-based view](./35.png)
-
-  ![Screenshot showing Azure Storage Explorer portal-based view storage queue](./36.png)
-
-- To generate your own messages using the Function application, use the Function invoke URL. As part of the deployment script, a _`funcUrl.txt`_ text file located in the Client VM under _C:\Temp_ folder that includes invoke URL was created for you. Copy the URL and open it in your web browser while adding the message text to it using the _`?name=<Something>`_ syntax, for example, _`?name=Bilbo`_.
-
-  ![Screenshot showing the funcUrl.txt file](./37.png)
-
-  ![Screenshot showing invoke URL](./38.png)
-
-  ![Screenshot showing invoke URL in web browser](./39.png)
-
-- Go back to the storage queue and see the new added message.
-
-  ![Screenshot showing the new message in the storage queue](./40.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Arc-enabled app services cluster extension was deployed and used throughout this scenario in order to deploy the app services infrastructure.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes resource](./41.png)
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes cluster extensions settings](./42.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing the Delete Azure resource group button](./43.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_container_apps_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_container_apps_arm_template/_index.md
deleted file mode 100644
index d6c892727f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_container_apps_arm_template/_index.md
+++ /dev/null
@@ -1,293 +0,0 @@
----
-type: docs
-title: "Azure Container Apps ARM Template"
-linkTitle: "Azure Container Apps ARM Template"
-weight: 1
-description: >
----
-
-## Deploy Azure Container Apps on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Container Apps](https://learn.microsoft.com/azure/container-apps/azure-arc-overview) deployed on Azure Arc-enabled [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an Azure Kubernetes Service (AKS) cluster deployed with the Azure Container Apps connected environment, a sample Web Application and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Container Apps.
-
-> **NOTE: Currently, Azure Arc-enabled Container Apps is in preview.**
-
-The following Jumpstart scenario will guide you on how to run cloud-native application on [Azure Container Apps](https://azure.microsoft.com/products/container-apps/). The Azure Container Apps service enables you to run microservices and containerized applications on a serverless platform. Individual container apps are deployed to a single Container Apps environment, which acts as a secure boundary around groups of container apps.
-
-In this scenario, you will deploy a [Container Apps environment](https://learn.microsoft.com/azure/container-apps/environment) and a 3-node container app running in Azure. The app leverages [Dapr](https://learn.microsoft.com/azure/container-apps/dapr-overview?tabs=bicep1%2Cyaml) to simplify service to service invocation.
-
-- Store - The store app is the store's frontend app, running a [Blazor Server project](https://learn.microsoft.com/dotnet/architecture/blazor-for-web-forms-developers/introduction) that reaches out to the backend APIs.
-- Products API - This API is a [Swagger UI-enabled API](https://swagger.io/tools/swagger-ui/) that hands back product names and IDs to callers.
-- Inventory API - A simple API that provides a random number for a given product ID string. The values of each string/integer pair are stored in a memory cache so they are consistent between API calls.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Container Apps on Azure Arc-enabled Kubernetes will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to to view diagnostic information of the Container Apps.
-
-- User remotes into client Windows VM, which automatically kicks off the [_ContainerAppsLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/ContainerAppsLogonScript.ps1) PowerShell script that deploys the AKS cluster, configures Azure Container Apps environment and deploy the Container Apps on the AKS cluster.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deployContainerApps`_ - Boolean that sets whether or not to deploy Azure Container Apps environment and a Web App. For this scenario, we leave it set to _**true**_.
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**false**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**false**_.
-  - _`deployAPIMgmt`_ - Boolean that sets whether or not to deploy a self-hosted Azure API Management gateway.  For this scenario, we leave it set to _**false**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`adminEmail`_ - an email address that will be used on the Azure API Management deployment to receive all system notifications.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_app_services_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-AppSvc-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-AppSvc-Demo \
-    --name arccontainerapps \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~10-20min**
-
-    > **NOTE: Since Azure Container App on Azure Arc-enabled Kubernetes is [currently in preview](https://learn.microsoft.com/azure/container-apps/azure-arc-overview#public-preview-limitations), deployment regions availability is limited to East US, East Asia and West Europe.**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot showing the ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_ContainerAppsLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/ARM/artifacts/ContainerAppsLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure web application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Container Apps connected environment, the pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Container Apps extension, visit the official [Azure Docs page](https://learn.microsoft.com/azure/container-apps/azure-arc-overview#resources-created-by-the-container-apps-extension).**
-
-    ![Screenshot showing PowerShell logon script run](./11.png)
-
-    ![Screenshot showing PowerShell logon script run](./12.png)
-
-    ![Screenshot showing PowerShell logon script run](./13.png)
-
-    ![Screenshot showing PowerShell logon script run](./14.png)
-
-    ![Screenshot showing PowerShell logon script run](./15.png)
-
-    ![Screenshot showing PowerShell logon script run](./16.png)
-
-    ![Screenshot showing PowerShell logon script run](./17.png)
-
-    ![Screenshot showing PowerShell logon script run](./18.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and the Azure Container Apps deployed on the cluster will be ready.
-
-    ![Screenshot showing desktop wallpaper change](./19.png)
-
-- Since this scenario is deploying both the Azure Container Apps, you will also notice additional, newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled Kubernetes are used to deploy the Azure Containers Apps [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - **Container Apps Connected Environment**- Container Apps connected environment enables common configuration across apps but is not related to cluster operations. Conceptually, it's deployed into the Custom location resource, and app developers create apps in this environment.
-
-  - **Container App** - Azure Container Apps manages the details of Kubernetes and container orchestration for you. Containers in Azure Container Apps can use any runtime, programming language, or development stack of your choice.
-  
-  ![Screenshot showing additional Azure resources in the resource group](20.png)
-
-- In this scenario, **ASP.NET Core Front-end and 2 Back-end APIs on Azure Container Apps** was deployed. To open the deployed web application in your web browser, simply click the Container App resource and the Application URL.
-
-  ![Screenshot showing Store Container App in a resource group](./21.png)
-
-  ![Screenshot showing the web application URL](./22.png)
-
-  ![Screenshot showing the web application open in a web browser](./23.png)
-
-- Optionally, you can review the [Dapr](https://learn.microsoft.com/azure/container-apps/dapr-overview?tabs=bicep1%2Cyaml) configuration for the Container apps by navigating to the Dapr setting.
-
-  ![Screenshot showing Store Container App Dapr](./24.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Container Apps extension was deployed and used throughout this scenario in order to deploy the Azure Container Apps infrastructure.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes resource](./25.png)
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes cluster extensions settings](./26.png)
-
-## View your application's diagnostics
-
-In this scenario, the Log Analytics was configured with the Container Apps extension to view diagnostic information.
-
-- Navigate to the Log Analytics workspace that's configured with your Container Apps extension.
-
-  ![Screenshot showing the Log Analytics workspace in the resource group](./27.png)
-
-- Select Logs in the left navigation settings, and run the below query.
-
-    ```shell
-    let StartTime = ago(72h);
-    let EndTime = now();
-    ContainerAppConsoleLogs_CL
-    | where TimeGenerated between (StartTime .. EndTime)
-    | where ContainerAppName_s =~ "store"
-    ```
-
-  ![Screenshot showing showing the Log Analytics workspace logs](./28.png)
-
-  ![Screenshot showing showing the Log Analytics workspace logs query](./29.png)
-
-    > **NOTE: If there's an error when running a query, try again in 10-15 minutes. There may be a delay for Log Analytics to start receiving logs from the application.**
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing the Delete Azure resource group button](./30.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/_index.md
deleted file mode 100644
index e81bda07dc..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/_index.md
+++ /dev/null
@@ -1,339 +0,0 @@
----
-type: docs
-title: "Azure Logic App ARM Template"
-linkTitle: "Azure Logic App ARM Template"
-weight: 4
-description: >
----
-
-## Deploy Azure Logic App on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled app services](https://docs.microsoft.com/azure/app-service/overview-arc-integration) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an App Service plan, a sample Azure Logic App that reads messages from an Azure storage account queue and creates blobs in an Azure storage account container, and a Microsoft Windows Server 2022 (Datacenter) Azure VM installed & pre-configured with all the required tools needed to work with Azure Arc-enabled app services.
-
-> **NOTE: Currently, Azure Arc-enabled app services is in preview.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled app services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/AppServicesLogonScript.ps1) PowerShell script that deploy the AKS cluster and will configure Azure Arc-enabled app services Kubernetes environment on the AKS cluster.
-
-    > **NOTE: Notice the AKS cluster will be deployed via the PowerShell script automation.**
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`kubernetesVersion`_ - AKS version
-  - _`dnsPrefix`_ - AKS unique DNS prefix
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**false**_.
-  - _`deployAPIMgmt`_ - Boolean that sets whether or not to deploy a self-hosted Azure API Management gateway. For this scenario, we leave it set to _**false**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**false**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**true**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_app_services_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json- parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-AppSvc-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-AppSvc-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/aks/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~5-10min**
-
-    > **NOTE: Since Azure Arc-enabled app services is [currently in preview](https://docs.microsoft.com/azure/app-service/overview-arc-integration#public-preview-limitations), deployment regions availability is limited to East US and West Europe.**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. At this point, the resource group should have **7 various Azure resources** deployed.
-
-    ![ARM template deployment completed](./01.png)
-
-    ![New Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start its run.
-
-- Let the script run its course and **do not close** the PowerShell session as this will be done for you once completed. Once the script will finish its run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Logic App will be deployed on the cluster and ready to use.
-
-    > **NOTE: As you will notice from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![PowerShell logon script run](./11.png)
-
-    ![PowerShell logon script run](./12.png)
-
-    ![PowerShell logon script run](./13.png)
-
-    ![PowerShell logon script run](./14.png)
-
-    ![PowerShell logon script run](./15.png)
-
-    ![PowerShell logon script run](./16.png)
-
-    ![PowerShell logon script run](./17.png)
-
-    ![PowerShell logon script run](./18.png)
-
-    ![PowerShell logon script run](./19.png)
-
-    ![PowerShell logon script run](./20.png)
-
-    ![PowerShell logon script run](./21.png)
-
-    ![PowerShell logon script run](./22.png)
-
-    ![PowerShell logon script run](./23.png)
-
-    ![PowerShell logon script run](./24.png)
-
-    ![PowerShell logon script run](./25.png)
-
-    ![PowerShell logon script run](./26.png)
-
-    ![PowerShell logon script run](./27.png)
-
-    ![PowerShell logon script run](./28.png)
-
-    ![PowerShell logon script run](./29.png)
-
-    ![PowerShell logon script run](./30.png)
-
-    ![PowerShell logon script run](./31.png)
-
-  Once the script finishes its run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the app service plan and the Azure Logic App deployed on the cluster will be ready.
-
-    ![Wallpaper change](./32.png)
-
-- Since this scenario is deploying both the app service plan and a sample Logic App application, you will also notice additional, newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Logic Apps also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for an Azure Logic App to run.
-
-  - [**Azure Logic App**](https://docs.microsoft.com/azure/logic-apps/logic-apps-overview) - Azure Logic Apps is a cloud-based platform for creating and running automated workflows that integrate your apps, data, services, and systems.
-
-  - [**API Connection**](https://docs.microsoft.com/azure/connectors/apis-list)A connector provides prebuilt operations that you can use as steps in your Logic Apps workflows.
-
-  - [Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/app-insights-overview) - Application Insights, a feature of Azure Monitor, is an extensible Application Performance Management (APM) service for developers and DevOps professionals. Use it to monitor your live applications.
-
-  - Azure Storage Account - The storage account deployed in this scenario is used for hosting the [queue storage](https://docs.microsoft.com/azure/storage/queues/storage-queues-introduction) and [blob storage](https://docs.microsoft.com/azure/storage/blobs/storage-blobs-introduction) where the Azure Logic App will be creating files in response to messages in a queue.
-
-  ![Additional Azure resources in the resource group](./33.png)
-
-- In this scenario, **a sample Jumpstart Azure Logic App** was deployed. To view the deployed Logic App, simply click the Azure Logic App resource.
-
-  ![Azure Logic App resource](./34.png)
-
-- You can view the Logic App workflow by clicking on "Workflows" and then clicking the workflow name "CreateBlobFromQueueMessage".
-
-  ![Azure Logic App detail](./35.png)
-
-  ![Azure Logic App detail](./36.png)
-
-- To demonstrate the messaging queuing element and to show how blobs are created when messages are read from the queue storage, the Azure Logic App deployment script also generates 10 sample queue messages. To view it, click on the newly created storage account and go to the "Queues" section where you will see the queue named "jumpstart-queue". Note that the queue will be empty because the workflow automatically deletes messages from the queue after creating a new blob in the "jumpstart-blobs" container.
-
-  ![Azure storage account](./37.png)
-
-  ![Azure storage queue](./38.png)
-
-- Go back to the Azure storage account and click on Containers. From here you will see the "jumpstart-blobs" container. Open this container and view the blobs that were created by the Logic App.
-
-  ![Azure storage container](./39.png)
-
-  ![Azure storage blobs](./40.png)
-
-- Alternatively, you can view the storage details using the Azure Storage Explorer client application installed automatically in the Client VM or using the Azure Storage Explorer portal-based view.
-
-  ![Azure Storage Explorer client application storage queue](./41.png)
-
-  ![Azure Storage Explorer portal-based view](./42.png)
-
-  ![Azure Storage Explorer portal-based view storage queue](./43.png)
-
-- To generate your own blobs using the Logic App, create a new message in the queue by using Azure Storage Explorer and clicking Add Message as shown below.
-
-  ![Add queue message](./44.png)
-
-  ![Add queue message](./45.png)
-
-  ![Add queue message](./46.png)
-
-- Go back to the storage container and see the new added blob that was created automatically by the Logic App.
-
-  ![New message in storage queue](./47.png)
-
-- As part of the deployment, an Application Insights instance was also provisioned to provide you with relevant performance and application telemetry.
-
-  ![Application Insights instance](./48.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Arc-enabled app services cluster extension was deployed and used throughout this scenario in order to deploy the app services infrastructure.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Azure Arc-enabled Kubernetes resource](./49.png)
-
-  ![Azure Arc-enabled Kubernetes cluster extensions settings](./50.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Delete Azure resource group](./51.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/_index.md
deleted file mode 100644
index bd1dba45f8..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Kubernetes Cluster API"
-linkTitle: "Kubernetes Cluster API"
-weight: 2
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on deploying Azure Arc-enabled app services on Cluster API (CAPI) Kubernetes in an automated fashion using ARM templates.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/_index.md
deleted file mode 100644
index 43171c97e1..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/_index.md
+++ /dev/null
@@ -1,319 +0,0 @@
----
-type: docs
-title: "Azure API Management Gateway ARM Template"
-linkTitle: "Azure API Management Gateway ARM Template"
-weight: 3
-description: >
----
-
-## Deploy an Azure API Management gateway on Cluster API (CAPI) using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [a self-hosted Azure API Management Gateway](https://docs.microsoft.com/azure/api-management/how-to-deploy-self-hosted-gateway-azure-arc) deployed on [Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/introduction.html) Kubernetes cluster and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have a CAPI Kubernetes cluster deployed with an Azure API Management gateway, a backend API and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with the Azure API Management gateway.
-
-> **NOTE: Currently, API Management self-hosted gateway on Azure Arc is in preview. The deployment time for this scenario can take ~60-90 minutes**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario and as part of the automation flow (described below), a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/) cluster will be deployed which will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_ubuntuCapi_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/ubuntuCapi.json) - Deploys an Ubuntu Linux VM which will have Rancher K3s installed and transformed into a Cluster API management cluster via the Azure CAPZ provider.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled app services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/artifacts/AppServicesLogonScript.ps1) PowerShell script that will configure Azure Arc-enabled app services Kubernetes environment on the CAPI cluster.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**false**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**false**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`deployApiMgmt`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**true**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`adminEmail`_ - Your email address, it will be used to notify you once the API management deployment is done.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/app_svc_capi/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json- parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-API-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-API-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~60-90 minutes**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. At this point, the resource group should have **34 various Azure resources** deployed.
-
-    ![ARM template deployment completed](./01.png)
-
-    ![New Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure web application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![PowerShell logon script run](./11.png)
-
-    ![PowerShell logon script run](./12.png)
-
-    ![PowerShell logon script run](./13.png)
-
-    ![PowerShell logon script run](./14.png)
-
-    ![PowerShell logon script run](./15.png)
-
-    ![PowerShell logon script run](./16.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the API Management gateway and the sample API will be configured on the cluster.
-
-    ![Wallpaper change](./17.png)
-
-- Since this scenario is deploying both the app service plan and a sample web application, you will also notice additional, newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Functions also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for a web app to run.
-
-  - [**App Service**](https://docs.microsoft.com/azure/app-service/overview) - Azure App Service is an HTTP-based service for hosting web applications, REST APIs, and mobile back ends.
-
-  ![Additional Azure resources in the resource group](./18.png)
-
-## API Management self-hosted gateway
-
-In this scenario, the Azure Arc-enabled API Management cluster extension was deployed and used throughout this scenario in order to deploy the self-hosted API Management gateway services infrastructure.
-
-- In order to view cluster extensions, click on the azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Azure Arc-enabled Kubernetes resource](./19.png)
-
-  ![Azure Arc-enabled Kubernetes cluster extensions settings](./20.png)
-
-Deploying the API Management gateway extension to an Azure Arc-enabled Kubernetes cluster creates an Azure API Management self-hosted gateway. You can verify this from the portal by going to the Resource Group and selecting the API management service.
-
-  ![API management service](./21.png)
-
-Select Gateways on the Deployment + infrastructure section.
-
-  ![Self-hosted Gateway](./22.png)
-
-A self-hosted gateway should be deployed with one connected node.
-
-  ![Connected node on self-hosted gateway](./23.png)
-
-In this scenario, a sample Demo conference API was deployed. To view the deployed API, simply click on the self-hosted gateway resource and select on APIs.
-
-  ![Demo Conference API](./24.png)
-
-To demonstrate that the self-hosted gateway is processing API requests you need to identify two elements:
-
-- Public IP address of the self-hosted gateway, by running the command below from the client VM.
-
-    ```powershell
-    kubectl get svc -n apimgmt
-    ```
-
-  ![Self-hosted gateway public IP](./25.png)
-
-- API management subscription key, from the Azure portal on the API Management service resource select Subscriptions under APIs and select Show/hide keys for the one with display name "Built-in all-access subscription".
-
-  ![Self-hosted gateway subscriptions](./26.png)
-
-  ![Subscription key](./27.png)
-
-Once you have obtained these two parameters, replace them on the following code snippet and run it from the client VM PowerShell.
-
-  ```powershell
-    $publicip = <self hosted gateway public IP>
-    $subscription = <self hosted gateway subscription>
-    
-    $url = "http://$($publicip):5000/conference/topics"
-    $headers = @{
-    'Ocp-Apim-Subscription-Key' = $subscription
-    'Ocp-Apim-Trace' = 'true'
-    }
-    $i=1
-    While ($i -le 10)
-    {
-    Invoke-RestMethod -URI $url -Headers $headers
-    $i++
-    }
-  ```
-
-  ![API calls test](./28.png)
-
-In the Overview page of the API Management service, you can now see how the self-hosted gateway API requests are now shown.
-
-  ![API requests metrics](./29.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure Portal.
-
-  ![Delete Azure resource group](./30.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/_index.md
deleted file mode 100644
index 83d74d5f48..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/_index.md
+++ /dev/null
@@ -1,281 +0,0 @@
----
-type: docs
-title: "App Service (Container) ARM Template"
-linkTitle: "App Service (Container) ARM Template"
-weight: 1
-description: >
----
-
-## Deploy an App Service app using custom container on Cluster API using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled app services](https://docs.microsoft.com/azure/app-service/overview-arc-integration) deployed on [Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/introduction.html) Kubernetes cluster and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have a CAPI Kubernetes cluster deployed with an App Service plan, a sample Web Application (Web App) and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled app services.
-
-> **NOTE: Currently, Azure Arc-enabled app services is in preview.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario and as part of the automation flow (described below), a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/) cluster will be deployed which will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_ubuntuCapi_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json) - Deploys an Ubuntu Linux VM which will have Rancher K3s installed and transformed into a Cluster API management cluster via the Azure CAPZ provider.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled app services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell script that will configure Azure Arc-enabled app services Kubernetes environment on the CAPI cluster.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**true**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**false**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`deployApiMgmt`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-AppSvc-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-AppSvc-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-25min**
-
-    > **NOTE: Since Azure Arc-enabled app services is [currently in preview](https://docs.microsoft.com/azure/app-service/overview-arc-integration#public-preview-limitations), deployment regions availability is limited to East US and West Europe.**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. Included in this part of the automation, is also the onboarding of the cluster as an Azure Arc-enabled Kubernetes resource. Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations) which will be deployed later, in the next phase of the scenario automation.
-
-    ![Screenshot showing the ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure web application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![Screenshot showing PowerShell logon script run](./11.png)
-
-    ![Screenshot showing PowerShell logon script run](./12.png)
-
-    ![Screenshot showing PowerShell logon script run](./13.png)
-
-    ![Screenshot showing PowerShell logon script run](./14.png)
-
-    ![Screenshot showing PowerShell logon script run](./15.png)
-
-    ![Screenshot showing PowerShell logon script run](./16.png)
-
-    ![Screenshot showing PowerShell logon script run](./17.png)
-
-    ![Screenshot showing PowerShell logon script run](./18.png)
-
-    ![Screenshot showing PowerShell logon script run](./19.png)
-
-    ![Screenshot showing PowerShell logon script run](./20.png)
-
-    ![Screenshot showing PowerShell logon script run](./21.png)
-
-    ![Screenshot showing PowerShell logon script run](./22.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the app service plan and the sample web application deployed on the cluster will be ready.
-
-    ![Screenshot showing desktop wallpaper change](./23.png)
-
-- Since this scenario is deploying both the app service plan and a sample web application, you will also notice additional, newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Functions also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for a web app to run.
-
-  - [**App Service**](https://docs.microsoft.com/azure/app-service/overview) - Azure App Service is an HTTP-based service for hosting web applications, REST APIs, and mobile back ends.
-
-  ![Screenshot showing additional Azure resources in the resource group](24.png)
-
-- In this scenario, **a Docker, custom container Linux-based** sample Jumpstart web application was deployed. To open the deployed web application in your web browser, simply click the App Service resource and the Browse button.
-
-  ![Screenshot showing App Service resource in a resource group](./25.png)
-
-  ![Screenshot showing the web application URL](./26.png)
-
-  ![Screenshot showing the web application open in a web browser](./27.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Arc-enabled app services cluster extension was deployed and used throughout this scenario in order to deploy the app services infrastructure. In addition, the Azure Monitor for Containers, Microsoft Cloud Defender and the Azure Policy extensions were also installed on the cluster.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes resource](./28.png)
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes cluster extensions settings](./29.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing the Delete Azure resource group button](./30.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/_index.md
deleted file mode 100644
index e027bc4e8c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/_index.md
+++ /dev/null
@@ -1,319 +0,0 @@
----
-type: docs
-title: "Azure Function ARM Template"
-linkTitle: "Azure Function ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure Function application on Cluster API using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled app services](https://docs.microsoft.com/azure/app-service/overview-arc-integration) deployed on [Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/introduction.html) Kubernetes cluster and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have a CAPI Kubernetes cluster deployed with an App Service plan, a sample Azure Function application that sends messages to an Azure storage account queue and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled app services.
-
-> **NOTE: Currently, Azure Arc-enabled app services is in preview.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario and as part of the automation flow (described below), a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/) cluster will be deployed which will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_ubuntuCapi_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json) - Deploys an Ubuntu Linux VM which will have Rancher K3s installed and transformed into a Cluster API management cluster via the Azure CAPZ provider.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled app services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell script that will configure Azure Arc-enabled app services Kubernetes environment on the CAPI cluster.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deployAppService`_ - Boolean that sets whether or not to deploy App Service plan and a Web App. For this scenario, we leave it set to _**false**_.
-  - _`deployFunction`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Function application. For this scenario, we leave it set to _**true**_.
-  - _`deployLogicApp`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`deployApiMgmt`_ - Boolean that sets whether or not to deploy App Service plan and an Azure Logic App. For this scenario, we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/arm_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/app_svc_capi/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-AppSvc-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-AppSvc-Demo \
-    --name arcappsvc \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/app_svc_capi/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-25min**
-
-    > **NOTE: Since Azure Arc-enabled app services is [currently in preview](https://docs.microsoft.com/azure/app-service/overview-arc-integration#public-preview-limitations), deployment regions availability is limited to East US and West Europe.**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. Included in this part of the automation, is also the onboarding of the cluster as an Azure Arc-enabled Kubernetes resource. Azure Arc-enabled app services are using this resource to deploy the app services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations) which will be deployed later, in the next phase of the scenario automation.
-
-    ![Screenshot showing the ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-App-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-App-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AppServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_app_services_jumpstart/cluster_api/capi_azure/ARM/artifacts/AppServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure web application will be deployed on the cluster and be ready to use.
-
-    > **NOTE: As you will notices from the screenshots below, during the Azure Arc-enabled app services environment, the _log-processor_ service pods will be restarted and will go through multiple Kubernetes pod lifecycle stages. This is normal and can safely be ignored. To learn more about the various Azure Arc-enabled app services Kubernetes components, visit the official [Azure Docs page](https://docs.microsoft.com/azure/app-service/overview-arc-integration#pods-created-by-the-app-service-extension).**
-
-    ![Screenshot showing PowerShell logon script run](./11.png)
-
-    ![Screenshot showing PowerShell logon script run](./12.png)
-
-    ![Screenshot showing PowerShell logon script run](./13.png)
-
-    ![Screenshot showing PowerShell logon script run](./14.png)
-
-    ![Screenshot showing PowerShell logon script run](./15.png)
-
-    ![Screenshot showing PowerShell logon script run](./16.png)
-
-    ![Screenshot showing PowerShell logon script run](./17.png)
-
-    ![Screenshot showing PowerShell logon script run](./18.png)
-
-    ![Screenshot showing PowerShell logon script run](./19.png)
-
-    ![Screenshot showing PowerShell logon script run](./20.png)
-
-    ![Screenshot showing PowerShell logon script run](./21.png)
-
-    ![Screenshot showing PowerShell logon script run](./22.png)
-
-    ![Screenshot showing PowerShell logon script run](./23.png)
-
-    ![Screenshot showing PowerShell logon script run](./24.png)
-
-    ![Screenshot showing PowerShell logon script run](./25.png)
-
-    ![Screenshot showing PowerShell logon script run](./26.png)
-
-    ![Screenshot showing PowerShell logon script run](./27.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and both the app service plan and the sample web application deployed on the cluster will be ready.
-
-    ![Screenshot showing desktop wallpaper change](./28.png)
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - [**App Service Kubernetes Environment**](https://docs.microsoft.com/azure/app-service/overview-arc-integration#app-service-kubernetes-environment) - The App Service Kubernetes environment resource is required before apps may be created. It enables configuration common to apps in the custom location, such as the default DNS suffix.
-
-  - [**App Service plan**](https://docs.microsoft.com/azure/app-service/overview-hosting-plans) - In App Service (Web Apps, API Apps, or Mobile Apps), an app always runs in an App Service plan. In addition, Azure Functions also has the option of running in an App Service plan. An App Service plan defines a set of compute resources for an Azure Function to run.
-
-  - [**Azure Function**](https://docs.microsoft.com/azure/azure-functions/functions-overview) - Azure Functions is a serverless solution that allows you to write less code, maintain less infrastructure, and save on costs.
-
-  - [Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/app-insights-overview) - Application Insights, a feature of Azure Monitor, is an extensible Application Performance Management (APM) service for developers and DevOps professionals. Use it to monitor your live applications.
-
-  - Azure Storage Account - The storage account deployed in this scenario is used for hosting the [queue storage](https://docs.microsoft.com/azure/storage/queues/storage-queues-introduction) where the Azure Function will be sending messages to that can be leveraged later in an application event-driven architecture.
-
-  ![Screenshot showing additional Azure resources in the resource group](./29.png)
-
-- In this scenario, **a sample Jumpstart Azure Function application** was deployed. To open the deployed Function application in your web browser, simply click the Azure Function resource and the created URL or the Browse button.
-
-  ![Screenshot showing the Azure Function URL](./30.png)
-
-  ![Screenshot showing the Azure Function open in a web browser](./31.png)
-
-- To demonstrate the messaging queuing element and to show how messages are stored in the queue storage, the Azure Function deployment script also generates 10 sample messages. To view it, click on the newly created storage account and go to the "Queues" section where you will see the new queue and the stored messages.
-
-  ![Screenshot showing the Azure storage account](./32.png)
-
-  ![Screenshot showing the Azure storage queue](./33.png)
-
-  ![Screenshot showing Azure Function messages in storage queue](./34.png)
-
-- Alternatively, you can view the same queue storage using the Azure Storage Explorer client application installed automatically in the Client VM or using the Azure Storage Browser portal-based view.
-
-  ![Screenshot showing Azure Storage Explorer client application storage queue](./35.png)
-
-  ![Screenshot showing Azure Storage Explorer portal-based view](./36.png)
-
-  ![Screenshot showing Azure Storage Explorer portal-based view storage queue](./37.png)
-
-- To generate your own messages using the Function application, use the Function invoke URL. As part of the deployment script, a _`funcUrl.txt`_ text file located in the Client VM under _C:\Temp_ folder that includes invoke URL was created for you. Copy the URL and open it in your web browser while adding the message text to it using the _`?name=<Something>`_ syntax, for example, _`?name=Bilbo`_.
-
-  ![Screenshot showing the funcUrl.txt file](./38.png)
-
-  ![Screenshot showing invoke URL](./39.png)
-
-  ![Screenshot showing invoke URL in web browser](./40.png)
-
-- Go back to the storage queue and see the new added message.
-
-  ![Screenshot showing the new message in the storage queue](./41.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Arc-enabled app services cluster extension was deployed and used throughout this scenario in order to deploy the app services infrastructure. In addition, the Azure Monitor for Containers, Microsoft Cloud Defender and the Azure Policy extensions were also installed on the cluster.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes resource](./42.png)
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes cluster extensions settings](./43.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Delete Azure resource group](./44.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/_index.md
deleted file mode 100644
index 9141b8093e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled data services"
-linkTitle: "Azure Arc-enabled data services"
-weight: 5
-description: >-
-  The deployment scenarios in this section will guide you through deploying and working with Azure Arc-enabled data services on multiple infrastructure platforms.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aks/_index.md
deleted file mode 100644
index c374572e7d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aks/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Kubernetes Service"
-linkTitle: "Azure Kubernetes Service"
-weight: 1
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on creating an AKS cluster with Azure Arc-enabled data services integration in an automated fashion using ARM templates.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/_index.md
deleted file mode 100644
index e711c02c09..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/_index.md
+++ /dev/null
@@ -1,282 +0,0 @@
----
-type: docs
-title: "Data Controller ARM Template"
-linkTitle: "Data Controller ARM Template"
-weight: 1
-description: >
----
-
-## Deploy a vanilla Azure Arc Data Controller in a directly connected mode on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc Data Services:
-
-![Screenshot showing the deployed architecture](./diagram.png)
-
-> **NOTE: Currently, Azure Arc-enabled PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcAppSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcAppSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the AKS cluster including the data controller.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **8 various Azure resources** deployed.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-    ![Screenshot showing the PowerShell logon script run](./11.png)
-
-    ![Screenshot showing the PowerShell logon script run](./12.png)
-
-    ![Screenshot showing the PowerShell logon script run](./13.png)
-
-    ![Screenshot showing the PowerShell logon script run](./14.png)
-
-    ![Screenshot showing the PowerShell logon script run](./15.png)
-
-    ![Screenshot showing the PowerShell logon script run](./16.png)
-
-    ![Screenshot showing the PowerShell logon script run](./17.png)
-
-    ![Screenshot showing the PowerShell logon script run](./18.png)
-
-    ![Screenshot showing the PowerShell logon script run](./19.png)
-
-    ![Screenshot showing the PowerShell logon script run](./20.png)
-
-    ![Screenshot showing the PowerShell logon script run](./21.png)
-
-    ![Screenshot showing the PowerShell logon script run](./22.png)
-
-    ![Screenshot showing the PowerShell logon script run](./23.png)
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the PowerShell logon script run](./26.png)
-
-    ![Screenshot showing the PowerShell logon script run](./27.png)
-
-    ![Screenshot showing the PowerShell logon script run](./28.png)
-
-    ![Screenshot showing the post-run desktop](./29.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **11 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./30.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./31.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./32.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./33.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./34.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./35.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/_index.md
deleted file mode 100644
index d4f0b50591..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/_index.md
+++ /dev/null
@@ -1,368 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance ARM Template"
-linkTitle: "SQL Managed Instance ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure SQL Managed Instance in directly connected mode on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an Azure Arc Data Controller, SQL Managed Instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services:
-
-![Screenshot showing the deployed architecture](./diagram.png)
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-  - User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the AKS cluster including the data controller and SQL Managed Instance.
-
-  - In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either _**true**_ or _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-    > **Note:** In case you decided to deploy SQL Managed Instance in an highly-available fashion, refer to the ["Perform database failover with SQL Managed Instance Availability Groups"](../../day2/aks/aks_mssql_ha/_index.md) Jumpstart scenario as well as the ["High Availability with Azure Arc-enabled SQL Managed Instance"](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-high-availability) product documentation.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **8 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **9 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./11.png)
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the PowerShell logon script run](./29.png)
-
-  ![Screenshot showing the PowerShell logon script run](./30.png)
-
-  ![Screenshot showing the PowerShell logon script run](./31.png)
-
-  ![Screenshot showing the PowerShell logon script run](./32.png)
-
-  ![Screenshot showing the PowerShell logon script run](./33.png)
-
-  ![Screenshot showing the post-run desktop](./34.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **12 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  - _Azure Arc-enabled SQL Managed Instance_ - The SQL Managed Instance that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./35.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./36.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./37.png)
-
-- Additionally, the SQL Managed Instance connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./38.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./39.png)
-
-![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./40.png)
-
-## High Availability with SQL Always-On availability groups
-
-Azure Arc-enabled SQL Managed Instance is deployed on Kubernetes as a containerized application and uses kubernetes constructs such as stateful sets and persistent storage to provide built-in health monitoring, failure detection, and failover mechanisms to maintain service health. For increased reliability, you can also configure Azure Arc-enabled SQL Managed Instance to deploy with extra replicas in a high availability configuration.
-
-For showcasing and testing SQL Managed Instance with [Always On availability groups](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-high-availability#deploy-with-always-on-availability-groups), a dedicated [Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/) is available to help you simulate failures and get hands-on experience with this deployment model.
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance stress simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Screenshot showing opened SqlQueryStress](./41.png)
-
-  ![Screenshot showing SQLMI Endpoints text file](./42.png)
-
-> **NOTE: Secondary SQL Managed Instance endpoint will be available only when using the [HA deployment model ("Business Critical")](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/).**
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SqlQueryStress connected](./43.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SqlQueryStress settings](./44.png)
-
-  ![Screenshot showing SqlQueryStress running](./45.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./46.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _`kubectl get svc -n arc`_ command to view the _metricsui_ external service IP address.
-
-  ![Screenshot showing metricsui Kubernetes service](./47.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Screenshot showing Grafana username and password](./48.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana dashboards](./49.png)
-
-  ![Screenshot showing Grafana "SQL Managed Instance Metrics" dashboard](./50.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _`SqlQueryStress`_ (in case it was already finished).
-
-  ![Screenshot showing "Last 5 minutes" time range](./51.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing increased load activity](./52.png)
-
-  ![Screenshot showing increased load activity](./53.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./54.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/_index.md
deleted file mode 100644
index b551fc1572..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/_index.md
+++ /dev/null
@@ -1,298 +0,0 @@
----
-type: docs
-title: "PostgreSQL ARM Template"
-linkTitle: "PostgreSQL ARM Template"
-weight: 3
-description: >
----
-
-## Deploy Azure PostgreSQL in directly connected mode on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [PostgreSQL](https://docs.microsoft.com/azure/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an Azure Arc Data Controller, PostgreSQL instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services:
-
-![Screenshot showing the deployed architecture](./diagram.png)
-
-> **NOTE: Currently, Azure Arc-enabled PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the AKS cluster including the data controller and PostgreSQL.
-
-- In addition to deploying the data controller and PostgreSQL, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this Azure Arc-enabled PostgreSQL scenario we will set it to _**true**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. At this point, the resource group should have **8 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **9 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and PostgreSQL will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./11.png)
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the PowerShell logon script run](./29.png)
-
-  ![Screenshot showing the PowerShell logon script run](./30.png)
-
-  ![Screenshot showing the PowerShell logon script run](./31.png)
-
-  ![Screenshot showing the PowerShell logon script run](./32.png)
-
-  ![Screenshot showing the post-run desktop](./33.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and PostgreSQL instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **12 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  - _Azure Arc-enabled PostgreSQL_ - The PostgreSQL instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./35.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./35.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./36.png)
-
-- Additionally, the PostgreSQL connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio PostgresSQL connection](./37.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./38.png)
-
-![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./39.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./40.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aro/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aro/_index.md
deleted file mode 100644
index 4da6491754..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aro/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Red Hat OpenShift"
-linkTitle: "Azure Red Hat OpenShift"
-weight: 3
-description: >-
-  If you do not yet have an Azure Red Hat OpenShift cluster, the scenarios in this section will guide on creating an ARO cluster with Azure Arc-enabled data services integration in an automated fashion using ARM templates.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_dc_vanilla_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_dc_vanilla_arm_template/_index.md
deleted file mode 100644
index 7ac0ed5f8e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_dc_vanilla_arm_template/_index.md
+++ /dev/null
@@ -1,302 +0,0 @@
----
-type: docs
-title: "Data Controller ARM Template"
-linkTitle: "Data Controller ARM Template"
-weight: 1
-description: >
----
-
-## Deploy a vanilla Azure Arc Data Controller in a directly connected mode on ARO using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) deployed on [Azure Red Hat OpenShift (ARO)](https://docs.microsoft.com/azure/openshift/intro-openshift) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an ARO cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc Data Services.
-
-> **NOTE: Currently, Azure Arc-enabled PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Check your subscription quota for the DSv3 family.
-
-    > **NOTE: Azure Red Hat OpenShift requires a [minimum of 40 cores](/azure/openshift/tutorial-create-cluster#before-you-begin) to create and run an OpenShift cluster.**
-
-  ```shell
-  LOCATION=eastus
-  az vm list-usage -l $LOCATION --query "[?contains(name.value, 'standardDSv3Family')]" -o table
-  ```
-
-  ![Screenshot of checking DSV3 family cores usage](./01.png)
-
-- Get the Azure Red Hat OpenShift resource provider Id which needs to be assigned with the “Contributor” role.
-
-  ```shell
-  az ad sp list --filter "displayname eq 'Azure Red Hat OpenShift RP'" --query "[?appDisplayName=='Azure Red Hat OpenShift RP'].{name: appDisplayName, objectId: id}"
-  ```
-
-  ![Screenshot of Azure resource provider for Aro](./02.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aro_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/aro.json) - Deploys the ARO cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the ARO cluster including the data controller.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-  - _`AroProviderId`_ - ARO resource provider Id.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~40-60min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **8 various Azure resources** deployed.
-
-    ![Screenshot showing ARM template deployment completed](./03.png)
-
-    ![Screenshot showing new Azure resource group with all resources](./04.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_dc_vanilla_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_dc_vanilla_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_dc_vanilla_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./05.png)
-
-  ![Screenshot showing adding a new inbound security rule](./06.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./07.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./08.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./09.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./10.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./11.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./12.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-    ![Screenshot showing the PowerShell logon script run](./13.png)
-
-    ![Screenshot showing the PowerShell logon script run](./14.png)
-
-    ![Screenshot showing the PowerShell logon script run](./15.png)
-
-    ![Screenshot showing the PowerShell logon script run](./16.png)
-
-    ![Screenshot showing the PowerShell logon script run](./17.png)
-
-    ![Screenshot showing the PowerShell logon script run](./18.png)
-
-    ![Screenshot showing the PowerShell logon script run](./19.png)
-
-    ![Screenshot showing the PowerShell logon script run](./20.png)
-
-    ![Screenshot showing the PowerShell logon script run](./21.png)
-
-    ![Screenshot showing the PowerShell logon script run](./22.png)
-
-    ![Screenshot showing the PowerShell logon script run](./23.png)
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the PowerShell logon script run](./26.png)
-
-    ![Screenshot showing the PowerShell logon script run](./27.png)
-
-    ![Screenshot showing the PowerShell logon script run](./28.png)
-
-    ![Screenshot showing the PowerShell logon script run](./29.png)
-
-    ![Screenshot showing the PowerShell logon script run](./30.png)
-
-    ![Screenshot showing the PowerShell logon script run](./31.png)
-
-    ![Screenshot showing the post-run desktop](./32.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **11 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./33.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./34.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./35.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./36.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./37.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./38.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_mssql_mi_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_mssql_mi_arm_template/_index.md
deleted file mode 100644
index 7c58c42ef4..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_mssql_mi_arm_template/_index.md
+++ /dev/null
@@ -1,384 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance ARM Template"
-linkTitle: "SQL Managed Instance ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure SQL Managed Instance in directly connected mode on ARO using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Azure Red Hat OpenShift (ARO)](https://docs.microsoft.com/azure/openshift/intro-openshift) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an ARO cluster deployed with an Azure Arc Data Controller, SQL Managed Instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Check your subscription quota for the DSv3 family.
-
-    > **NOTE: Azure Red Hat OpenShift requires a [minimum of 40 cores](/azure/openshift/tutorial-create-cluster#before-you-begin) to create and run an OpenShift cluster.**
-
-  ```shell
-  LOCATION=eastus
-  az vm list-usage -l $LOCATION --query "[?contains(name.value, 'standardDSv3Family')]" -o table
-  ```
-
-  ![Screenshot of checking DSV3 family cores usage](./01.png)
-
-- Get the Azure Red Hat OpenShift resource provider Id which needs to be assigned with the “Contributor” role.
-
-  ```shell
-  az ad sp list --filter "displayname eq 'Azure Red Hat OpenShift RP'" --query "[?appDisplayName=='Azure Red Hat OpenShift RP'].{name: appDisplayName, objectId: id}"
-  ```
-
-  ![Screenshot of Azure resource provider for Aro](./02.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [ARO](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/aro.json) - Deploys the ARO cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-  - User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the ARO cluster including the data controller and SQL Managed Instance.
-
-  - In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either _**true**_ or _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-  - _`AroProviderId`_ - ARO resource provider Id
-
-    > **Note:** In case you decided to deploy SQL Managed Instance in an highly-available fashion, refer to the ["Perform database failover with SQL Managed Instance Availability Groups"](../../day2/aks/aks_mssql_ha/_index.md) Jumpstart scenario as well as the ["High Availability with Azure Arc-enabled SQL Managed Instance"](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-high-availability) product documentation.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **8 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **9 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./03.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./04.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_mssql_mi_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_mssql_mi_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_mssql_mi_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG NSG with blocked RDP](./05.png)
-
-  ![Screenshot showing adding a new inbound security rule](./06.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./07.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./08.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./09.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./10.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./11.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./12.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the PowerShell logon script run](./29.png)
-
-  ![Screenshot showing the PowerShell logon script run](./30.png)
-
-  ![Screenshot showing the PowerShell logon script run](./31.png)
-
-  ![Screenshot showing the PowerShell logon script run](./32.png)
-
-  ![Screenshot showing the PowerShell logon script run](./33.png)
-
-  ![Screenshot showing the PowerShell logon script run](./34.png)
-
-  ![Screenshot showing the post-run desktop](./35.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **12 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  - _Azure Arc-enabled SQL Managed Instance_ - The SQL Managed Instance that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./36.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./37.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./38.png)
-
-- Additionally, the SQL Managed Instance connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./39.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./40.png)
-
-![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./41.png)
-
-## High Availability with SQL Always-On availability groups
-
-Azure Arc-enabled SQL Managed Instance is deployed on Kubernetes as a containerized application and uses kubernetes constructs such as stateful sets and persistent storage to provide built-in health monitoring, failure detection, and failover mechanisms to maintain service health. For increased reliability, you can also configure Azure Arc-enabled SQL Managed Instance to deploy with extra replicas in a high availability configuration.
-
-For showcasing and testing SQL Managed Instance with [Always On availability groups](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-high-availability#deploy-with-always-on-availability-groups), a dedicated [Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/) is available to help you simulate failures and get hands-on experience with this deployment model.
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance stress simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Screenshot showing opened SqlQueryStress](./42.png)
-
-  ![Screenshot showing SQLMI Endpoints text file](./43.png)
-
-> **NOTE: Secondary SQL Managed Instance endpoint will be available only when using the [HA deployment model ("Business Critical")](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/).**
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SqlQueryStress connected](./44.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SqlQueryStress settings](./45.png)
-
-  ![Screenshot showing SqlQueryStress running](./46.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./47.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _`kubectl get svc -n arc`_ command to view the _metricsui_ external service IP address.
-
-  ![Screenshot showing metricsui Kubernetes service](./48.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Screenshot showing Grafana username and password](./49.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana dashboards](./50.png)
-
-  ![Screenshot showing Grafana "SQL Managed Instance Metrics" dashboard](./51.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _`SqlQueryStress`_ (in case it was already finished).
-
-  ![Screenshot showing "Last 5 minutes" time range](./52.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing increased load activity](./53.png)
-
-  ![Screenshot showing increased load activity](./54.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./55.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_postgresql_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_postgresql_arm_template/_index.md
deleted file mode 100644
index a8a309b48e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/aro/aro_postgresql_arm_template/_index.md
+++ /dev/null
@@ -1,322 +0,0 @@
----
-type: docs
-title: "PostgreSQL ARM Template"
-linkTitle: "PostgreSQL ARM Template"
-weight: 3
-description: >
----
-
-## Deploy Azure PostgreSQL in directly connected mode on ARO using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [PostgreSQL](https://docs.microsoft.com/azure/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale) deployed on [Azure Red Hat OpenShift (ARO)](https://docs.microsoft.com/azure/openshift/intro-openshift) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an ARO cluster deployed with an Azure Arc Data Controller, PostgreSQL instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services. 
-
-> **NOTE: Currently, Azure Arc-enabled PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Check your subscription quota for the DSv3 family.
-
-    > **NOTE: Azure Red Hat OpenShift requires a [minimum of 40 cores](/azure/openshift/tutorial-create-cluster#before-you-begin) to create and run an OpenShift cluster.**
-
-  ```shell
-  LOCATION=eastus
-  az vm list-usage -l $LOCATION --query "[?contains(name.value, 'standardDSv3Family')]" -o table
-  ```
-
-  ![Screenshot of checking DSV3 family cores usage](./01.png)
-
-- Get the Azure Red Hat OpenShift resource provider Id which needs to be assigned with the “Contributor” role.
-
-  ```shell
-  az ad sp list --filter "displayname eq 'Azure Red Hat OpenShift RP'" --query "[?appDisplayName=='Azure Red Hat OpenShift RP'].{name: appDisplayName, objectId: id}"
-  ```
-
-  ![Screenshot of Azure resource provider for Aro](./02.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aro_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/aro.json) - Deploys the aro cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the aro cluster including the data controller and PostgreSQL.
-
-- In addition to deploying the data controller and PostgreSQL, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this Azure Arc-enabled PostgreSQL scenario we will set it to _**true**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-  - _`AroProviderId`_ - ARO resource provider Id.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aro/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. At this point, the resource group should have **8 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **9 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./03.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./04.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_postgresql_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_postgresql_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aro/aro_postgresql_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./05.png)
-
-  ![Screenshot showing adding a new inbound security rule](./06.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./07.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./08.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./09.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./10.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./11.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./12.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aro/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and PostgreSQL will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the PowerShell logon script run](./29.png)
-
-  ![Screenshot showing the PowerShell logon script run](./30.png)
-
-  ![Screenshot showing the PowerShell logon script run](./31.png)
-
-  ![Screenshot showing the PowerShell logon script run](./32.png)
-
-  ![Screenshot showing the PowerShell logon script run](./33.png)
-
-  ![Screenshot showing the PowerShell logon script run](./34.png)
-
-  ![Screenshot showing the PowerShell logon script run](./35.png)
-
-  ![Screenshot showing the PowerShell logon script run](./36.png)
-
-  ![Screenshot showing the PowerShell logon script run](./37.png)
-
-  ![Screenshot showing the post-run desktop](./38.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and PostgreSQL instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **12 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  - _Azure Arc-enabled PostgreSQL_ - The PostgreSQL instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./39.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./40.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./41.png)
-
-- Additionally, the PostgreSQL connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio PostgresSQL connection](./42.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./43.png)
-
-![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./44.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./45.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/_index.md
deleted file mode 100644
index 239035b5a5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Kubernetes Cluster API"
-linkTitle: "Kubernetes Cluster API"
-weight: 2
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on deploying Azure Arc-enabled data services on Cluster API (CAPI) Kubernetes in an automated fashion using ARM templates.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_dc_vanilla_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_dc_vanilla_arm_template/_index.md
deleted file mode 100644
index 250252c2a1..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_dc_vanilla_arm_template/_index.md
+++ /dev/null
@@ -1,313 +0,0 @@
----
-type: docs
-title: "Data Controller ARM Template"
-linkTitle: "Data Controller ARM Template"
-weight: 1
-description: >
----
-
-## Deploy a vanilla Azure Arc Data Controller in directly connected mode on Cluster API Kubernetes cluster with Azure provider using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) deployed on [Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/introduction.html) Kubernetes cluster and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/).
-
-By the end of this scenario, you will have a CAPI Kubernetes cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario and as part of the automation flow (described below), a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/) cluster will be deployed which will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_ubuntuCapi_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json) - Deploys an Ubuntu Linux VM which will have Rancher K3s installed and transformed into a Cluster API management cluster via the Azure CAPZ provider. As part of it's automation and the [_installCAPI_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh) shell script, a new Azure Arc-enabled Kubernetes cluster will already be created to be used by the rest of the Azure Arc-enabled data services automation. Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom location](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the CAPI workload cluster including the data controller.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- You will also need to get the Azure Custom Location Resource Provider (RP) Object ID (OID) and export it as an environment variable. This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your cluster.
-
-  > **NOTE: You need permissions to list all the service principals.**
-  #### Option 1: Bash
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-    --parameters customLocationRPOID="$customLocationRPOID"
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdatademo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters customLocationRPOID="$customLocationRPOID" \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. As mentioned, a new Azure Arc-enabled Kubernetes cluster resource will already be available at this point.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_dc_vanilla_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_dc_vanilla_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_dc_vanilla_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-    ![Screenshot showing the PowerShell logon script run](./12.png)
-
-    ![Screenshot showing the PowerShell logon script run](./13.png)
-
-    ![Screenshot showing the PowerShell logon script run](./14.png)
-
-    ![Screenshot showing the PowerShell logon script run](./15.png)
-
-    ![Screenshot showing the PowerShell logon script run](./16.png)
-
-    ![Screenshot showing the PowerShell logon script run](./17.png)
-
-    ![Screenshot showing the PowerShell logon script run](./18.png)
-
-    ![Screenshot showing the PowerShell logon script run](./19.png)
-
-    ![Screenshot showing the PowerShell logon script run](./20.png)
-
-    ![Screenshot showing the PowerShell logon script run](./21.png)
-
-    ![Screenshot showing the PowerShell logon script run](./22.png)
-
-    ![Screenshot showing the PowerShell logon script run](./23.png)
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the post-run desktop](./26.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - Custom location - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - Azure Arc Data Controller - The data controller that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./27.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./28.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./29.png)
-
-## Cluster extensions
-
-In this scenario, four Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _microsoft.policyinsights_ - The Azure Policy cluster extension. To learn more about it, read the [Understand Azure Policy for Kubernetes clusters](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes) Azure doc.
-
-- _microsoft.azuredefender.kubernetes_ - The Microsoft Defender for Cloud cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/#create-azure-defender-extensions-instance) scenario.
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-- In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./30.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./31.png)
-
-### Exploring logs from the Client virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Arc-Data-Client_ or _Arc-Data-CAPI-MGMT_ virtual machines in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _Arc-Data-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Logfile | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Arc-Data-Client_. |
-| _C:\Temp\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\Temp\installCAPI.log_ | Output from the custom script extension which runs on _Arc-Data-CAPI-MGMT_ and configures the Cluster API for Azure cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuCapi.json_ then review this log. |
-
-![Screenshot showing the Temp folder with deployment logs](./32.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./33.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_mssql_mi_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_mssql_mi_arm_template/_index.md
deleted file mode 100644
index 730d9a13ca..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_mssql_mi_arm_template/_index.md
+++ /dev/null
@@ -1,397 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance ARM Template"
-linkTitle: "SQL Managed Instance ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure Arc-enabled SQL Managed Instance in directly connected mode on Cluster API Kubernetes cluster with Azure provider using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/introduction.html) Kubernetes cluster and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/).
-
-By the end of this scenario, you will have a CAPI Kubernetes cluster deployed with an Azure Arc Data Controller, SQL Managed Instance (with a sample database), and a Microsoft Windows Server 2022 (Datacenter) Azure sidecar VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario and as part of the automation flow (described below), a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/) cluster will be deployed which will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_ubuntuCapi_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json) - Deploys an Ubuntu Linux VM which will have Rancher K3s installed and transformed into a Cluster API management cluster via the Azure CAPZ provider. As part of it's automation and the [_installCAPI_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh) shell script, a new Azure Arc-enabled Kubernetes cluster will already be created to be used by the rest of the Azure Arc-enabled data services automation. Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom location](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the CAPI workload cluster including the data controller.
-
-- In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder.
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either _**true**_ or _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- You will also need to get the Azure Custom Location Resource Provider (RP) Object ID (OID) and export it as an environment variable. This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your cluster.
-
-  > **NOTE: You need permissions to list all the service principals.**
-  #### Option 1: Bash
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-    --parameters customLocationRPOID="$customLocationRPOID"
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdatademo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters customLocationRPOID="$customLocationRPOID" \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. As mentioned, a new Azure Arc-enabled Kubernetes cluster resource will already be available at this point.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_mssql_mi_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_mssql_mi_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_mssql_mi_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and the SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the post-run desktop](./29.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - Custom location - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - Azure Arc Data Controller - The data controller that is now deployed on the Kubernetes cluster.
-
-  - Azure Arc-enabled SQL Managed Instance - The SQL Managed Instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./30.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./31.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./32.png)
-
-- Additionally, the SQL Managed Instance connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./33.png)
-
-## Cluster extensions
-
-In this scenario, four Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _microsoft.policyinsights_ - The Azure Policy cluster extension. To learn more about it, read the [Understand Azure Policy for Kubernetes clusters](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes) Azure doc.
-
-- _microsoft.azuredefender.kubernetes_ - The Microsoft Defender for Cloud cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/#create-azure-defender-extensions-instance) scenario.
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-- In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./34.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./35.png)
-
-## High Availability with SQL Always-On availability groups
-
-Azure Arc-enabled SQL Managed Instance is deployed on Kubernetes as a containerized application and uses kubernetes constructs such as stateful sets and persistent storage to provide built-in health monitoring, failure detection, and failover mechanisms to maintain service health. For increased reliability, you can also configure Azure Arc-enabled SQL Managed Instance to deploy with extra replicas in a high availability configuration.
-
-For showcasing and testing SQL Managed Instance with [Always On availability groups](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-high-availability#deploy-with-always-on-availability-groups), a dedicated [Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/) is available to help you simulate failures and get hands-on experience with this deployment model.
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance stress simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Screenshot showing opened SqlQueryStress](./36.png)
-
-  ![Screenshot showing SQLMI Endpoints text file](./37.png)
-
-> **NOTE: Secondary SQL Managed Instance endpoint will be available only when using the [HA deployment model ("Business Critical")](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/).**
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SqlQueryStress connected](./38.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SqlQueryStress settings](./39.png)
-
-  ![Screenshot showing SqlQueryStress running](./40.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./41.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _`kubectl get svc -n arc`_ command to view the _metricsui_ external service IP address.
-
-  ![Screenshot showing metricsui Kubernetes service](./42.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Screenshot showing Grafana username and password](./43.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana dashboards](./44.png)
-
-  ![Screenshot showing Grafana "SQL Managed Instance Metrics" dashboard](./45.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _SqlQueryStress_ (in case it was already finished).
-
-  ![Screenshot showing "Last 5 minutes" time range](./46.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing increased load activity](./47.png)
-
-  ![Screenshot showing increased load activity](./48.png)
-
-### Exploring logs from the Client virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Arc-Data-Client_ or _Arc-Data-CAPI-MGMT_ virtual machines in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _Arc-Data-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Logfile | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Arc-Data-Client_. |
-| _C:\Temp\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\Temp\DeploySQLMI.log_ | Output of _deploySQL.ps1_ which deploys and configures SQL Managed Instance with Azure Arc. |
-| _C:\Temp\installCAPI.log_ | Output from the custom script extension which runs on _Arc-Data-CAPI-MGMT_ and configures the Cluster API for Azure cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuCapi.json_ then review this log. |
-| _C:\Temp\SQLMIEndpoints.log_ | Output from _SQLMIEndpoints.ps1_ which collects the service endpoints for SQL MI and uses them to configure Azure Data Studio connection settings. |
-
-![Screenshot showing the Temp folder with deployment logs](./49.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./50.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/_index.md
deleted file mode 100644
index 01fe7adc33..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/_index.md
+++ /dev/null
@@ -1,330 +0,0 @@
----
-type: docs
-title: "PostgreSQL ARM Template"
-linkTitle: "PostgreSQL ARM Template"
-weight: 3
-description: >
----
-
-## Deploy Azure Arc-enabled PostgreSQL in directly connected mode on Cluster API Kubernetes cluster with Azure provider using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [PostgreSQL](https://docs.microsoft.com/azure/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale) deployed on [Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/introduction.html) Kubernetes cluster and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/).
-
-By the end of this scenario, you will have a CAPI Kubernetes cluster deployed with an Azure Arc Data Controller, PostgreSQL instance (with a sample database), and a Microsoft Windows Server 2022 (Datacenter) Azure sidecar VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario and as part of the automation flow (described below), a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/) cluster will be deployed which will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_ubuntuCapi_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/ubuntuCapi.json) - Deploys an Ubuntu Linux VM which will have Rancher K3s installed and transformed into a Cluster API management cluster via the Azure CAPZ provider. As part of it's automation and the [_installCAPI_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/installCAPI.sh) shell script, a new Azure Arc-enabled Kubernetes cluster will already be created to be used by the rest of the Azure Arc-enabled data services automation. Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom location](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the CAPI workload cluster including the data controller.
-
-- In addition to deploying the data controller and PostgreSQL, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder.
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this Azure Arc-enabled PostgreSQL scenario we will set it to _**true**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- You will also need to get the Azure Custom Location Resource Provider (RP) Object ID (OID) and export it as an environment variable. This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your cluster.
-
-  > **NOTE: You need permissions to list all the service principals.**
-  #### Option 1: Bash
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-    --parameters customLocationRPOID="$customLocationRPOID"
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdatademo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/azuredeploy.json \
-    --parameters customLocationRPOID="$customLocationRPOID" \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal. As mentioned, a new Azure Arc-enabled Kubernetes cluster resource will already be available at this point.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and PostgreSQL will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the PowerShell logon script run](./29.png)
-
-  ![Screenshot showing the post-run desktop](./30.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - Custom location - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - Azure Arc Data Controller - The data controller that is now deployed on the Kubernetes cluster.
-
-  - Azure Arc-enabled PostgreSQL - The PostgreSQL instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./31.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./32.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./33.png)
-
-- Additionally, the PostgreSQL connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio PostgresSQL connection](./34.png)
-
-## Cluster extensions
-
-In this scenario, four Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _microsoft.policyinsights_ - The Azure Policy cluster extension. To learn more about it, read the [Understand Azure Policy for Kubernetes clusters](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes) Azure doc.
-
-- _microsoft.azuredefender.kubernetes_ - The Microsoft Defender for Cloud cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/#create-azure-defender-extensions-instance) scenario.
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-- In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./35.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./36.png)
-
-### Exploring logs from the Client virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Arc-Data-Client_ or _Arc-Data-CAPI-MGMT_ virtual machines in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _Arc-Data-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Logfile | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Arc-Data-Client_. |
-| _C:\Temp\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\Temp\DeployPostgreSQL.log_ | Output of _deployPostgreSQL.ps1_ which deploys and configures PostgreSQL with Azure Arc. |
-| _C:\Temp\installCAPI.log_ | Output from the custom script extension which runs on _Arc-Data-CAPI-MGMT_ and configures the Cluster API for Azure cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuCapi.json_ then review this log. |
-
-![Screenshot showing the Temp folder with deployment logs](./37.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Delete Azure resource group](./38.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/_index.md
deleted file mode 100644
index 94b3864646..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Unified Operations Use Cases"
-linkTitle: "Unified Operations Use Cases"
-weight: 8
-description: >-
-   Once you have your Azure Arc-enabled data services deployed, you can start to use native Azure tooling to manage it as well explore various architecture and deployment models.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/_index.md
deleted file mode 100644
index 61c3a779c3..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Azure Kubernetes Service"
-linkTitle: "Azure Kubernetes Service"
-weight: 1
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_arm_template_ado/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_arm_template_ado/_index.md
deleted file mode 100644
index 41fbca7ce7..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_arm_template_ado/_index.md
+++ /dev/null
@@ -1,198 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance Azure DevOps Release"
-linkTitle: "SQL Managed Instance Azure DevOps Release"
-weight: 5
-description: >
----
-
-## Deploy Azure SQL Managed Instance on AKS using Azure DevOps Release Pipeline
-
-The following Jumpstart scenario will guide you on how to use [Azure DevOps (ADO) Release pipelines](https://docs.microsoft.com/azure/devops/pipelines/release/?view=azure-devops) to deploy a "Ready to Go" environment so you can start using Azure Arc-enabled data services on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an Azure DevOps Release pipeline to deploy AKS cluster with an Azure Arc Data Controller ([in "Directly Connected" mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity), Azure SQL MI with a sample database and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc Data Services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-> **NOTE: The following scenario is focusing the Azure DevOps Release pipeline creation. Once the pipeline has been created and the environment deployment has finished, the automation flow and next steps are as [described on in the main bootstrap scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/)**
-
-## Prerequisites
-
-- [Azure DevOps account](https://azure.microsoft.com/services/devops/) set up with your organization and ready for project creation.
-  - (Optional) [Create new Azure DevOps organization](https://docs.microsoft.com/azure/devops/organizations/accounts/create-organization?view=azure-devops).
-  - (Optional) [Create new Azure DevOps project](https://docs.microsoft.com/azure/devops/organizations/projects/create-project?view=azure-devops&tabs=preview-page).
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment
-
-In this scenario, you will create a new Release pipeline to deploy the environment ARM template for this Jumpstart scenario.
-
-- In a new or an existing ADO project, start the process of creating a new release pipeline.
-
-    ![Screenshot of creating new ADO pipeline](./01.jpg)
-
-    ![Screenshot of creating new ADO pipeline](./02.jpg)
-
-- To create the pipeline, we will be using an empty job template and give it a name (once done click the X button).
-
-    ![Screenshot of creating new empty job template](./03.jpg)
-
-    ![Screenshot of creating new empty job template](./04.jpg)
-
-- Create a new task for the stage you have just created. This task will be the one for deploying the ARM template.
-
-    ![Screenshot of creating new ARM template deployment task](./05.jpg)
-
-    ![Screenshot of creating new ARM template deployment task](./06.jpg)
-
-- Click on the new task to start it's configuration.
-
-    ![Screenshot of deployment task config](./07.jpg)
-
-- When deploying an ARM template, the Azure Resource Manager connection and subscription must be provided.
-
-    ![Screenshot of Azure Resource Manager connection config](./08.jpg)
-
-  > **NOTE: For new ADO project, you will be asked to click the authorization button**
-
-    ![Screenshot of Azure subscription config](./09.jpg)
-
-- Provide the Azure resource group and location where all the resources will be deployed. Make sure to validate if the service is [currently available in your Azure region](https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc).
-
-    ![Screenshot of resource group and location config](./10.jpg)
-
-- As mentioned, the task will use the existing ARM template for deploying Azure Arc-enabled data services with SQL Managed Instance that in the Azure Arc Jumpstart GitHub repository.
-
-  - Change the Template location to "URL of the file"
-
-  - Copy the raw URLs for both the [template](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json) and the [parameters](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.parameters.json) json files and paste it in it's the proper field.
-
-  - The deployment ARM template requires you to provide parameters values. Click on the _Edit Override template parameters_ button to add the values of your parameters.
-
-    ![Screenshot of ARM template config](./11.jpg)
-
-  - _`sshRSAPublicKey`_ - Your ssh public key
-  - _`spnClientId`_ - Your Azure service principal name
-  - _`spnClientSecret`_ - Your Azure service principal password
-  - _`spnTenantId`_ - Your Azure tenant ID
-  - _`windowsAdminUsername`_ - Client Windows VM admin username
-  - _`windowsAdminPassword`_ - Client Windows VM admin password
-  - _`myIpAddress`_ - Public IP address of your network
-  - _`logAnalyticsWorkspaceName`_ - Unique Log Analytics workspace name
-  - _`deploySQLMI`_ - SQL Managed Instance deployment (true/false)
-  - _`SQLMIHA`_ - SQL Managed Instance high-availability deployment (true/false)
-  - _`deployPostgreSQL`_ - PostgreSQL deployment (true/false)
-  - _`clusterName`_ - AKS cluster name
-  - _`bastionHostName`_ - Indicate whether to deploy bastion host to manage AKS
-  - _`dnsPrefix`_ - AKS unique DNS prefix
-  - _`kubernetesVersion`_ - AKS Kubernetes Version (See previous prerequisite)
-  
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    ![Screenshot of ARM template parameters config](./12.jpg)
-
-    ![Screenshot of ARM template parameters config](./13.jpg)
-
-    ![Screenshot of ARM template parameters config](./14.jpg)
-
-    ![Screenshot of ARM template parameters config](./15.jpg)
-
-- Provide a deployment name.
-
-    ![Screenshot of deployment name config](./16.jpg)
-
-- Provide pipeline name and click the save button.
-
-    ![Screenshot of config save](./17.jpg)
-
-- After saving the task configuration, continue to create the release pipeline.
-
-    ![Screenshot of pipeline creation](./18.jpg)
-
-    ![Screenshot of pipeline creation](./19.jpg)
-
-    ![Screenshot of pipeline creation](./20.jpg)
-
-    ![Screenshot of pipeline creation](./21.jpg)
-
-- Once done, click on the new release link. In this scenario, you will perform a manually triggering for the deployment. Once you do, click on the Logs button to see the progress.
-
-    ![Screenshot of pipeline deployment](./22.jpg)
-
-    ![Screenshot of pipeline deployment](./23.jpg)
-
-    ![Screenshot of pipeline deployment](./24.jpg)
-
-    ![Screenshot of deployment progress logs](./25.jpg)
-
-    ![Screenshot of deployment progress logs](./26.jpg)
-
-- Once completed, all the deployment resources will be available in the Azure portal.
-
-  > **NOTE: Deployment time of the Azure resources (AKS + Windows VM) can take ~25-30 minutes.**
-
-    ![Screenshot of deployment completed](./27.jpg)
-
-    ![Screenshot of Azure resources](./28.jpg)
-
-- As mentioned, this scenario is focusing on the Azure DevOps Release pipeline creation. At this point, now that you have the Azure resources created, continue to the next steps as [described on in the main bootstrap scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/#windows-login--post-deployment).
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_dr/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_dr/_index.md
deleted file mode 100644
index d6b57bbbeb..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_dr/_index.md
+++ /dev/null
@@ -1,397 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance disaster recovery"
-linkTitle: "SQL Managed Instance disaster recovery"
-weight: 3
-description: >
----
-
-## Configure disaster recovery in Azure Arc-enabled SQL Managed Instance on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deply a "Ready to Go" environment so you can configure [disaster recovery](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-disaster-recovery) using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/dr/intro-kubernetes) cluster using an [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this guide, you will have two Azure Kubernetes Service (AKS) clusters deployed in two separate Azure virtual networks with two Azure Arc-enabled SQL Managed Instances deployed on both clusters, disaster recovery architecture configured between the two sites, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services:
-
-![Screenshot showing the deployed architecture](./diagram.png)
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/VNET.json) - Deploys three Virtual Networks, two for each site where the clusters will be located and a third Virtual Network to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/aks.json) - Deploys the two AKS clusters in both sites (primary and secondary) where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-  - User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the AKS clusters including the data controllers and SQL Managed Instances, in addition to configuring disaster recovery between the two clusters.
-
-  - In addition to deploying the data controllers and SQL Managed Instances, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well on the primary cluster.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either _**true**_ or _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-    > **NOTE: This scenario goes through the capability to failover one Azure Arc-enabled SQL Managed Instance to another instance on a different cluster. If you would like to learn about high availability within the same cluster, you can check our Jumpstart [SQL Managed Instance Availability Groups Failover](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/) scenario.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/DR/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/DR/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **11 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **12 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_dr/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_dr/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_dr/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./11.png)
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the PowerShell logon script run](./28.png)
-
-  ![Screenshot showing the PowerShell logon script run](./29.png)
-
-  ![Screenshot showing the PowerShell logon script run](./30.png)
-
-  ![Screenshot showing the PowerShell logon script run](./31.png)
-
-  ![Screenshot showing the PowerShell logon script run](./32.png)
-
-  ![Screenshot showing the PowerShell logon script run](./33.png)
-
-  ![Screenshot showing the PowerShell logon script run](./34.png)
-
-  ![Screenshot showing the PowerShell logon script run](./35.png)
-
-  ![Screenshot showing the PowerShell logon script run](./36.png)
-
-  ![Screenshot showing the post-run desktop](./37.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **19 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controllers that are now deployed on the Kubernetes clusters.
-
-  - _Azure Arc-enabled SQL Managed Instance_ - The SQL Managed Instances that are now deployed on the Kubernetes clusters.
-
-    ![Screenshot showing additional Azure resources in the resource group](./38.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./39.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./40.png)
-
-- Additionally, the SQL Managed Instances connections will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation on the primary instance.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./41.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with AKS as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_monitor/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./42.png)
-
-![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./43.png)
-
-## Disaster recovery with SQL distributed availability groups
-
-Azure Arc-enabled SQL Managed Instance is deployed on Kubernetes as a containerized application and uses Kubernetes constructs such as stateful sets and persistent storage to provide built-in health monitoring, failure detection, and failover mechanisms to maintain service health. For increased reliability, you can also configure disaster recovery between multiple Azure Arc-enabled SQL Managed Instances to be able to failover to another instance on another Kubernetes cluster. Disaster recovery is supported for both General Purpose and Business Critical tiers.
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance distributed availability group validation
-
-- To be able to failover to a different cluster, a distributed availability group is created by the automation flow that spans the primary and secondary clusters. This can be validated by running the following commands:
-
-  ```shell
-  az sql instance-failover-group-arc show --name primarycr --use-k8s  --k8s-namespace arc
-  ```
-
-  ![Screenshot showing disaster recovery configuration](./44.png)
-
-- As part of the automation, the script will also create a new text file and a desktop shortcut named Endpoints that includes both the primary and the secondary SQL endpoints for both SQL instances.
-  
-  ![Screenshot showing the Azure Arc-enabled SQL Managed Instances endpoint URLs text file](./45.png)
-
-- Open Microsoft SQL Server Management Studio (SSMS) which is installed automatically for you as part of the bootstrap Jumpstart scenario and use the primary endpoint IP address for the primary cluster and login to the primary DB instance using the username and password provided in the text file mentioned above.
-
-  ![Screenshot showing opening SQL Server Management Studio from the start menu](./46.png)
-
-- Use the username and password you entered when provisioned the environment and select “SQL Server Authentication”. Alternatively, you can retrieve the username and password using the _`$env:AZDATA_USERNAME`_ and _`$env:AZDATA_PASSWORD`_ commands.
-
-  ![Screenshot showing logging into the SQL Server Management Studio](./47.png)
-
-- Connect to the secondary instance as well using the primary endpoint IP address for the secondary cluster in the in the text file mentioned above.
-
-  ![Screenshot showing the SQL Server Management Studio after login](./48.png)
-
-  ![Screenshot showing the SQL Server Management Studio after login](./49.png)
-
-  ![Screenshot showing the two Azure Arc-enabled SQL Managed Instances connected in the SQL Management Studio](./50.png)
-
-- Expand the _Always On High Availability_ node on both instances to verify that the distributed availability group is created.
-
-  ![Screenshot showing the local and distributed Availabilty groups on both instances ](./51.png)
-
-- You will find the _AdventureWorks2019_ database already deployed into the primary instance (_js-sql-pr_) and automatically replicated to the secondary instance (_js-sql-dr_) as part of the distributed availability group.
-
-  ![Screenshot showing adventureworks database opened on the primary instance](./52.png)
-
-  > **NOTE: You will not be able to browse the _AdventureWorks2019_ database from the secondary instance since this instance is configured as a disaster recovery instace**.
-
-  ![Screenshot showing adventureworks database opened on the secondary instance](./53.png)
-
-### Simulating failure on the primary site
-
-- First, to test that the DB replication is working, a simple table modification is needed. For this example, on the primary replica, run the following query to update the title of one of the rows to be _Jumpstart Administrator_
-
-   ```Sql
-    USE [AdventureWorks2019]
-    GO
-    UPDATE [HumanResources].[Employee]
-    SET [JobTitle] = 'Jumpstart Administrator'
-    WHERE NationalIDNumber = 245797967
-    GO
-    ```
-
-    ![Screenshot showing updating a record in the database](./54.png)
-
-    ![Screenshot showing the updated record in the database](./55.png)
-
-- To simulate a disaster situation, navigate to the AKS cluster in the Azure portal and stop the primary cluster.
-
-    ![Screenshot showing stopping the primary AKS cluster](./56.png)
-
-- Wait for two minutes for the cluster to shutdown and try to refresh the connection to the primary instance and you can see that its no longer available.
-
-    ![Screenshot showing unavailable primary instance](./57.png)
-
-### Initiating a forced failover to the secondary site.
-
-- On the client VM, run the following commands on the secondary instance to promote to primary with a forced failover incurring potential data loss.
-
-   ```shell
-    kubectx secondary
-    az sql instance-failover-group-arc update --k8s-namespace arc --name secondarycr --use-k8s --role force-primary-allow-data-loss
-   ```
-
-    ![Screenshot showing stopping the primary AKS cluster](./58.png)
-
-- Browse to the secondary instance on the Microsoft SQL Server Management Studio (SSMS) and you can see that the secondary (_js-sql-dr_) instance is now promoted to primary.
-
-    ![Screenshot showing browsing to the secondary instance](./59.png)
-
-- To validate that the data you updated earlier has been replicated to the secondary instance, select the _"HumanResources.Employee"_ table, click on "Edit Top 200 Rows".
-
-    ![Screenshot showing Edit Top 200 Rows](./60.png)
-    
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./61.png)
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/_index.md
deleted file mode 100644
index 4465345c9b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/_index.md
+++ /dev/null
@@ -1,127 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance Availability Groups Failover"
-linkTitle: "SQL Managed Instance Availability Groups Failover"
-weight: 1
-description: >
----
-
-## Perform database failover with SQL Managed Instance Availability Groups
-
-The following Jumpstart scenario will guide you on how to explore and test Azure Arc-enabled SQL Managed Instance Availability Groups, simulate failures and DB replication. In this scenario, you will be restoring a sample database, will initiate a failover to force HA event as well as validating database replication across multiple SQL nodes in an availability group.
-
-> **NOTE: This guide assumes you already deployed a Azure Arc-enabled SQL Managed Instance on Azure Kubernetes Service (AKS). If you haven't, this [following bootstrap Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/) offers you a way to do so in an automated fashion. All the steps and operations described in this scenario assume you used the mentioned bootstrap Jumpstart scenario and have the Client VM deployed as part of it.**
-
-## Deployed Kubernetes Resources
-
-When deploying Azure Arc-enabled SQL Managed Instance in an availability group, multiple Kubernetes resources are created to support it. The below section describes the main ones that are important to understand for this scenario.
-
-### SQL MI Pods Replicas
-
-Three SQL pods replicas will be deployed to assemble the availability group. These can be seen using the _`kubectl get pods -n <deployment namespace> -o wide`_ command, for example, _`kubectl get pods -n arc -o wide`_. It is also important to highlight that Kubernetes will spread the pods across the various nodes in the cluster.
-
-![SQL pods](./01.png)
-
-### Services & Endpoints
-
-An external endpoint is automatically provisioned for connecting to databases within the availability group. This endpoint plays the role of the availability group listener.
-
-In an availability group deployment, two endpoints, primary and secondary get created, both backed by a Kubernetes Service resource with a type of _LoadBalancer_.
-
-- Using the _`az sql mi-arc show -n jumpstart-sql --k8s-namespace arc --use-k8s`_ command, validate the deployment endpoints details and the Availability Group health status.
-
-    ![az sql Azure CLI extension](./02.png)
-
-    ![az sql mi-arc show command](./03.png)
-
-    > **NOTE: Initiating the command will also deploy _az sql_ Azure CLI extension automatically.**
-
-- Using the _`kubectl get svc -n arc`_ command, you will be able to see the _LoadBalancer_ services used by the endpoints.
-
-    ![Kubernetes services](./04.png)
-
-## Database Restore
-
-In order for you to test the HA functionality, a database restore _[RestoreDB](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/arm_template/artifacts/RestoreDB.ps1)_ PowerShell script is provided. The script will restore the _[AdventureWorks2019](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms)_ sample database directly onto the primary SQL node pod container. From the _C:\Temp_ folder, run the script using the _`.\RestoreDB.ps1`_ command.
-
-![RestoreDB script](./05.png)
-
-## Database Replication
-
-All databases are automatically added to the availability group, including all users (including the _AdventureWorks2019_ database you just restored) and system databases like _master_ and _msdb_. This capability provides a single-system view across the availability group replicas.
-
-- In addition to restoring the _AdventureWorks2019_ database, the script will also create a new text file and a desktop shortcut named _Endpoints_ that includes both the primary and the secondary SQL endpoints.
-
-    ![Endpoints desktop shortcut](./06.png)
-
-    ![Endpoints text file](./07.png)
-
-- Open Microsoft SQL Server Management Studio (SSMS) which is installed automatically for you as part of the [bootstrap Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/) and use the primary endpoint IP address and login to the primary DB instance using the username and password provided in the text file mentioned above.
-
-    ![Microsoft SQL Server Management Studio](./08.png)
-
-- Use the username and password you entered when provisioned the environment and select "SQL Server Authentication". Alternatively, you can retrieve the username and password using the _`$env:AZDATA_USERNAME`_ and _`$env:AZDATA_PASSWORD`_ commands.
-
-    ![SSMS login](./09.png)
-
-    ![Primary endpoint connected](./10.png)
-
-- Follow the same process and connect to the secondary endpoint.
-
-    ![Connect button](./11.png)
-
-    ![Secondary endpoint connected](./12.png)
-
-- On both endpoints, expand the "Databases" and the "Always On High Availability" sections and see how the _AdventureWorks2019_ database is already automatically replicated and is part of the availability group.
-
-    ![Databases replication](./13.png)
-
-- To test that the DB replication is working, a simple table modification is needed. For this example, on the primary replica, expand the "Tables" section for the database, select the _"HumanResources.Employee"_ table, click on "Edit Top 200 Rows", modify one or more records and commit the changes by saving (_`Ctrl+S`_). As you can see, in this example a change was made to _"ken0"_ title and the number of vacation hours for _"rob0"_.
-
-    ![Expending database for primary](./14.png)
-
-    ![Edit Top 200 Rows](./15.png)
-
-    ![Modifying a table](./16.png)
-
-- On the secondary replica, expand the "Tables" section for the database, click on "Select Top 1000 Rows", and in the Results pane see how the table change is now replicated, showing the synchronization of the SQL instances in the availability group works as expected.
-
-    ![Expending database for secondary](./17.png)
-
-    ![Select Top 1000 Rows](./18.png)
-
-    ![Replication works](./19.png)
-
-## Database Failover
-
-As you already know, the availability group includes three Kubernetes replicas with a primary and two secondaries with all CRUD operations for the availability group are managed internally, including creating the availability group or joining replicas to the availability group created.
-
-- To test that failover between the replicas, we will simulate a "crash" that will trigger an HA event and will force one of the secondary replicas to get promoted to a primary replica. Open two side-by-side PowerShell sessions. On the left side session, use the _`kubectl get pods -n arc`_ to review the deployed pods. The right-side session will be used to monitor the pods on the cluster using the _`kubectl get pods -n arc -w`_ command. As you can see, three SQL replicas with four containers each are running.
-
-    ![side-by-side PowerShell sessions](./20.png)
-
-- In SSMS, you can also see that _jumpstart-sql-0_ is acting as the primary replica and _jumpstart-sql-1_ and _jumpstart-sql-2_ are the secondary. At this point, close SSMS.
-
-    ![Primary and secondary replicas](./21.png)
-
-- To trigger the HA event, delete the primary replica _jumpstart-sql-0_ using the _`kubectl delete pod jumpstart-sql-0 -n arc`_ and watch how the pod gets deleted and then being deployed again due to being part of a Kubernetes _ReplicaSet_. Wait for the _jumpstart-sql-0_ pod to become ready again (and an additional few minutes for letting the availability group to recover).
-
-    ![Pod deletion](./22.png)
-
-- Re-open SSMS and connect back to the previous _secondary_ endpoint. You can now see that _jumpstart-sql-0_ is now acting as the secondary replica and _jumpstart-sql-2_ was promoted to primary. In addition, run the _`az sql mi-arc show -n jumpstart-sql --k8s-namespace arc --use-k8s`_ command again and check the health status of the availability group.
-
-    > **NOTE: It might take a few minutes for the availability group to return to an healthy state.**
-
-    ![Successful failover](./23.png)
-
-    ![Availability group health](./24.png)
-
-## Re-Validating Database Replication
-
-- Now that we perform a successful failover, we can re-validate and make sure replication still works as expected. In SSMS, re-add the second instance.
-
-    ![Re-adding instance](./25.png)
-
-- In the primary endpoint connection, repeat the process of performing a change on the _AdventureWorks2019_ database _"HumanResources.Employee"_ table and check that replication is working. In the example below, you can see how new values in new rows are now replicated.
-
-    ![Successful replication](./26.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_mi_ad_auth_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_mi_ad_auth_arm_template/_index.md
deleted file mode 100644
index e7b0306bb5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_mi_ad_auth_arm_template/_index.md
+++ /dev/null
@@ -1,286 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance with AD Authentication ARM Template"
-linkTitle: "SQL Managed Instance with AD Authentication ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure SQL Managed Instance with AD authentication support using Customer-managed keytab in directly connected mode on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) with [Active Directory Authentication](https://docs.microsoft.com/azure/azure-arc/data/active-directory-introduction) support to access control SQL Managed Instance. This scenario is deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview). This scenarios uses [Customer-managed keytab (CMK)](https://docs.microsoft.com/azure/azure-arc/data/deploy-customer-managed-keytab-active-directory-connector) to support [Active Directory authentication in Arc-enabled SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/deploy-active-directory-sql-managed-instance?tabs=customer-managed-keytab-mode).
-
-By the end of this scenario, you will have an AKS cluster deployed with an Azure Arc Data Controller, SQL Managed Instance, Microsoft Windows Server 2022 (Datacenter) Azure VM with Active Directory Domain Services and DNS server installed, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/VNET.json) - Deploys a Virtual Network with two subnets, one to be used by the Client virtual machine and Active Directory Domain Services VM, and the other to be used by AKS cluster. Assigns DNS servers in the VNet when Active Directory authentication support is enabled in SQL Managed Instance.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc data services will be deployed.
-  - [_addsVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/addsVm.json) - Deploys the Active Directory Domain Services Windows VM. This is where all user accounts are created to access SQL Managed Instance using Active Directory  authentication, service account to assign service principal and generate keytab file, and DNS entries for domain controller and SQL Managed Instance name resolution for connectivity.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-  - User remotes into the Active Directory domain joined client Windows VM using Active Directory account, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploy and configure Azure Arc-enabled data services on the AKS cluster including the reverse DNS setup, PTR record for domain controller, data controller, SQLMI organization unit (OU), domain user account and keytab file, Active Directory Connector(ADC), and SQL Managed Instance.
-
-  - In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database is restored, windows account is created in SQL Managed Instance, and sysadmin role is automatically assigned for you as well to connect to database server using Windows Integrated authentication using SQL Server Management Studio(SSMS) or Azure Data Studio.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_. Use value _**true**_ for this scenario to deploy SQL Managed Instance.
-  - _`SQLMIHA`_ - Boolean that sets whether to deploy SQL Managed Instance in high availability mode using Business Critical pricing tier. A value of _**false**_ selects General Purpose pricing tier and a value of _**true**_ selects Business Critical pricing tier. Default value is  _**false**_.
-  - _`enableADAuth`_ - Boolean that sets whether or not to deploy Active Directory Domain Services (ADDS) VM, for this Azure Arc-enabled SQL Managed Instance with AD authentication scenario. Default value is _**false**_. Use value _**true**_ for this scenario to deploy Domain Controller VM and support AD authentication in SQL Managed Instance.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this scenario. Default value is _**false**_.
-  - _`deployBastion`_ - Boolean that sets whether to deploy Azure Bastion or not to connect to the client VM. Default value is _**false**_.
-  - _`bastionHostName`_ - Azure Bastion host name. Default value is _**Arc-Data-Demo-Bastion**_.
-
-    > **Note:** In case you decided to deploy SQL Managed Instance in an highly-available fashion, refer to the ["Perform database failover with SQL Managed Instance Availability Groups"](../../../day2/aks/aks_mssql_ha/_index.md) Jumpstart scenario as well as the ["High Availability with Azure Arc-enabled SQL Managed Instance"](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-high-availability) product documentation.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~20-25min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **12 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **13 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_mi_ad_auth_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_mi_ad_auth_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_mi_ad_auth_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM. Please make sure to use User Principal Name of the domain user i.e. **arcdemo@jupstart.local** to login to Client VM through Bastion. Login will fail if using **jumpstart\arcdemo** format.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login to Client VM using Remote Desktop Connection, use **jumpstart\arcdemo** Active Directory user account to login. This user account is the domain administrator and has full privileges to setup AD authentication in SQL Managed Instance. As mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-> **NOTE: Using just arcdemo to login Client VM will not start automation script at first login, as this scenario relies on domain credentials to support AD authentication to connect SQL Managed Instance.**
-
-  ![Screenshot showing the PowerShell logon script run](./11.png)
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-  
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the post-run desktop](./26.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **15 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  > **NOTE: Azure resource will not be created for SQL Managed Instance with AD authentication created in the scenario using YAML. Azure resources are created only when using ARM template or deployed SQL Managed Instance using Azure Portal**.
-
-  ![Screenshot showing additional Azure resources in the resource group](./27.png)
-
-- As part of the automation, SQL Server Management Studio and Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Open Azure Data Studio to connect to SQL Managed Instance using AD authentication.
-
-  > **NOTE: As part of the automation SQL Managed Instance and PostgreSQL database connections are pre-created with SQL endpoints in Azure Data Studio.**
-
-  ![Screenshot showing SQL Managed Instance endpoints and database server credentials](./28.png)
-
-  ![Screenshot showing SQL Managed Instance Integrate authentication](./29.png)
-
-- As part of the automation, SQL Managed Instance endpoints desktop shortcut is created to view connection information and login to the SQL Managed Instance using Windows authentication. Copy the endpoint information to login to the SQL server.
-
-  ![Screenshot showing SQL Managed Instance endpoints and database server credentials](./30.png)
-
-- Open SQL Server Management Studio to connect to SQL Managed Instance using Windows Authentication.
-
-  ![Screenshot showing SQL Server Management Studio desktop shortcut](./31.png)
-
-- Paste SQL Managed Instance endpoint information copied in the previous step, select Windows Authentication, leave currently selected user, and click Connect.
-
-  ![Screenshot showing SQL MI connection using using Windows Authentication](./32.png)
-
-- Notice server connection information, restored default database AdventureWorks2019, and Windows user account created in SQL Server Managed Instance to support AD authentication.
-
-  ![Screenshot showing SQL MI connection using using SQL Server Management Studio](./33.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-  ![Screenshot showing Azure resource group deletion](./34.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_migrate/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_migrate/_index.md
deleted file mode 100644
index 024dcd70b8..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_migrate/_index.md
+++ /dev/null
@@ -1,360 +0,0 @@
----
-type: docs
-title: "Migrate to Azure Arc-enabled SQL Managed Instance"
-linkTitle: "Migrate to Azure Arc-enabled SQL Managed Instance"
-weight: 4
-description: >
----
-
-## Migrate to Azure Arc-enabled SQL Managed Instance on AKS using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can [migrate a SQL database](https://docs.microsoft.com/azure/azure-arc/data/migrate-to-managed-instance) using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/dr/intro-kubernetes) cluster using an [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an AKS cluster deployed with an Azure Arc Data Controller, SQL Managed Instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services. The Azure client VM will host a nested VM with SQL Server installed and configured where you will be migrating the _AdventureWorks_ sample database from:
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/VNET.json) - Deploys a Virtual Network with a single subnet to be used by the Client virtual machine.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/aks.json) - Deploys the AKS cluster where all the Azure Arc data services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-  - User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configures Azure Arc-enabled data services on the AKS cluster including the data controller and SQL Managed Instance and a SQL Server instance in a nested VM that will act as the source SQL instance to migrate from.
-
-  - In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well on the source SQL instance on the nested VM.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either _**true**_ or _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/Migration/ARM/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdata \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/Migration/ARM/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in the Azure portal. At this point, the resource group should have **8 various Azure resources** deployed (If you chose to deploy Azure Bastion, you will have **9 Azure resources**).
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_migrate/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_migrate/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_migrate/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM. Please make sure to use User Principal Name of the domain user i.e. **arcdemo@jupstart.local** to login to Client VM through Bastion. Login will fail if using **jumpstart\arcdemo** format.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./11.png)
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the PowerShell logon script run](./24.png)
-
-  ![Screenshot showing the PowerShell logon script run](./25.png)
-
-  ![Screenshot showing the PowerShell logon script run](./26.png)
-
-  ![Screenshot showing the PowerShell logon script run](./27.png)
-
-  ![Screenshot showing the post-run desktop](./28.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **12 various Azure resources deployed**. The important ones to notice are:
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controllers that are now deployed on the Kubernetes clusters.
-
-  - _Azure Arc-enabled SQL Managed Instance_ - The SQL Managed Instances that are now deployed on the Kubernetes clusters.
-
-    ![Screenshot showing additional Azure resources in the resource group](./29.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./30.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./31.png)
-
-- Additionally, the SQL Managed Instances connection and the SQL instance on the nested VM will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation on the source SQL instance on the client VM.
-
-  ![Screenshot showing Azure Data Studio SQL MI and nested SQL Server connection](./32.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with AKS as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_monitor/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./33.png)
-
-![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./34.png)
-
-## Operations
-
-### Creating backup of the _AdventureWorks_ database from the source SQL Instance to prepare for migration
-
-- As part of the automation, the script will also create a new text file and a desktop shortcut named "SQLMI Endpoints" that includes the SQL endpoint for the Azure Azure Arc-enabled SQL Managed Instance.
-
-  ![Screenshot showing the Azure Arc-enabled SQL Managed Instance endpoint URLs text file](./35.png)
-
-- To connect to the source SQL instance on the nested VM, you can find the connection details in the Azure Data Studio.
-
-  ![Screenshot showing the source SQL instance connection details](./36.png)
-
-  ![Screenshot showing the source SQL instance connection details](./37.png)
-
-- Open Microsoft SQL Server Management Studio (SSMS) which is installed automatically for you as part of the bootstrap Jumpstart scenario and use the primary endpoint IP address for the Azure Arc-enabled SQL Managed Instance and login to the primary DB instance using the username and password provided in the text file mentioned above.
-
-  ![Screenshot showing opening SQL Server Management Studio from the start menu](./38.png)
-
-- Use the username and password you entered when provisioned the environment and select “SQL Server Authentication”. Alternatively, you can retrieve the username and password using the _`$env:AZDATA_USERNAME`_ and _`$env:AZDATA_PASSWORD`_ commands.
-
-  ![Screenshot showing logging into the SQL Server Management Studio](./39.png)
-
-- Connect to the source SQL instance as well using the connection details you got from the Azure Data Studio.
-
-  ![Screenshot showing the SQL Server Management Studio after login](./40.png)
-
-  ![Screenshot showing logging into the SQL Server Management Studio](./41.png)
-
-  ![Screenshot showing the two SQL instances connected](./42.png)
-
-- Expand the source SQL instance and navigate to the _AdventureWorks_ database and execute the following query, use the same username and password as the previous step.
-
-  ```Sql
-    BACKUP DATABASE AdventureWorksLT2019
-    TO DISK = 'C:\temp\AdventureWorksLT2019.bak'
-    WITH FORMAT, MEDIANAME = 'AdventureWorksLT2019' ;
-    GO
-  ```
-
-  ![Screenshot showing starting a new query](./43.png)
-
-  ![Screenshot showing the success message after backing up the AdventureWorks database](./44.png)
-
-- You can perform the same steps to backup the _AdventureWorks_ database from Azure Data Studio.
-
-  ![Screenshot showing starting a new query in Azure Data Studio](./45.png)
-
-  ![Screenshot showing the success message after backing up the AdventureWorks database in Azure Data Studio](./46.png)
-### Migrate the _AdventureWorks_ database from the source SQL instance to the Azure Arc-enabled SQL Managed Instance
-
-- To migrate the backup we created, open a new PowerShell ISE session and use the following PowerShell snippet to:
-  - Copy the created backup to the client VM from the nested SQL VM
-  - Copy the backup to the Azure Arc-enabled SQL Managed Instance pod
-  - Initiate the backup restore process
-
- ```PowerShell
- Set-Location -Path c:\temp
-$nestedWindowsUsername = "Administrator"
-$nestedWindowsPassword = "ArcDemo123!!"
-$secWindowsPassword = ConvertTo-SecureString $nestedWindowsPassword -AsPlainText -Force
-$winCreds = New-Object System.Management.Automation.PSCredential ($nestedWindowsUsername, $secWindowsPassword)
-$session = New-PSSession -VMName Arcbox-SQL -Credential $winCreds
-Copy-Item -FromSession $session -Path C:\temp\AdventureWorksLT2019.bak -Destination C:\Temp\AdventureWorksLT2019.bak
-kubectl cp ./AdventureWorksLT2019.bak jumpstart-sql-0:var/opt/mssql/data/AdventureWorksLT2019.bak -n arc -c arc-sqlmi
-kubectl exec jumpstart-sql-0 -n arc -c arc-sqlmi -- /opt/mssql-tools/bin/sqlcmd -S localhost -U $Env:AZDATA_USERNAME -P $Env:AZDATA_PASSWORD -Q "RESTORE DATABASE AdventureWorksLT2019 FROM  DISK = N'/var/opt/mssql/data/AdventureWorksLT2019.bak' WITH MOVE 'AdventureWorksLT2012_Data' TO '/var/opt/mssql/data/AdventureWorksLT2012.mdf', MOVE 'AdventureWorksLT2012_Log' TO '/var/opt/mssql/data/AdventureWorksLT2012_log.ldf'"
- ```
-
-  ![Screenshot showing PowerShell script to restore the backup](./47.png)
-
-- Navigate to the Azure Arc-enabled SQL Managed Instance in the Microsoft SQL Server Management Studio (SSMS) and you can see that the _AdventureWorks_ database has been restored successfully.
-
-  ![Screenshot showing the restored database](./48.png)
-
-- You can also see the migrated database on Azure Data Studio.
-
-  ![Screenshot showing the restored database in Azure Data Studio](./49.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./50.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_postgresql_arm_template_ado/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_postgresql_arm_template_ado/_index.md
deleted file mode 100644
index d1a6ee21ad..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_postgresql_arm_template_ado/_index.md
+++ /dev/null
@@ -1,196 +0,0 @@
----
-type: docs
-title: "PostgreSQL Azure DevOps Release"
-linkTitle: "PostgreSQL Azure DevOps Release"
-weight: 6
-description: >
----
-
-## Deploy Azure PostgreSQL on AKS using Azure DevOps Release Pipeline
-
-The following Jumpstart scenario will guide you on how to use [Azure DevOps (ADO) Release pipelines](https://docs.microsoft.com/azure/devops/pipelines/release/?view=azure-devops) to deploy a "Ready to Go" environment so you can start using Azure Arc-enabled data services with Azure PostgreSQL on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have an Azure DevOps Release pipeline to deploy AKS cluster with an Azure Arc Data Controller ([in "Directly Connected" mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity), Azure PostgreSQL with a sample database and a Microsoft Windows Server 2022 (Datacenter) Azure VM, installed & pre-configured with all the required tools needed to work with Azure Arc Data Services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-> **NOTE: The following scenario is focusing the Azure DevOps Release pipeline creation. Once the pipeline has been created and the environment deployment has finished, the automation flow and next steps are as [described on in the main bootstrap scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/)**
-
-## Prerequisites
-
-- [Azure DevOps account](https://azure.microsoft.com/services/devops/) set up with your organization and ready for project creation.
-  - (Optional) [Create new Azure DevOps organization](https://docs.microsoft.com/azure/devops/organizations/accounts/create-organization?view=azure-devops).
-  - (Optional) [Create new Azure DevOps project](https://docs.microsoft.com/azure/devops/organizations/projects/create-project?view=azure-devops&tabs=preview-page).
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment
-
-In this scenario, you will create a new Release pipeline to deploy the environment ARM template for this Jumpstart scenario.
-
-- In a new or an existing ADO project, start the process of creating a new release pipeline.
-
-    ![Screenshot of creating new ADO pipeline](./01.jpg)
-
-    ![Screenshot of creating new ADO pipeline](./02.jpg)
-
-- To create the pipeline, we will be using an empty job template and give it a name (once done click the X button).
-
-    ![Screenshot of creating new empty job template](./03.jpg)
-
-    ![Screenshot of creating new empty job template](./04.jpg)
-
-- Create a new task for the stage you have just created. This task will be the one for deploying the ARM template.
-
-    ![Screenshot of creating new ARM template deployment task](./05.jpg)
-
-    ![Screenshot of creating new ARM template deployment task](./06.jpg)
-
-- Click on the new task to start it's configuration.
-
-    ![Screenshot of deployment task config](./07.jpg)
-
-- When deploying an ARM template, the Azure Resource Manager connection and subscription must be provided.
-
-    ![Screenshot of Azure Resource Manager connection config](./08.jpg)
-
-  > **NOTE: For new ADO project, you will be asked to click the authorization button**
-
-    ![Screenshot of Azure subscription config](./09.jpg)
-
-- Provide the Azure resource group and location where all the resources will be deployed. Make sure to validate if the service is [currently available in your Azure region](https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc).
-
-    ![Screenshot of resource group and location config](./10.jpg)
-
-- As mentioned, the task will deployed the existing ARM template for deploying Azure Arc-enabled data services with PostgreSQL that in the Azure Arc Jumpstart GitHub repository.
-
-  - Change the Template location to "URL of the file"
-
-  - Copy the raw URLs for both the [template](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/arm_template/postgres_hs/azuredeploy.json) and the [parameters](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/aks/arm_template/postgres_hs/azuredeploy.parameters.json) json files and paste it in it's the proper field.
-
-  - The deployment ARM template requires you provide parameters values. Click on the _Edit Override template parameters_ to add your parameters values.
-
-    ![Screenshot of ARM template config](./11.jpg)
-
-  - _`sshRSAPublicKey`_ - Your ssh public key
-  - _`spnClientId`_ - Your Azure service principal name
-  - _`spnClientSecret`_ - Your Azure service principal password
-  - _`spnTenantId`_ - Your Azure tenant ID
-  - _`windowsAdminUsername`_ - Client Windows VM admin username
-  - _`windowsAdminPassword`_ - Client Windows VM admin password
-  - _`myIpAddress`_ - Public IP address of your network
-  - _`logAnalyticsWorkspaceName`_ - Unique Log Analytics workspace name
-  - _`deploySQLMI`_ - SQL Managed Instance deployment (true/false)
-  - _`SQLMIHA`_ - SQL Managed Instance high-availability deployment (true/false)
-  - _`deployPostgreSQL`_ - PostgreSQL deployment (true/false)
-  - _`clusterName`_ - AKS cluster name
-  - _`bastionHostName`_ - Indicate whether to deploy bastion host to manage AKS
-  - _`dnsPrefix`_ - AKS unique DNS prefix
-  - _`kubernetesVersion`_ - AKS Kubernetes Version (See previous prerequisite)
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _`azuredeploy.parameters.json`_ file**
-
-    ![Screenshot of ARM template parameters config](./12.jpg)
-
-    ![Screenshot of ARM template parameters config](./13.jpg)
-
-    ![Screenshot of ARM template parameters config](./14.jpg)
-
-    ![Screenshot of ARM template parameters config](./15.jpg)
-
-- Provide a deployment name.
-
-    ![Screenshot of ARM template parameters config](./16.jpg)
-
-- Click the save button.
-
-    ![Screenshot of config save](./17.jpg)
-
-- After saving the task configuration, continue to create the release pipeline.
-
-    ![Screenshot of pipeline creation](./18.jpg)
-
-    ![Screenshot of pipeline creation](./19.jpg)
-
-    ![Screenshot of pipeline creation](./20.jpg)
-
-    ![Screenshot of pipeline creation](./21.jpg)
-
-- Once done, click on the new release link. In this scenario, you will perform a manually triggering for the deployment. Once you do, click on the Logs button to see the progress.
-
-    ![Screenshot of pipeline deployment](./22.jpg)
-
-    ![Screenshot of pipeline deployment](./23.jpg)
-
-    ![Screenshot of deployment progress logs](./24.jpg)
-
-    ![Screenshot of deployment progress logs](./25.jpg)
-
-- Once completed, all the deployment resources will be available in the Azure portal.
-
-  > **NOTE: Deployment time of the Azure resources (AKS + Windows VM) can take ~25-30 minutes.**
-
-    ![Screenshot of deployment completed](./26.jpg)
-
-    ![Screenshot of Azure resources](./27.jpg)
-
-- As mentioned, this scenario is focusing on the Azure DevOps Release pipeline creation. At this point, now that you have the Azure resources created, continue to the next steps as [described on in the main bootstrap scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/#windows-login--post-deployment).
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/_index.md
deleted file mode 100644
index b8a7253223..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Kubernetes Cluster API"
-linkTitle: "Kubernetes Cluster API"
-weight: 2
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/_index.md
deleted file mode 100644
index 4de120b282..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/_index.md
+++ /dev/null
@@ -1,125 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance Availability Groups Failover"
-linkTitle: "SQL Managed Instance Availability Groups Failover"
-weight: 1
-description: >
----
-
-## Perform database failover with SQL Managed Instance Availability Groups
-
-The following Jumpstart scenario will guide you on how to explore and test Azure Arc-enabled SQL Managed Instance Availability Groups, simulate failures and DB replication. In this scenario, you will be restoring a sample database, will initiate a failover to force HA event as well as validating database replication across multiple SQL nodes in an availability group.
-
-> **NOTE: This guide assumes you already deployed an Azure Arc-enabled SQL Managed Instance on Cluster API (CAPI) cluster using the Cluster API Azure Provider (CAPZ). If you haven't, the [following bootstrap Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure/arm_template/mssql_mi/) offers you a way to do so in an automated fashion. All the steps and operations described in this scenario assume you used the mentioned bootstrap Jumpstart scenario and have the Client VM deployed as part of it.**
-
-> **NOTE: Azure Arc-enabled SQL Managed Instance with Availability Groups is currently in [preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Deployed Kubernetes Resources
-
-When deploying Azure Arc-enabled SQL Managed Instance in an availability group, multiple Kubernetes resources are created to support it. The below section describes the main ones that are important to understand for this scenario.
-
-### SQL MI Pods Replicas
-
-Three SQL pods replicas will be deployed to assemble the availability group. These can be seen using the _`kubectl get pods -n <deployment namespace> -o wide`_ command, for example, _`kubectl get pods -n arc -o wide`_. It is also important to highlight that Kubernetes will spread the pods across the various nodes in the cluster.
-
-![SQL pods](./01.png)
-
-### Services & Endpoints
-
-An external endpoint is automatically provisioned for connecting to databases within the availability group. This endpoint plays the role of the availability group listener.
-
-In an availability group deployment, two endpoints, primary and secondary get created, both backed by a Kubernetes Service resource with a type of _LoadBalancer_.
-
-- Using the _`az sql mi-arc show -n jumpstart-sql --k8s-namespace arc --use-k8s`_ command, validate the deployment endpoints details and the Availability Group health status.
-
-    ![az sql Azure CLI extension](./02.png)
-
-    ![az sql mi-arc show command](./03.png)
-
-    > **NOTE: Initiating the command will also deploy _az sql_ Azure CLI extension automatically.**
-
-- Using the _`kubectl get svc -n arc`_ command, you will be able to see the _LoadBalancer_ services used by the endpoints.
-
-    ![Kubernetes services](./04.png)
-
-## Database Restore
-
-In order for you to test the HA functionality and as part of the bootstrap Jumpstart scenario, the [AdventureWorks2019](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms)_ sample database was directly restored onto the primary SQL node pod container.
-
-## Database Replication
-
-All databases are automatically added to the availability group, including all users (including the _AdventureWorks2019_ database you just restored) and system databases like _master_ and _msdb_. This capability provides a single-system view across the availability group replicas.
-
-To retrieve the SQL Managed Instance endpoints, a desktop shortcut for a _SQLMI Endpoints_ text file is automatically created for you that includes both the primary and the secondary SQL endpoints.
-
-![Endpoints script](./05.png)
-
-![Endpoints text file](./06.png)
-
-- Open Microsoft SQL Server Management Studio (SSMS) which is installed automatically for you as part of the [bootstrap Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/) and use the primary endpoint IP address and login to the primary DB instance using the username and password provided in the text file mentioned above.
-
-    ![Microsoft SQL Server Management Studio](./07.png)
-
-    ![SSMS login](./08.png)
-
-    ![Primary endpoint connected](./09.png)
-
-- Follow the same process and connect to the secondary endpoint.
-
-    ![Connect button](./10.png)
-
-    ![Secondary endpoint connected](./11.png)
-
-- On both endpoints, expand the "Databases" and the "Always On High Availability" sections and see how the _AdventureWorks2019_ database is already automatically replicated and is part of the availability group.
-
-    ![Databases replication](./12.png)
-
-- To test that the DB replication is working, a simple table modification is needed. For this example, on the primary replica, expand the "Tables" section for the database, select the _"HumanResources.Employee"_ table, click on "Edit Top 200 Rows", modify one or more records and commit the changes by saving (_`Ctrl+S`_). As you can see, in this example a change was made to _"ken0"_ title and the number of vacation hours for _"rob0"_.
-
-    ![Expending database for primary](./13.png)
-
-    ![Edit Top 200 Rows](./14.png)
-
-    ![Modifying a table](./15.png)
-
-- On the secondary replica, expand the "Tables" section for the database, click on "Select Top 1000 Rows", and in the Results pane see how the table change is now replicated, showing the synchronization of the SQL instances in the availability group works as expected.
-
-    ![Expending database for secondary](./16.png)
-
-    ![Select Top 1000 Rows](./17.png)
-
-    ![Replication works](./18.png)
-
-## Database Failover
-
-As you already know, the availability group includes three Kubernetes replicas with a primary and two secondaries with all CRUD operations for the availability group are managed internally, including creating the availability group or joining replicas to the availability group created.
-
-- To test that failover between the replicas, we will simulate a "crash" that will trigger an HA event and will force one of the secondary replicas to get promoted to a primary replica. Open two side-by-side PowerShell sessions. On the left side session, use the _`kubectl get pods -n arc`_ to review the deployed pods. The right-side session will be used to monitor the pods on the cluster using the _`kubectl get pods -n arc -w`_ command. As you can see, three SQL replicas with four containers each are running.
-
-    ![side-by-side PowerShell sessions](./19.png)
-
-- In SSMS, you can also see that _jumpstart-sql-0_ is acting as the primary replica and _jumpstart-sql-1_ and _jumpstart-sql-2_ are the secondary. At this point, close SSMS.
-
-    ![Primary and secondary replicas](./20.png)
-
-- To trigger the HA event, delete the primary replica _jumpstart-sql-0_ using the _`kubectl delete pod jumpstart-sql-0 -n arc`_ and watch how the pod gets deleted and then being deployed again due to being part of a Kubernetes _ReplicaSet_. Wait for the _jumpstart-sql-0_ pod to become ready again (and an additional few minutes for letting the availability group to recover).
-
-    ![Pod deletion](./21.png)
-
-- Re-open SSMS and connect back to previous _secondary_ endpoint. You can now see that _jumpstart-sql-0_ and _jumpstart-sql-2_ are now acting as the secondary replica and _jumpstart-sql-1_ was promoted to primary. In addition, run the _`az sql mi-arc show -n jumpstart-sql --k8s-namespace arc --use-k8s`_ command again and check the health status of the availability group.
-
-    > **NOTE: It might take a few minutes for the availability group to return to an healthy state.**
-
-    ![Successful failover](./22.png)
-
-    ![Availability group health](./23.png)
-
-## Re-Validating Database Replication
-
-- Now that we perform a successful failover, we can re-validate and make sure replication still works as expected. In SSMS, re-add the second instance.
-
-    ![Re-adding instance](./24.png)
-
-- In the primary endpoint connection, repeat the process of performing a change on the _AdventureWorks2019_ database _"HumanResources.Employee"_ table and check that replication is working In the example below, you can see how new values in new rows are now replicated.
-
-    ![Successful replication](./25.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/eks/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/eks/_index.md
deleted file mode 100644
index c03032be58..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/eks/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Amazon Elastic Kubernetes Service"
-linkTitle: "Amazon Elastic Kubernetes Service"
-weight: 4
-description: >-
-  If you are working in a multi-cloud environment, the scenario in this section will guide on creating an Amazon Elastic Kubernetes Service (EKS) with Azure Arc-enabled data services integration in an automated fashion using Terraform.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_dc_vanilla_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_dc_vanilla_terraform/_index.md
deleted file mode 100644
index 878478de33..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_dc_vanilla_terraform/_index.md
+++ /dev/null
@@ -1,311 +0,0 @@
----
-type: docs
-title: "Data Controller Terraform plan"
-linkTitle: "Data Controller Terraform plan"
-weight: 1
-description: >
----
-
-## Deploy a vanilla Azure Arc Data Controller in a directly connected mode on EKS using Terraform
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using Azure Arc Data Services and deploy Azure data services on [Elastic Kubernetes Service (EKS)](https://aws.amazon.com/eks/) cluster, using [Terraform](https://www.terraform.io/).
-
-By the end of this scenario, you will have an EKS cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) AWS EC2 instance VM, installed & pre-configured with all the required tools needed to work with Azure Arc Data Services.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) and [Configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration) AWS CLI.
-
-- [Create a free Amazon Web Services account](https://aws.amazon.com/free/) if you don't already have one.
-
-- [Install Terraform >=1.0](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Follow the steps [here](https://docs.microsoft.com/azure/azure-arc/kubernetes/custom-locations#enable-custom-locations-on-cluster) or run the command below to retrieve your AAD Tenant Specific ObjectID for the "Custom Locations RP" Enterprise Application needed to onboard Custom Locations on EKS:
-  
-  ```shell
-  # Note that the APPLICATION ID: bc313c14-388c-4e7d-a58e-70017303ee3b is constant across all tenants
-  az ad sp show --id 'bc313c14-388c-4e7d-a58e-70017303ee3b' --query id -o tsv
-  ```
-- Create a resource group
-
-   ```shell
-   az group create --name "Arc-Data-Demo" --location "eastus"
-   ```
-### Create a new AWS IAM Role & Key
-
-Create AWS User IAM Key. An access key grants programmatic access to your resources which we will be using later in this scenario.
-
-- Navigate to the [IAM Access page](https://console.aws.amazon.com/iam/home#/home).
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./01.png)
-
-- Select the **Users** from the side menu.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./02.png)
-
-- Select the **User** you want to create the access key for.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./03.png)
-
-- Select **Security credentials** of the **User** selected.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./04.png)
-
-- Under **Access Keys** select **Create Access Keys**.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./05.png)
-
-- In the popup window it will show you the ***Access key ID*** and ***Secret access key***. Save both of these values to configure the **Terraform plan** variables later.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./06.png)
-
-- In order to open a RDP session to the Windows Client EC2 instance, an EC2 Key Pair is required. From the *Services* menu, click on *"EC2"*, enter the *Key Pairs* settings from the left sidebar (under the *Network & Security* section) and click on *"Create key pair"* (top-right corner) to create a new key pair.
-
-  ![Screenshot showing creating an EC2 Key Pair](./07.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./08.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./09.png)
-
-- Provide a meaningful name, for example *terraform*, and click on *"Create key pair"* which will then automatically download the created *pem* file.
-
-  ![Screenshot showing creating an EC2 Key Pair](./10.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./11.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./12.png)
-
-- Copy the downloaded *pem* file to where the terraform binaries are located (in your cloned repository directory).
-
-  ![Screenshot showing creating an EC2 Key Pair](./13.png)
-
-  > **NOTE: EC2 Key Pairs are regional.**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the Terraform runtime environment variables in the _terraform.tfvars_ file (1-time edit). The variables are being used throughout the deployment.
-
-- [Screenshot showing creating the main Terraform plan](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/main.tf) will initiate the deployment of the other modules:
-
-  - [_clientVM_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/clientVM/main.tf) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_cluster_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/cluster/main.tf) - Deploys the EKS cluster where all the Azure Arc data services will be deployed.
-  - [workers](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/workers/main.tf) - Deploys the EKS cluster's worker nodes.
-
-- User remotes into client Windows VM, which automatically kicks off the DataServicesLogonScript PowerShell script that deploy and configure Azure Arc-enabled data services on the EKS cluster including the data controller.
-
-## Deployment
-
-As mentioned, the Terraform plan will deploy an EKS cluster, the Azure Arc Data Controller on that cluster and an EC2 Windows Server 2022 Client instance.
-
-- Before running the Terraform plan, create a terraform.tfvars file in the root of the terraform folder and supply some values for your environment.
-
-   ```HCL
-    AWS_ACCESS_KEY_ID      = "ZFTIFC443FTFDEZ5TKNR"
-    AWS_SECRET_ACCESS_KEY  = "fakeSecretValue1dfd343sd5712adfddjh"
-    AWS_DEFAULT_REGION     = "us-west-1"
-    azureLocation          = "eastus"
-    spnClientId            = "1414133c-9786-53a4-b231-f87c143ebdb1"
-    spnClientSecret        = "fakeSecretValue123458125712ahjeacjh"
-    spnTenantId            = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-    subscriptionId         = "33987583-A984-5C87-T4e3-POf7a397ec17"
-    resourceGroup          = "Arc-Data-Demo"
-    workspaceName          = "la-arc-001"
-    deploySQLMI            = false
-    SQLMIHA                = false
-    deployPostgreSQL       = false
-    customLocationObjectId = "649cb28f-bc13-492a-9470-c8bf01fa8eeb"
-  ```
-
-- Variable reference:
-
-  - **_`AWS_ACCESS_KEY_ID`_** - Your AWS access key.
-  - **_`AWS_SECRET_ACCESS_KEY`_** - Your AWS secret access key.
-  - **_`AWS_DEFAULT_REGION`_** - AWS location code (e.g. 'us-west-1', 'us-east-2', etc.).
-  - **_`azureLocation`_** - Azure location code (e.g. 'eastus', 'westus2', etc.).
-  - **_`spnClientId`_** - Your Azure service principal id.
-  - **_`spnClientSecret`_** - Your Azure service principal secret.
-  - **_`spnTenantId`_** - Your Azure tenant id.
-  - **_`subscriptionId`_** - Your Azure subscription Id.
-  - **_`resourceGroup`_** - Resource group which will contain all of the Azure Arc data services resources.
-  - **_`workspaceName`_** - Unique name for the ArcBox Log Analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - **_`customLocationObjectId`_** - The Azure AD application used by Azure Arc service retrieved in the prerequisites section.
-  
-> **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-- Now you will deploy the Terraform file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform) and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-> **NOTE: The deployment time for this scenario can take ~20-35min**
-
-- Example output from `terraform init`:
-
-  ![Screenshot showing creating the terraform init command output](./14.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![Screenshot showing creating the terraform plan command output](./15.png)
-
-- Once completed, the plan will output a decrypted password for your Windows Client instance that you will use to RDP into it. Before connecting to the Client instance, you can review the EKS cluster and the EC2 instances created. Notice how 4 instances were created; 3 EKS nodes and the Client instance.
-
-  ![Screenshot showing creating the terraform apply command output](./16.png)
-
-  ![Screenshot showing creating the new EKS cluster](./17.png)
-
-  ![Screenshot showing creating the new EKS cluster](./18.png)
-
-  ![Screenshot showing creating the new EC2 instances](./19.png)
-
-  ![Screenshot showing creating the new EC2 instances](./20.png)
-
-  ![Screenshot showing creating the new EC2 instances](./21.png)
-
-## Windows Login & Post Deployment
-
-- Now that the first phase of the automation is completed, it is time to RDP to the client VM. Select the Windows instance, click *"Connect"* and download the Remote Desktop file.
-
-  ![Screenshot showing starting an RDP session to the Client instance](./22.png)
-
-  ![Screenshot showing starting an RDP session to the Client instance](./23.png)
-
-- Using the decrypted password generated from the plan output, RDP the Windows instance. In case you need to get the password later, use the ```terraform output``` command to re-present the plan output.
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the PowerShell logon script run](./26.png)
-
-    ![Screenshot showing the PowerShell logon script run](./27.png)
-
-    ![Screenshot showing the PowerShell logon script run](./28.png)
-
-    ![Screenshot showing the PowerShell logon script run](./29.png)
-
-    ![Screenshot showing the PowerShell logon script run](./30.png)
-
-    ![Screenshot showing the PowerShell logon script run](./31.png)
-
-    ![Screenshot showing the post-run desktop](./32.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **4 various Azure resources deployed**.
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./33.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./34.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./35.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./36.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./37.png)
-## Delete the deployment
-
-- If you want to delete the entire Azure environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./38.png)
-
-- If you want to delete the entire environment, use the _`terraform destroy`_ to delete all of the AWS resources.
-
-  ```shell
-  terraform destroy --auto-approve
-  ```
-
-  ![Screenshot showing the deletion of all AWS resources](./39.png)
-
-  > **NOTE: Because the following resources were created by EKS that creates internal AWS dependencies that Terraform has no knowledge of from our plan, we need to delete the resources from AWS console as `terraform destroy` is cleaning up - this allows us to avoid dependency conflicts and ongoing billing from orphaned resources such as EKS Volumes.**
-
-- While the `destroy` command is running, delete any new Load Balancers created as EKS Services (`EC2 > Load Balancing > Load Balancers`) that are deployed in AWS from the Console:
-
-  ![Screenshot showing the Deletion of Load Balancers](./40.png)
-
-- While the `destroy` command is running, delete any new Elastic Block Stores, created as EKS Persistent Volumes (`EC2 > Elastic Block Store > Volumes`) that are deployed in AWS from the Console:
-
-  ![Screenshot showing the Deletion of Elastic Block Stores](./41.png)
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_mssql_mi_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_mssql_mi_terraform/_index.md
deleted file mode 100644
index 30ada43c9f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_mssql_mi_terraform/_index.md
+++ /dev/null
@@ -1,399 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance Terraform plan"
-linkTitle: "SQL Managed Instance Terraform plan"
-weight: 2
-description: >
----
-
-## Deploy Azure SQL Managed Instance in directly connected mode on EKS using a Terraform
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Elastic Kubernetes Service (EKS)](https://aws.amazon.com/eks/) cluster using [Terraform](https://www.terraform.io/)
-
-By the end of this scenario, you will have an EKS cluster deployed with an Azure Arc Data Controller, SQL Managed Instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) and [Configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration) AWS CLI.
-
-- [Create a free Amazon Web Services account](https://aws.amazon.com/free/) if you don't already have one.
-
-- [Install Terraform >=1.0](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Follow the steps [here](https://docs.microsoft.com/azure/azure-arc/kubernetes/custom-locations#enable-custom-locations-on-cluster) or run the command below to retrieve your AAD Tenant Specific ObjectID for the "Custom Locations RP" Enterprise Application needed to onboard Custom Locations on EKS:
-  
-  ```shell
-  # Note that the APPLICATION ID: bc313c14-388c-4e7d-a58e-70017303ee3b is constant across all tenants
-  az ad sp show --id 'bc313c14-388c-4e7d-a58e-70017303ee3b' --query id -o tsv
-  ```
-- Create a resource group
-
-   ```shell
-   az group create --name "Arc-Data-Demo" --location "eastus"
-   ```
-### Create a new AWS IAM Role & Key
-
-Create AWS User IAM Key. An access key grants programmatic access to your resources which we will be using later in this scenario.
-
-- Navigate to the [IAM Access page](https://console.aws.amazon.com/iam/home#/home).
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./01.png)
-
-- Select the **Users** from the side menu.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./02.png)
-
-- Select the **User** you want to create the access key for.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./03.png)
-
-- Select **Security credentials** of the **User** selected.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./04.png)
-
-- Under **Access Keys** select **Create Access Keys**.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./05.png)
-
-- In the popup window it will show you the ***Access key ID*** and ***Secret access key***. Save both of these values to configure the **Terraform plan** variables later.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./06.png)
-
-- In order to open a RDP session to the Windows Client EC2 instance, an EC2 Key Pair is required. From the *Services* menu, click on *"EC2"*, enter the *Key Pairs* settings from the left sidebar (under the *Network & Security* section) and click on *"Create key pair"* (top-right corner) to create a new key pair.
-
-  ![Screenshot showing creating an EC2 Key Pair](./07.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./08.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./09.png)
-
-- Provide a meaningful name, for example *terraform*, and click on *"Create key pair"* which will then automatically download the created *pem* file.
-
-  ![Screenshot showing creating an EC2 Key Pair](./10.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./11.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./12.png)
-
-- Copy the downloaded *pem* file to where the terraform binaries are located (in your cloned repository directory).
-
-  ![Screenshot showing creating an EC2 Key Pair](./13.png)
-
-  > **NOTE: EC2 Key Pairs are regional.**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the Terraform runtime environment variables in the _terraform.tfvars_ file (1-time edit). The variables are being used throughout the deployment.
-
-- [Screenshot showing creating the main Terraform plan](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/main.tf) will initiate the deployment of the other modules:
-
-  - [_clientVM_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/clientVM/main.tf) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_cluster_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/cluster/main.tf) - Deploys the EKS cluster where all the Azure Arc data services will be deployed.
-  - [workers](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/workers/main.tf) - Deploys the EKS cluster's worker nodes.
-
-- User remotes into client Windows VM, which automatically kicks off the DataServicesLogonScript PowerShell script that deploy and configure Azure Arc-enabled data services on the EKS cluster including the data controller and SQL Managed Instance.
-
-- In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, the Terraform plan will deploy an EKS cluster, the Azure Arc Data Controller and the SQL Managed Instance on that cluster and an EC2 Windows Server 2022 Client instance.
-
-- Before running the Terraform plan, create a terraform.tfvars file in the root of the terraform folder and supply some values for your environment.
-
-   ```HCL
-    AWS_ACCESS_KEY_ID      = "ZFTIFC443FTFDEZ5TKNR"
-    AWS_SECRET_ACCESS_KEY  = "fakeSecretValue1dfd343sd5712adfddjh"
-    AWS_DEFAULT_REGION     = "us-west-1"
-    azureLocation          = "eastus"
-    spnClientId            = "1414133c-9786-53a4-b231-f87c143ebdb1"
-    spnClientSecret        = "fakeSecretValue123458125712ahjeacjh"
-    spnTenantId            = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-    subscriptionId         = "33987583-A984-5C87-T4e3-POf7a397ec17"
-    resourceGroup          = "Arc-Data-Demo"
-    workspaceName          = "la-arc-001"
-    deploySQLMI            = true
-    SQLMIHA                = false
-    deployPostgreSQL       = false
-    customLocationObjectId = "649cb28f-bc13-492a-9470-c8bf01fa8eeb"
-  ```
-
-- Variable reference:
-
-  - **_`AWS_ACCESS_KEY_ID`_** - Your AWS access key.
-  - **_`AWS_SECRET_ACCESS_KEY`_** - Your AWS secret access key.
-  - **_`AWS_DEFAULT_REGION`_** - AWS location code (e.g. 'us-west-1', 'us-east-2', etc.).
-  - **_`azureLocation`_** - Azure location code (e.g. 'eastus', 'westus2', etc.).
-  - **_`spnClientId`_** - Your Azure service principal id.
-  - **_`spnClientSecret`_** - Your Azure service principal secret.
-  - **_`spnTenantId`_** - Your Azure tenant id.
-  - **_`subscriptionId`_** - Your Azure subscription Id.
-  - **_`resourceGroup`_** - Resource group which will contain all of the Azure Arc data services resources.
-  - **_`workspaceName`_** - Unique name for the ArcBox Log Analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - **_`customLocationObjectId`_** - The Azure AD application used by Azure Arc service retrieved in the prerequisites section.
-
-> **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-> **Note:** In case you decided to deploy SQL Managed Instance in an highly-available fashion, refer to the ["Perform database failover with SQL Managed Instance Availability Groups"](../../day2/aks/aks_mssql_ha/_index.md) Jumpstart scenario as well as the ["High Availability with Azure Arc-enabled SQL Managed Instance"](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-high-availability) product documentation.
-
-- Now you will deploy the Terraform file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform) and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-
-> **NOTE: The deployment time for this scenario can take ~20-35min**
-
-- Example output from `terraform init`:
-
-  ![Screenshot showing creating the terraform init command output](./14.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![Screenshot showing creating the terraform plan command output](./15.png)
-
-- Once completed, the plan will output a decrypted password for your Windows Client instance that you will use to RDP into it. Before connecting to the Client instance, you can review the EKS cluster and the EC2 instances created. Notice how 4 instances were created; 3 EKS nodes and the Client instance.
-
-  ![Screenshot showing creating the terraform apply command output](./16.png)
-
-  ![Screenshot showing creating the new EKS cluster](./17.png)
-
-  ![Screenshot showing creating the new EKS cluster](./18.png)
-
-  ![Screenshot showing creating the new EC2 instances](./19.png)
-
-  ![Screenshot showing creating the new EC2 instances](./20.png)
-
-  ![Screenshot showing creating the new EC2 instances](./21.png)
-
-## Windows Login & Post Deployment
-
-- Now that the first phase of the automation is completed, it is time to RDP to the client VM. Select the Windows instance, click *"Connect"* and download the Remote Desktop file.
-
-  ![Screenshot showing starting an RDP session to the Client instance](./22.png)
-
-  ![Screenshot showing starting an RDP session to the Client instance](./23.png)
-
-- Using the decrypted password generated from the plan output, RDP the Windows instance. In case you need to get the password later, use the ```terraform output``` command to re-present the plan output.
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the PowerShell logon script run](./26.png)
-
-    ![Screenshot showing the PowerShell logon script run](./27.png)
-
-    ![Screenshot showing the PowerShell logon script run](./28.png)
-
-    ![Screenshot showing the PowerShell logon script run](./29.png)
-
-    ![Screenshot showing the PowerShell logon script run](./30.png)
-
-    ![Screenshot showing the PowerShell logon script run](./31.png)
-
-    ![Screenshot showing the PowerShell logon script run](./32.png)
-
-    ![Screenshot showing the PowerShell logon script run](./33.png)
-
-    ![Screenshot showing the PowerShell logon script run](./34.png)
-
-    ![Screenshot showing the PowerShell logon script run](./35.png)
-
-    ![Screenshot showing the post-run desktop](./36.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **5 various Azure resources deployed**.
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  - _Azure Arc-enabled SQL Managed Instance_ - The SQL Managed Instance that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./37.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./38.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./39.png)
-
-- Additionally, the SQL Managed Instance connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./40.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./41.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./42.png)
-
-## High Availability with SQL Always-On availability groups
-
-Azure Arc-enabled SQL Managed Instance is deployed on Kubernetes as a containerized application and uses kubernetes constructs such as stateful sets and persistent storage to provide built-in health monitoring, failure detection, and failover mechanisms to maintain service health. For increased reliability, you can also configure Azure Arc-enabled SQL Managed Instance to deploy with extra replicas in a high availability configuration.
-
-For showcasing and testing SQL Managed Instance with [Always On availability groups](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-high-availability#deploy-with-always-on-availability-groups), a dedicated [Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/) is available to help you simulate failures and get hands-on experience with this deployment model.
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance stress simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Screenshot showing opened SqlQueryStress](./43.png)
-
-  ![Screenshot showing SQLMI Endpoints text file](./44.png)
-
-> **NOTE: Secondary SQL Managed Instance endpoint will be available only when using the [HA deployment model ("Business Critical")](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/).**
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SqlQueryStress connected](./45.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SqlQueryStress settings](./46.png)
-
-  ![Screenshot showing SqlQueryStress running](./47.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./48.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _`kubectl get svc -n arc`_ command to view the _metricsui_ external service IP address.
-
-  ![Screenshot showing metricsui Kubernetes service](./49.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Screenshot showing Grafana username and password](./50.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana dashboards](./51.png)
-
-  ![Screenshot showing Grafana "SQL Managed Instance Metrics" dashboard](./52.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _`SqlQueryStress`_ (in case it was already finished).
-
-  ![Screenshot showing "Last 5 minutes" time range](./53.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing increased load activity](./54.png)
-
-  ![Screenshot showing increased load activity](./55.png)
-
-## Delete the deployment
-
-- If you want to delete the entire Azure environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./56.png)
-
-- If you want to delete the entire environment, use the _`terraform destroy`_ to delete all of the AWS resources.
-
-  ```shell
-  terraform destroy --auto-approve
-  ```
-
-  ![Screenshot showing the deletion of all AWS resources](./57.png)
-
-  > **NOTE: Because the following resources were created by EKS that creates internal AWS dependencies that Terraform has no knowledge of from our plan, we need to delete the resources from AWS console as `terraform destroy` is cleaning up - this allows us to avoid dependency conflicts and ongoing billing from orphaned resources such as EKS Volumes.**
-
-- While the `destroy` command is running, delete any new Load Balancers created as EKS Services (`EC2 > Load Balancing > Load Balancers`) that are deployed in AWS from the Console:
-
-  ![Screenshot showing the Deletion of Load Balancers](./58.png)
-
-- While the `destroy` command is running, delete any new Elastic Block Stores, created as EKS Persistent Volumes (`EC2 > Elastic Block Store > Volumes`) that are deployed in AWS from the Console:
-
-  ![Screenshot showing the Deletion of Elastic Block Stores](./59.png)
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_postgres_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_postgres_terraform/_index.md
deleted file mode 100644
index 7c88147b76..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/eks/eks_postgres_terraform/_index.md
+++ /dev/null
@@ -1,329 +0,0 @@
----
-type: docs
-title: "PostgreSQL Terraform Plan"
-linkTitle: "PostgreSQL Terraform Plan"
-weight: 3
-description: >
----
-
-## Deploy Azure PostgreSQL in directly connected mode on EKS using Terraform
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [PostgreSQL](https://docs.microsoft.com/azure/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale) deployed on [Elastic Kubernetes Service (EKS)](https://aws.amazon.com/eks/) cluster using [Terraform](https://www.terraform.io/)
-
-By the end of this scenario, you will have an EKS cluster deployed with an Azure Arc Data Controller, PostgreSQL instance, and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) and [Configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration) AWS CLI.
-
-- [Create a free Amazon Web Services account](https://aws.amazon.com/free/) if you don't already have one.
-
-- [Install Terraform >=1.0](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  - "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-  - "Monitoring Metrics Publisher" - Required for being Azure Arc-enabled data services billing, monitoring metrics, and logs management
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Monitoring Metrics Publisher" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Follow the steps [here](https://docs.microsoft.com/azure/azure-arc/kubernetes/custom-locations#enable-custom-locations-on-cluster) or run the command below to retrieve your AAD Tenant Specific ObjectID for the "Custom Locations RP" Enterprise Application needed to onboard Custom Locations on EKS:
-  
-  ```shell
-  # Note that the APPLICATION ID: bc313c14-388c-4e7d-a58e-70017303ee3b is constant across all tenants
-  az ad sp show --id 'bc313c14-388c-4e7d-a58e-70017303ee3b' --query id -o tsv
-  ```
-- Create a resource group
-
-   ```shell
-   az group create --name "Arc-Data-Demo" --location "eastus"
-   ```
-### Create a new AWS IAM Role & Key
-
-Create AWS User IAM Key. An access key grants programmatic access to your resources which we will be using later in this scenario.
-
-- Navigate to the [IAM Access page](https://console.aws.amazon.com/iam/home#/home).
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./01.png)
-
-- Select the **Users** from the side menu.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./02.png)
-
-- Select the **User** you want to create the access key for.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./03.png)
-
-- Select **Security credentials** of the **User** selected.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./04.png)
-
-- Under **Access Keys** select **Create Access Keys**.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./05.png)
-
-- In the popup window it will show you the ***Access key ID*** and ***Secret access key***. Save both of these values to configure the **Terraform plan** variables later.
-
-    ![Screenshot showing creating an AWS IAM Role & Key](./06.png)
-
-- In order to open a RDP session to the Windows Client EC2 instance, an EC2 Key Pair is required. From the *Services* menu, click on *"EC2"*, enter the *Key Pairs* settings from the left sidebar (under the *Network & Security* section) and click on *"Create key pair"* (top-right corner) to create a new key pair.
-
-  ![Screenshot showing creating an EC2 Key Pair](./07.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./08.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./09.png)
-
-- Provide a meaningful name, for example *terraform*, and click on *"Create key pair"* which will then automatically download the created *pem* file.
-
-  ![Screenshot showing creating an EC2 Key Pair](./10.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./11.png)
-
-  ![Screenshot showing creating an EC2 Key Pair](./12.png)
-
-- Copy the downloaded *pem* file to where the terraform binaries are located (in your cloned repository directory).
-
-  ![Screenshot showing creating an EC2 Key Pair](./13.png)
-
-  > **NOTE: EC2 Key Pairs are regional.**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the Terraform runtime environment variables in the _terraform.tfvars_ file (1-time edit). The variables are being used throughout the deployment.
-
-- [Screenshot showing creating the main Terraform plan](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/main.tf) will initiate the deployment of the other modules:
-
-  - [_clientVM_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/clientVM/main.tf) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_cluster_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/cluster/main.tf) - Deploys the EKS cluster where all the Azure Arc data services will be deployed.
-  - [workers](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/modules/workers/main.tf) - Deploys the EKS cluster's worker nodes.
-
-- User remotes into client Windows VM, which automatically kicks off the DataServicesLogonScript PowerShell script that deploy and configure Azure Arc-enabled data services on the EKS cluster including the data controller and PostgreSQL.
-
-- In addition to deploying the data controller and PostgreSQL, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, the Terraform plan will deploy an EKS cluster, the Azure Arc Data Controller and the PostgreSQL Instance on that cluster and an EC2 Windows Server 2022 Client instance.
-
-- Before running the Terraform plan, create a terraform.tfvars file in the root of the terraform folder and supply some values for your environment.
-
-   ```HCL
-    AWS_ACCESS_KEY_ID      = "ZFTIFC443FTFDEZ5TKNR"
-    AWS_SECRET_ACCESS_KEY  = "fakeSecretValue1dfd343sd5712adfddjh"
-    AWS_DEFAULT_REGION     = "us-west-1"
-    azureLocation          = "eastus"
-    spnClientId            = "1414133c-9786-53a4-b231-f87c143ebdb1"
-    spnClientSecret        = "fakeSecretValue123458125712ahjeacjh"
-    spnTenantId            = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-    subscriptionId         = "33987583-A984-5C87-T4e3-POf7a397ec17"
-    resourceGroup          = "Arc-Data-Demo"
-    workspaceName          = "la-arc-001"
-    deploySQLMI            = false
-    SQLMIHA                = false
-    deployPostgreSQL       = true
-    customLocationObjectId = "649cb28f-bc13-492a-9470-c8bf01fa8eeb"
-  ```
-
-- Variable reference:
-
-  - **_`AWS_ACCESS_KEY_ID`_** - Your AWS access key.
-  - **_`AWS_SECRET_ACCESS_KEY`_** - Your AWS secret access key.
-  - **_`AWS_DEFAULT_REGION`_** - AWS location code (e.g. 'us-west-1', 'us-east-2', etc.).
-  - **_`azureLocation`_** - Azure location code (e.g. 'eastus', 'westus2', etc.).
-  - **_`spnClientId`_** - Your Azure service principal id.
-  - **_`spnClientSecret`_** - Your Azure service principal secret.
-  - **_`spnTenantId`_** - Your Azure tenant id.
-  - **_`subscriptionId`_** - Your Azure subscription Id.
-  - **_`resourceGroup`_** - Resource group which will contain all of the Azure Arc data services resources.
-  - **_`workspaceName`_** - Unique name for the ArcBox Log Analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - **_`customLocationObjectId`_** - The Azure AD application used by Azure Arc service retrieved in the prerequisites section.
-
-> **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-- Now you will deploy the Terraform file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform) and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-
-> **NOTE: The deployment time for this scenario can take ~20-35min**
-
-- Example output from `terraform init`:
-
-  ![Screenshot showing creating the terraform init command output](./14.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![Screenshot showing creating the terraform plan command output](./15.png)
-
-- Once completed, the plan will output a decrypted password for your Windows Client instance that you will use to RDP into it. Before connecting to the Client instance, you can review the EKS cluster and the EC2 instances created. Notice how 4 instances were created; 3 EKS nodes and the Client instance.
-
-  ![Screenshot showing creating the terraform apply command output](./16.png)
-
-  ![Screenshot showing creating the new EKS cluster](./17.png)
-
-  ![Screenshot showing creating the new EKS cluster](./18.png)
-
-  ![Screenshot showing creating the new EC2 instances](./19.png)
-
-  ![Screenshot showing creating the new EC2 instances](./20.png)
-
-  ![Screenshot showing creating the new EC2 instances](./21.png)
-
-## Windows Login & Post Deployment
-
-- Now that the first phase of the automation is completed, it is time to RDP to the client VM. Select the Windows instance, click *"Connect"* and download the Remote Desktop file.
-
-  ![Screenshot showing starting an RDP session to the Client instance](./22.png)
-
-  ![Screenshot showing starting an RDP session to the Client instance](./23.png)
-
-- Using the decrypted password generated from the plan output, RDP the Windows instance. In case you need to get the password later, use the ```terraform output``` command to re-present the plan output.
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the PowerShell logon script run](./26.png)
-
-    ![Screenshot showing the PowerShell logon script run](./27.png)
-
-    ![Screenshot showing the PowerShell logon script run](./28.png)
-
-    ![Screenshot showing the PowerShell logon script run](./29.png)
-
-    ![Screenshot showing the PowerShell logon script run](./30.png)
-
-    ![Screenshot showing the PowerShell logon script run](./31.png)
-
-    ![Screenshot showing the PowerShell logon script run](./32.png)
-
-    ![Screenshot showing the PowerShell logon script run](./33.png)
-
-    ![Screenshot showing the PowerShell logon script run](./34.png)
-
-    ![Screenshot showing the post-run desktop](./35.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and PostgreSQL Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **5 various Azure resources deployed**.
-
-  - _Azure Arc-enabled Kubernetes cluster_ - Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - _Custom location_ - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - _Azure Arc Data Controller_ - The data controller that is now deployed on the Kubernetes cluster.
-
-  - _Azure Arc-enabled PostgreSQL_ - The PostgreSQL instance that is now deployed on the Kubernetes cluster.
-
-    ![Screenshot showing additional Azure resources in the resource group](./36.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./37.png)
-
-  ![Screenshot showing Azure Data Studio extensions](./38.png)
-
-- Additionally, the PostgreSQL connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./39.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./40.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./41.png)
-
-## Delete the deployment
-
-- If you want to delete the entire Azure environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./42.png)
-
-- If you want to delete the entire environment, use the _`terraform destroy`_ to delete all of the AWS resources.
-
-  ```shell
-  terraform destroy --auto-approve
-  ```
-
-  ![Screenshot showing the deletion of all AWS resources](./43.png)
-
-  > **NOTE: Because the following resources were created by EKS that creates internal AWS dependencies that Terraform has no knowledge of from our plan, we need to delete the resources from AWS console as `terraform destroy` is cleaning up - this allows us to avoid dependency conflicts and ongoing billing from orphaned resources such as EKS Volumes.**
-
-- While the `destroy` command is running, delete any new Load Balancers created as EKS Services (`EC2 > Load Balancing > Load Balancers`) that are deployed in AWS from the Console:
-
-  ![Screenshot showing the Deletion of Load Balancers](./44.png)
-
-- While the `destroy` command is running, delete any new Elastic Block Stores, created as EKS Persistent Volumes (`EC2 > Elastic Block Store > Volumes`) that are deployed in AWS from the Console:
-
-  ![Screenshot showing the Deletion of Elastic Block Stores](./45.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/gke/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/gke/_index.md
deleted file mode 100644
index 6e83462da6..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/gke/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Google Kubernetes Engine"
-linkTitle: "Google Kubernetes Engine"
-weight: 5
-description: >-
-  If you are working in a multi-cloud environment, the scenario in this section will guide on creating a Google Kubernetes Engine (GKE) with Azure Arc-enabled data services integration in an automated fashion using Terraform.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_dc_vanilla_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_dc_vanilla_terraform/_index.md
deleted file mode 100644
index 046885ca51..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_dc_vanilla_terraform/_index.md
+++ /dev/null
@@ -1,375 +0,0 @@
----
-type: docs
-title: "Data Controller Terraform plan"
-linkTitle: "Data Controller Terraform plan"
-weight: 1
-description: >
----
-
-## Deploy an Azure Arc Data Controller (Vanilla) on GKE using Terraform
-
-The following scenario will guide you on how to deploy a "Ready to Go" environment so you can deploy Azure Arc Data Services on a [Google Kubernetes Engine (GKE)](https://cloud.google.com/kubernetes-engine) cluster using [Terraform](https://www.terraform.io/).
-
-By the end of this scenario, you will have a GKE cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) GKE compute instance VM installed and pre-configured with all the required tools needed to work with Azure Arc Data Services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Deployment Process Overview
-
-- Create a Google Cloud Platform (GCP) project, IAM Role & Service Account
-- Download credentials file
-- Clone the Azure Arc Jumpstart repository
-- Create the .tfvars file with your variables values
-- Export the *TF_VAR_CL_OID* variable
-- *terraform init*
-- *terraform apply*
-- User remotes into sidecar Windows VM, which automatically kicks off the [DataServicesLogonScript](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configures Azure Arc-enabled data services on the GKE cluster.
-- *kubectl delete namespace arc*
-- *terraform destroy*
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 or higher](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Google Cloud account with billing enabled - [Create a free trial account](https://cloud.google.com/free). To create Windows Server virtual machines, you must upgraded your account to enable billing. Click Billing from the menu and then select Upgrade in the lower right.
-
-    ![Screenshot showing how to enable billing on GCP account](./01.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./02.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./03.png)
-
-    ***Disclaimer*** - **To prevent unexpected charges, please follow the "Delete the deployment" section at the end of this README**
-
-- [Install Terraform 1.0 or higher](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, and logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    SP_OID=$(az ad sp show --id $SP_CLIENT_ID --query id -o tsv)
-
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Create a new GCP Project, IAM Role & Service Account. In order to deploy resources in GCP, we will create a new GCP Project as well as a service account to allow Terraform to authenticate against GCP APIs and run the plan to deploy resources.
-
-  - Browse to <https://console.cloud.google.com/> and login with your Google Cloud account. Once logged in, click on Select a project
-
-    ![GCP new project](./04.png)
-
-  - [Create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo".
-
-    ![GCP new project](./05.png)
-
-    ![GCP new project](./06.png)
-
-  - After creating it, be sure to copy down the project id as it is usually different then the project name.
-
-    ![GCP new project](./07.png)
-
-  - Search Compute Engine API for the project
-
-    ![Enable Compute Engine API](./08.png)
-
-  - Enable Compute Engine API for the project
-
-    ![Enable Compute Engine API](./09.png)
-
-  - Create credentials for your project
-
-    ![Add credentials](./10.png)
-  
-  - Create a project Owner service account credentials and download the private key JSON file and copy the file to the directory where Terraform files are located. Change the JSON file name (for example *account.json*). The Terraform plan will be using the credentials stored in this file to authenticate against your GCP project.
-
-    ![Add credentials](./11.png)
-
-    ![Add credentials](./12.png)
-
-    ![Add credentials](./13.png)
-
-    ![Add credentials](./14.png)
-
-    ![Create private key](./15.png)
-
-    ![Create private key](./16.png)
-
-    ![Create private key](./17.png)
-
-    ![Create private key](./18.png)
-
-    ![account.json](./19.png)
-
-  - Search Kubernetes Engine API for the project
-
-    ![Enable the Kubernetes Engine API](./20.png)
-
-  - Enable Kubernetes Engine API for the project
-
-    ![Enable the Kubernetes Engine API](./21.png)
-
-## Automation Flow
-
-Read the below explanation to get familiar with the automation and deployment flow.
-
-- User creates the terraform variables file (_terraform.tfvars_) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) OID variable. The variable values are used throughout the deployment.
-
-- User deploys the Terraform plan which will deploy the GKE cluster and the GCP compute instance VM as well as an Azure resource group. The Azure resource group is required to host the Azure Arc services such as the Azure Arc-enabled Kubernetes cluster, the custom location, the Azure Arc data controller, and any database services you deploy on top of the data controller.
-
-  > **NOTE: Depending on the GCP region, make sure you do not have any [SSD quota limit in the region](https://cloud.google.com/compute/quotas), otherwise, the Azure Arc Data Controller kubernetes resources will fail to deploy.**
-
-- As part of the Windows Server 2022 VM deployment, there are 4 script executions:
-
-  1. *azure_arc.ps1* script will be created automatically as part of the Terraform plan runtime and is responsible on injecting the terraform variables values on to the Windows instance which will then be used in both the *ClientTools* and the *LogonScript* scripts.
-
-  2. *password_reset.ps1* script will be created automatically as part of the Terraform plan runtime and is responsible on creating the Windows username & password.
-
-  3. *Bootstrap.ps1* script will run at the Terraform plan runtime Runtime and will:
-      - Create the *Bootstrap.log* file  
-      - Install the required tools – az cli, PowerShell module, kubernetes-cli, Visual C++ Redistributable, HELM, VS Code, etc. (Chocolaty packages)
-      - Download Azure Data Studio & Azure Data CLI
-      - Disable Windows Server Manager, remove Internet Explorer, disable Windows Firewall
-      - Download the DataServicesLogonScript.ps1 PowerShell script
-      - Create the Windows schedule task to run the DataServicesLogonScript at first login
-
-  4. *DataServicesLogonScript.ps1* script will run on user first logon to Windows and will:
-      - Create the *DataServicesLogonScript.log* file
-      - Install the Azure Data Studio Azure Data CLI, Azure Arc & PostgreSQL extensions
-      - Create the Azure Data Studio desktop shortcut
-      - Use Azure CLI to connect the GKE cluster to Azure as an Azure Arc-enabled Kubernetes cluster
-      - Create a custom location for use with the Azure Arc-enabled Kubernetes cluster
-      - Deploy an ARM template that will deploy the Azure Arc data controller on the GKE cluster
-      - Open another Powershell session which will execute a command to watch the deployed Azure Arc Data Controller Kubernetes pods
-      - Unregister the logon script Windows schedule task so it will not run after first login
-
-## Terraform variables
-
-- Before running the Terraform plan, create the _terraform.tfvars_ file in the root of the terraform folder and supply some values for your environment.
-
-   ```HCL
-    gcp_project_id           = "azure-arc-demo-277620"
-    gcp_credentials_filename = "account.json"
-    gcp_region               = "us-west1"
-    gcp_zone                 = "us-west1-a"
-    gke_cluster_name         = "arc-data-gke"
-    admin_username           = "arcdemo"
-    admin_password           = "ArcDemo1234567!!"
-    windows_username         = "arcdemo"
-    windows_password         = "Passw0rd123!!"
-    SPN_CLIENT_ID            = "33333333-XXXX-YYYY-XXXX-YTYTYTYT"
-    SPN_CLIENT_SECRET        = "33333333-XXXX-YTYT-9c21-7777777777"
-    SPN_TENANT_ID            = "33333333-XXXX-41af-1111-7777777777"
-    SPN_AUTHORITY            = "https://login.microsoftonline.com"
-    AZDATA_USERNAME          = "arcdemo"
-    AZDATA_PASSWORD          = "Arcdemo123!!"
-    ARC_DC_NAME              = "arcdatactrl"
-    ARC_DC_SUBSCRIPTION      = "32323232-XXXXX-YYYYY-9e8f-88888888888"
-    ARC_DC_RG                = "Arc-Data-GKE-Demo"
-    ARC_DC_REGION            = "eastus"
-    deploy_SQLMI             = false
-    SQLMIHA                  = false
-    deploy_PostgreSQL        = false
-    templateBaseUrl          = "https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/gke/terraform/"
-    MY_IP                    = "192.168.10.10"
-  ```
-
-- Variable reference:
-
-  - **_`gcp_project_id`_** - Your GCP Project ID (Created in the prerequisites section)
-  - **_`gcp_credentials_filename`_** - Your GCP Credentials JSON filename (Created in the prerequisites section)
-  - **_`gcp_region`_** - GCP region where resource will be created
-  - **_`gcp_zone`_** - GCP zone where resource will be created
-  - **_`gke_cluster_name`_** - GKE cluster name
-  - **_`admin_username`_** - GKE cluster administrator username
-  - **_`admin_password`_** - GKE cluster administrator password
-  - **_`windows_username`_** - Windows Server Client compute instance VM administrator username
-  - **_`windows_password`_** - Windows Server Client compute instance VM administrator password (The password must be at least 8 characters long and contain characters from three of the following four sets: uppercase letters, lowercase letters, numbers, and symbols as well as **not containing** the user's account name or parts of the user's full name that exceed two consecutive characters)
-  - **_`SPN_CLIENT_ID`_** - Your Azure service principal name
-  - **_`SPN_CLIENT_SECRET`_** - Your Azure service principal password
-  - **_`SPN_TENANT_ID`_** - Your Azure tenant ID
-  - **_`SPN_AUTHORITY`_** - _https://login.microsoftonline.com_ **Do not change**
-  - **_`AZDATA_USERNAME`_** - Azure Arc Data Controller admin username
-  - **_`AZDATA_PASSWORD`_** - Azure Arc Data Controller admin password (The password must be at least 8 characters long and contain characters from the following four sets: uppercase letters, lowercase letters, numbers, and symbols)
-  - **_`ARC_DC_NAME`_** - Azure Arc Data Controller name (The name must consist of lowercase alphanumeric characters or '-', and must start and end with a alphanumeric character. This name will be used for k8s namespace as well)
-  - **_`ARC_DC_SUBSCRIPTION`_** - Azure Arc Data Controller Azure subscription ID
-  - **_`ARC_DC_RG`_** - Azure resource group where all future Azure Arc resources will be deployed
-  - **_`ARC_DC_REGION`_** - Azure location where the Azure Arc Data Controller resource will be created in Azure (Currently, supported regions supported are eastus, eastus2, centralus, westus2, westeurope, southeastasia)
-  - **_`deploy_SQLMI`_** - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller only scenario we leave it set to false
-  - **_`SQLMIHA`_** - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to false
-  - **_`deploy_PostgreSQL`_** - Boolean that sets whether or not to deploy PostgreSQL, for this data controller only scenario we leave it set to false
-  - **_`templateBaseUrl`_** - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well - e.g. `https://raw.githubusercontent.com/your--github--account/azure_arc/your--branch/azure_arc_data_jumpstart/gke/terraform/`
-  - **_`MY_IP`_** - Your Client IP
-
-### Azure Custom Location Resource Provider (RP) and the Object ID (OID) environment variable
-
-- You will also need to get the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) OID and export it as an environment variable:
-
-  > **NOTE: You need permissions to list all the service principals.**
-
-  #### Option 1: Bash
-
-  ```bash
-  export TF_VAR_CL_OID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $Env:TF_VAR_CL_OID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-## Deployment
-
-> **NOTE: The GKE cluster will use 3 nodes of SKU "n1-standard-8".**
-
-As mentioned, the Terraform plan and automation scripts will deploy a GKE cluster, the Azure Arc Data Controller on that cluster and a Windows Server 2022 Client GCP compute instance.
-
-- Navigate to the folder that has Terraform binaries.
-
-  ```shell
-  cd azure_arc_data_jumpstart/gke/terraform/
-  ```
-
-- Run the ```terraform init``` command which is used to initialize a working directory containing Terraform configuration files and load the required Terraform providers.
-
-  ![terraform init](./22.png)
-
-- Run the ```terraform plan -out=infra.out``` command to make sure everything is configured properly.
-
-  ![terraform plan](./23.png)
-
-- Run the ```terraform apply "infra.out"``` command and wait for the plan to finish. **Runtime for deploying all the GCP resources for this plan is ~20-30min.**
-
-  ![terraform apply completed](./24.png)
-
-- Once completed, you can review the GKE cluster and the worker nodes resources as well as the GCP compute instance VM created.
-
-  ![GKE cluster](./25.png)
-
-  ![GKE cluster](./26.png)
-
-  ![GCP VM instances](./27.png)
-
-  ![GCP VM instances](./28.png)
-
-- In the Azure Portal, a new empty Azure resource group was created which will be used for Azure Arc Data Controller and the other data services you will be deploying in the future.
-
-  ![New empty Azure resource group](./29.png)
-
-## Windows Login & Post Deployment
-
-Now that we have both the GKE cluster and the Windows Server Client instance created, it is time to login to the Client VM.
-
-- Select the Windows instance, click on the RDP dropdown and download the RDP file. Using your *windows_username* and *windows_password* credentials, log in to the VM.
-
-  ![GCP Client VM RDP](./30.png)
-
-  ![GCP Client VM RDP](./31.png)
-
-- At first login, as mentioned in the "Automation Flow" section, the DataServicesLogonScript.ps1 will get executed. This script was created as part of the automated deployment process.
-
-    Let the script run its course and **do not close** the PowerShell session, this will be done for you once completed. You will notice that the Azure Arc Data Controller gets deployed on the GKE cluster. **The logon script run time is approximately 1h long**.
-
-    Once the script finishes, the logon script PowerShell session will be close and the Azure Arc Data Controller will be deployed on the GKE cluster and be ready to use.
-
-  ![PowerShell login script run](./32.png)
-
-  ![PowerShell login script run](./33.png)
-
-  ![PowerShell login script run](./34.png)
-
-  ![PowerShell login script run](./35.png)
-
-  ![PowerShell login script run](./36.png)
-
-  ![PowerShell login script run](./37.png)
-
-  ![PowerShell login script run](./38.png)
-
-  ![PowerShell login script run](./39.png)
-
-  ![PowerShell login script run](./40.png)
-
-  ![PowerShell login script run](./41.png)
-
-  ![PowerShell login script run](./42.png)
-
-  ![PowerShell login script run](./43.png)
-
-  ![PowerShell login script run](./44.png)
-
-  ![PowerShell login script run](./45.png)
-
-  ![PowerShell login script run](./46.png)
-
-- When the scripts are complete, all PowerShell windows will close.
-
-  ![PowerShell login script run](./47.png)
-
-- From Azure Portal, navigate to the resource group and confirm that the Azure Arc-enabled Kubernetes cluster, the Azure Arc data controller resource and the Custom Location resource are present.
-
-  ![Azure Portal showing data controller resource](./48.png)
-
-- Another tool automatically deployed is Azure Data Studio along with the *Azure Data CLI*, the *Azure Arc* and the *PostgreSQL* extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see both extensions.
-
-  ![Azure Data Studio shortcut](./49.png)
-
-  ![Azure Data Studio extension](./50.png)
-
-## Delete the deployment
-
-To completely delete the environment, follow the below steps.
-
-- Delete the data services resources by using kubectl. Run the below command from a PowerShell window on the client VM.
-
-  ```shell
-  kubectl delete namespace arc
-  ```
-
-  ![Delete database resources](./51.png)
-
-- Use terraform to delete all of the GCP resources as well as the Azure resource group. **The *terraform destroy* run time is approximately ~5-6min long**.
-
-  ```shell
-  terraform destroy --auto-approve
-  ```
-
-  ![terraform destroy](./52.png)
-
-<!-- ## Known Issues -->
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_mssql_mi_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_mssql_mi_terraform/_index.md
deleted file mode 100644
index c50d7c29b7..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_mssql_mi_terraform/_index.md
+++ /dev/null
@@ -1,443 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance Terraform Plan"
-linkTitle: "SQL Managed Instance Terraform Plan"
-weight: 2
-description: >
----
-
-## Deploy an Azure Arc-enabled SQL Managed Instance on GKE using a Terraform plan
-
-The following scenario will guide you on how to deploy a "Ready to Go" environment so you can deploy Azure Arc-enabled data services on a [Google Kubernetes Engine (GKE)](https://cloud.google.com/kubernetes-engine) cluster using [Terraform](https://www.terraform.io/).
-
-By the end of this scenario, you will have a GKE cluster deployed with an Azure Arc Data Controller ([in "Directly Connected" mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity)), Azure SQL Managed Instance with a sample database and a Microsoft Windows Server 2022 (Datacenter) GKE compute instance VM installed and pre-configured with all the required tools needed to work with Azure Arc data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Deployment Process Overview
-
-- Create a Google Cloud Platform (GCP) project, IAM Role & Service Account
-- Download GCP credentials file
-- Clone the Azure Arc Jumpstart repository
-- Create the .tfvars file with your variables values
-- Export the *TF_VAR_CL_OID* variable
-- *terraform init*
-- *terraform apply*
-- User remotes into client Windows VM, which automatically kicks off the [DataServicesLogonScript](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configures Azure Arc-enabled data services on the GKE cluster.
-- Open Azure Data Studio and connect to SQL MI instance and sample database
-- *kubectl delete namespace arc*
-- *terraform destroy*
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Google Cloud account with billing enabled - [Create a free trial account](https://cloud.google.com/free). To create Windows Server virtual machines, you must upgraded your account to enable billing. Click Billing from the menu and then select Upgrade in the lower right.
-
-    ![Screenshot showing how to enable billing on GCP account](./01.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./02.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./03.png)
-
-    ***Disclaimer*** - **To prevent unexpected charges, please follow the "Delete the deployment" section at the end of this README**
-
-- [Install Terraform 1.0 or higher](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, and logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    SP_OID=$(az ad sp show --id $SP_CLIENT_ID --query id -o tsv)
-
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Create a new GCP Project, IAM Role & Service Account. In order to deploy resources in GCP, we will create a new GCP Project as well as a service account to allow Terraform to authenticate against GCP APIs and run the plan to deploy resources.
-
-  - Browse to <https://console.cloud.google.com/> and login with your Google Cloud account. Once logged in, click on Select a project
-
-    ![GCP new project](./04.png)
-
-  - [Create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo".
-
-    ![GCP new project](./05.png)
-
-    ![GCP new project](./06.png)
-
-  - After creating it, be sure to copy down the project id as it is usually different then the project name.
-
-    ![GCP new project](./07.png)
-
-  - Search Compute Engine API for the project
-
-    ![Enable Compute Engine API](./08.png)
-
-  - Enable Compute Engine API for the project
-
-    ![Enable Compute Engine API](./09.png)
-
-  - Create credentials for your project
-
-    ![Add credentials](./10.png)
-  
-  - Create a project Owner service account credentials and download the private key JSON file and copy the file to the directory where Terraform files are located. Change the JSON file name (for example *account.json*). The Terraform plan will be using the credentials stored in this file to authenticate against your GCP project.
-
-    ![Add credentials](./11.png)
-
-    ![Add credentials](./12.png)
-
-    ![Add credentials](./13.png)
-
-    ![Add credentials](./14.png)
-
-    ![Create private key](./15.png)
-
-    ![Create private key](./16.png)
-
-    ![Create private key](./17.png)
-
-    ![Create private key](./18.png)
-
-    ![account.json](./19.png)
-
-  - Search Kubernetes Engine API for the project
-
-    ![Enable the Kubernetes Engine API](./20.png)
-
-  - Enable Kubernetes Engine API for the project
-
-    ![Enable the Kubernetes Engine API](./21.png)
-
-## Automation Flow
-
-Read the below explanation to get familiar with the automation and deployment flow.
-
-- User creates the terraform variables file (_terraform.tfvars_) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) OID variable. The variable values are used throughout the deployment.
-
-- User deploys the Terraform plan which will deploy a GKE cluster and compute instance VM as well as an Azure resource group. The Azure resource group is required to host the Azure Arc services such as the Azure Arc-enabled Kubernetes cluster, the custom location, the Azure Arc data controller, and the SQL MI database service.
-
-  > **NOTE: Depending on the GCP region, make sure you do not have any [SSD quota limit in the region](https://cloud.google.com/compute/quotas), otherwise, the Azure Arc Data Controller kubernetes resources will fail to deploy.**
-
-- As part of the Windows Server 2022 VM deployment, there are 4 script executions:
-
-  1. *azure_arc.ps1* script will be created automatically as part of the Terraform plan runtime and is responsible for injecting the terraform variable values as environment variables on the Windows instance which will then be used in both the *ClientTools* and the *LogonScript* scripts.
-
-  2. *password_reset.ps1* script will be created automatically as part of the Terraform plan runtime and is responsible for creating the Windows username and password.
-
-  3. *Bootstrap.ps1* script will run during Terraform plan runtime and will:
-      - Create the *Bootstrap.log* file  
-      - Install the required tools – az cli, PowerShell module, kubernetes-cli, Visual C++ Redistributable (Chocolaty packages)
-      - Download Azure Data Studio & Azure Data CLI
-      - Disable Windows Server Manager, remove Internet Explorer, disable Windows Firewall
-      - Download the DataServicesLogonScript.ps1 PowerShell script
-      - Create the Windows schedule task to run the DataServicesLogonScript at first login
-
-  4. *DataServicesLogonScript.ps1* script will run on first login to Windows and will:
-      - Create the *DataServicesLogonScript.log* file
-      - Install the Azure Data Studio Azure Data CLI, Azure Arc and PostgreSQL extensions
-      - Create the Azure Data Studio desktop shortcut
-      - Use Azure CLI to connect the GKE cluster to Azure as an Azure Arc-enabled Kubernetes cluster
-      - Create a custom location for use with the Azure Arc-enabled Kubernetes cluster
-      - Open another Powershell session which will execute a command to watch the deployed Azure Arc Data Controller Kubernetes pods
-      - Deploy an ARM template that will deploy the Azure Arc data controller on the GKE cluster
-      - Execute a secondary *DeploySQLMI.ps1* script which will configure the SQL MI instance, download and install the sample Adventureworks database, and configure Azure Data Studio to connect to the SQL MI database instance
-      - Unregister the logon script Windows scheduler task so it will not run after first login
-
-## Terraform variables
-
-- Before running the Terraform plan, create the _terraform.tfvars_ file in the root of the terraform folder and supply some values for your environment.
-
-   ```HCL
-    gcp_project_id           = "azure-arc-demo-277620"
-    gcp_credentials_filename = "account.json"
-    gcp_region               = "us-west1"
-    gcp_zone                 = "us-west1-a"
-    gke_cluster_name         = "arc-data-gke"
-    admin_username           = "arcdemo"
-    admin_password           = "ArcDemo1234567!!"
-    windows_username         = "arcdemo"
-    windows_password         = "Passw0rd123!!"
-    SPN_CLIENT_ID            = "33333333-XXXX-YYYY-XXXX-YTYTYTYT"
-    SPN_CLIENT_SECRET        = "33333333-XXXX-YTYT-9c21-7777777777"
-    SPN_TENANT_ID            = "33333333-XXXX-41af-1111-7777777777"
-    SPN_AUTHORITY            = "https://login.microsoftonline.com"
-    AZDATA_USERNAME          = "arcdemo"
-    AZDATA_PASSWORD          = "Arcdemo123!!"
-    ARC_DC_NAME              = "arcdatactrl"
-    ARC_DC_SUBSCRIPTION      = "32323232-XXXXX-YYYYY-9e8f-88888888888"
-    ARC_DC_RG                = "Arc-Data-GKE-Demo"
-    ARC_DC_REGION            = "eastus"
-    deploy_SQLMI             = true
-    SQLMIHA                  = true
-    deploy_PostgreSQL        = false
-    templateBaseUrl          = "https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/gke/terraform/"
-    MY_IP                    = "192.168.10.10"
-  ```
-
-- Variable reference:
-
-  - **_`gcp_project_id`_** - Your GCP Project ID (Created in the prerequisites section)
-  - **_`gcp_credentials_filename`_** - Your GCP Credentials JSON filename (Created in the prerequisites section)
-  - **_`gcp_region`_** - GCP region where resource will be created
-  - **_`gcp_zone`_** - GCP zone where resource will be created
-  - **_`gke_cluster_name`_** - GKE cluster name
-  - **_`admin_username`_** - GKE cluster administrator username
-  - **_`admin_password`_** - GKE cluster administrator password
-  - **_`windows_username`_** - Windows Server Client compute instance VM administrator username
-  - **_`windows_password`_** - Windows Server Client compute instance VM administrator password (The password must be at least 8 characters long and contain characters from three of the following four sets: uppercase letters, lowercase letters, numbers, and symbols as well as **not containing** the user's account name or parts of the user's full name that exceed two consecutive characters)
-  - **_`SPN_CLIENT_ID`_** - Your Azure service principal name
-  - **_`SPN_CLIENT_SECRET`_** - Your Azure service principal password
-  - **_`SPN_TENANT_ID`_** - Your Azure tenant ID
-  - **_`SPN_AUTHORITY`_** - _https://login.microsoftonline.com_ **Do not change**
-  - **_`AZDATA_USERNAME`_** - Azure Arc Data Controller admin username
-  - **_`AZDATA_PASSWORD`_** - Azure Arc Data Controller admin password (The password must be at least 8 characters long and contain characters from the following four sets: uppercase letters, lowercase letters, numbers, and symbols)
-  - **_`ARC_DC_NAME`_** - Azure Arc Data Controller name (The name must consist of lowercase alphanumeric characters or '-', and must start and end with a alphanumeric character. This name will be used for k8s namespace as well)
-  - **_`ARC_DC_SUBSCRIPTION`_** - Azure Arc Data Controller Azure subscription ID
-  - **_`ARC_DC_RG`_** - Azure resource group where all future Azure Arc resources will be deployed
-  - **_`ARC_DC_REGION`_** - Azure location where the Azure Arc Data Controller resource will be created in Azure (Currently, supported regions supported are eastus, eastus2, centralus, westus2, westeurope, southeastasia)
-  - **_`deploy_SQLMI`_** - Boolean that sets whether or not to deploy SQL Managed Instance, for this scenario we leave it set to true
-  - **_`SQLMIHA`_** - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either true or false
-  - **_`deploy_PostgreSQL`_** - Boolean that sets whether or not to deploy PostgreSQL, for this data controller only scenario we leave it set to false
-  - **_`templateBaseUrl`_** - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well - e.g. `https://raw.githubusercontent.com/your--github--account/azure_arc/your--branch/azure_arc_data_jumpstart/gke/terraform/`
-  - **_`MY_IP`_** - Your Client IP
-
-### Azure Custom Location Resource Provider (RP) and the Object ID (OID) environment variable
-
-- You also need to get the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) OID to export it as an environment variable:
-
-  > **NOTE: You need permissions to list all the service principals.**
-
-  #### Option 1: Bash
-
-  ```bash
-  export TF_VAR_CL_OID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $Env:TF_VAR_CL_OID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-## Deployment
-
-> **NOTE: The GKE cluster will use 3 nodes of SKU "n1-standard-8".**
-
-As mentioned, the Terraform plan and automation scripts will deploy a GKE cluster, the Azure Arc Data Controller on that cluster, a SQL Managed Instance with sample database, and a Windows Server 2022 Client GCP compute instance.
-
-- Navigate to the folder that has Terraform binaries.
-
-  ```shell
-  cd azure_arc_data_jumpstart/gke/terraform
-  ```
-
-- Run the ```terraform init``` command which is used to initialize a working directory containing Terraform configuration files and load the required Terraform providers.
-
-  ![terraform init](./22.png)
-
-- Run the ```terraform plan -out=infra.out``` command to make sure everything is configured properly.
-
-  ![terraform plan](./23.png)
-
-- Run the ```terraform apply "infra.out"``` command and wait for the plan to finish. **Runtime for deploying all the GCP resources for this plan is ~20-30min.**
-
-  ![terraform apply completed](./24.png)
-
-- Once completed, you can review the GKE cluster and the worker nodes resources as well as the GCP compute instance VM created.
-
-  ![GKE cluster](./25.png)
-
-  ![GKE cluster](./26.png)
-
-  ![GCP VM instances](./27.png)
-
-  ![GCP VM instances](./28.png)
-
-- In the Azure Portal, a new empty Azure resource group was created which will be used for Azure Arc Data Controller and the other data services you will be deploying in the future.
-
-  ![New empty Azure resource group](./29.png)
-
-## Windows Login & Post Deployment
-
-Now that we have both the GKE cluster and the Windows Server Client instance created, it is time to login to the Client VM.
-
-- Select the Windows instance, click on the RDP dropdown and download the RDP file. Using your *windows_username* and *windows_password* credentials, log in to the VM.
-
-  ![GCP Client VM RDP](./30.png)
-
-  ![GCP Client VM RDP](./31.png)
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-    Let the script run its course and **do not close** the PowerShell session, this will be done for you once completed. You will notice that the Azure Arc Data Controller gets deployed on the GKE cluster. **The logon script run time is approximately 1h long**.
-
-    Once the script finishes its run, the logon script PowerShell session will be closed and the Azure Arc Data Controller will be deployed on the GKE cluster and be ready to use.
-
-  ![PowerShell login script run](./32.png)
-
-  ![PowerShell login script run](./33.png)
-
-  ![PowerShell login script run](./34.png)
-
-  ![PowerShell login script run](./35.png)
-
-  ![PowerShell login script run](./36.png)
-
-  ![PowerShell login script run](./37.png)
-
-  ![PowerShell login script run](./38.png)
-
-  ![PowerShell login script run](./39.png)
-
-  ![PowerShell login script run](./40.png)
-
-  ![PowerShell login script run](./41.png)
-
-  ![PowerShell login script run](./42.png)
-
-  ![PowerShell login script run](./43.png)
-
-  ![PowerShell login script run](./44.png)
-
-  ![PowerShell login script run](./45.png)
-
-  ![PowerShell login script run](./46.png)
-
-- When the scripts are complete, all PowerShell windows will close.
-
-  ![PowerShell login script run](./47.png)
-
-- From Azure Portal, navigate to the resource group and confirm that the Azure Arc-enabled Kubernetes cluster, the Azure Arc data controller resource and the Custom Location resource are present.
-
-  ![Azure Portal showing data controller resource](./48.png)
-
-- Another tool automatically deployed is Azure Data Studio along with the *Azure Data CLI*, the *Azure Arc* and the *PostgreSQL* extensions. Using the Desktop shortcut created for you, open Azure Data Studio and expand the SQL MI connection to see the Adventureworks sample database.
-
-  ![Azure Data Studio shortcut](./49.png)
-
-  ![Azure Data Studio extension](./50.png)
-
-  ![Azure Data studio sample database](./51.png)
-
-  ![Azure Data studio sample database](./52.png)
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance Stress Simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Open SqlQueryStress](./53.png)
-
-  ![SQLMI Endpoints text file](./54.png)
-
-> **NOTE: Secondary SQL Managed Instance endpoint will be available only when using the HA deployment model ("Business Critical").**
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![SqlQueryStress connected](./55.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![SqlQueryStress settings](./56.png)
-
-  ![SqlQueryStress running](./57.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Grafana desktop shortcut](./58.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _```kubectl get svc -n arc```_ command to view the _metricsui_ external service IP address.
-
-  ![metricsui Kubernetes service](./59.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Grafana username and password](./60.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Grafana dashboards](./61.png)
-
-  ![Grafana "SQL Managed Instance Metrics" dashboard](./62.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _SqlQueryStress_ (in case it was already finished).
-
-  ![Last 5 minutes time range](./63.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Increased load activity](./64.png)
-
-  ![Increased load activity](./65.png)
-
-## Delete the deployment
-
-To completely delete the environment, follow the below steps.
-
-- Delete the data services resources by using kubectl. Run the below command from a PowerShell window on the client VM.
-
-  ```shell
-  kubectl delete namespace arc
-  ```
-
-  ![Delete database resources](./66.png)
-
-- Use terraform to delete all of the GCP resources as well as the Azure resource group. **The *terraform destroy* run time is approximately ~5-6min long**.
-
-  ```shell
-  terraform destroy --auto-approve
-  ```
-
-  ![terraform destroy](./67.png)
-  
-<!-- ## Known Issues -->
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_postgres_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_postgres_terraform/_index.md
deleted file mode 100644
index d0d7b37bbe..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/gke/gke_postgres_terraform/_index.md
+++ /dev/null
@@ -1,393 +0,0 @@
----
-type: docs
-title: "PostgreSQL Terraform Plan"
-linkTitle: "PostgreSQL Terraform Plan"
-weight: 3
-description: >
----
-
-## Deploy an Azure Arc-enabled PostgreSQL Deployment on GKE using a Terraform plan
-
-The following scenario will guide you on how to deploy a "Ready to Go" environment so you can deploy Azure Arc-enabled data services on a [Google Kubernetes Engine (GKE)](https://cloud.google.com/kubernetes-engine) cluster using [Terraform](https://www.terraform.io/).
-
-By the end of this scenario, you will have a GKE cluster deployed with an Azure Arc Data Controller ([in "Directly Connected" mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity)), Azure Arc-enabled PostgreSQL server with a sample database and a Microsoft Windows Server 2022 (Datacenter) GKE compute instance VM installed & pre-configured with all the required tools needed to work with Azure Arc data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Deployment Process Overview
-
-- Create a Google Cloud Platform (GCP) project, IAM Role & Service Account
-- Download GCP credentials file
-- Clone the Azure Arc Jumpstart repository
-- Create the .tfvars file with your variables values
-- Export the *TF_VAR_CL_OID* variable
-- *terraform init*
-- *terraform apply*
-- User remotes into client Windows VM, which automatically kicks off the [DataServicesLogonScript](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configures Azure Arc-enabled data services on the GKE cluster.
-- Open Azure Data Studio and connect to Postgres instance and sample database
-- Run cleanup PowerShell script
-- *terraform destroy*
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Google Cloud account with billing enabled - [Create a free trial account](https://cloud.google.com/free). To create Windows Server virtual machines, you must upgraded your account to enable billing. Click Billing from the menu and then select Upgrade in the lower right.
-
-    ![Screenshot showing how to enable billing on GCP account](./01.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./02.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./03.png)
-
-    ***Disclaimer*** - **To prevent unexpected charges, please follow the "Delete the deployment" section at the end of this README**
-
-- [Install Terraform 1.0 or higher](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, and logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    SP_OID=$(az ad sp show --id $SP_CLIENT_ID --query id -o tsv)
-
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Enable subscription for the Microsoft.AzureArcData resource provider for Azure Arc-enabled data services. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.AzureArcData
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.AzureArcData -o table
-  ```
-
-- Create a new GCP Project, IAM Role & Service Account. In order to deploy resources in GCP, we will create a new GCP Project as well as a service account to allow Terraform to authenticate against GCP APIs and run the plan to deploy resources.
-
-  - Browse to <https://console.cloud.google.com/> and login with your Google Cloud account. Once logged in, click on Select a project
-
-    ![GCP new project](./04.png)
-
-  - [Create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo".
-
-    ![GCP new project](./05.png)
-
-    ![GCP new project](./06.png)
-
-  - After creating it, be sure to copy down the project id as it is usually different then the project name.
-
-    ![GCP new project](./07.png)
-
-  - Search Compute Engine API for the project
-
-    ![Enable Compute Engine API](./08.png)
-
-  - Enable Compute Engine API for the project
-
-    ![Enable Compute Engine API](./09.png)
-
-  - Create credentials for your project
-
-    ![Add credentials](./10.png)
-  
-  - Create a project Owner service account credentials and download the private key JSON file and copy the file to the directory where Terraform files are located. Change the JSON file name (for example *account.json*). The Terraform plan will be using the credentials stored in this file to authenticate against your GCP project.
-
-    ![Add credentials](./11.png)
-
-    ![Add credentials](./12.png)
-
-    ![Add credentials](./13.png)
-
-    ![Add credentials](./14.png)
-
-    ![Create private key](./15.png)
-
-    ![Create private key](./16.png)
-
-    ![Create private key](./17.png)
-
-    ![Create private key](./18.png)
-
-    ![account.json](./19.png)
-
-  - Search Kubernetes Engine API for the project
-
-    ![Enable the Kubernetes Engine API](./20.png)
-
-  - Enable Kubernetes Engine API for the project
-
-    ![Enable the Kubernetes Engine API](./21.png)
-
-## Automation Flow
-
-Read the below explanation to get familiar with the automation and deployment flow.
-
-- User creates the terraform variables file (_terraform.tfvars_) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) OID variable. The variable values are used throughout the deployment.
-
-- User deploys the Terraform plan which will deploy a GKE cluster and compute instance VM as well as an Azure resource group. The Azure resource group is required to host the Azure Arc services such as the Azure Arc-enabled Kubernetes cluster, the custom location, the Azure Arc data controller, and the PostgreSQL database service.
-
-  > **NOTE: Depending on the GCP region, make sure you do not have any [SSD quota limit in the region](https://cloud.google.com/compute/quotas), otherwise, the Azure Arc Data Controller kubernetes resources will fail to deploy.**
-
-- As part of the Windows Server 2022 VM deployment, there are 4 script executions:
-
-  1. *azure_arc.ps1* script will be created automatically as part of the Terraform plan runtime and is responsible for injecting the terraform variable values as environment variables on the Windows instance which will then be used in both the *ClientTools* and the *LogonScript* scripts.
-
-  2. *password_reset.ps1* script will be created automatically as part of the Terraform plan runtime and is responsible for creating the Windows username and password.
-
-  3. *Bootstrap.ps1* script will run during Terraform plan runtime and will:
-      - Create the *Bootstrap.log* file  
-      - Install the required tools – az cli, PowerShell module, kubernetes-cli, Visual C++ Redistributable (Chocolaty packages)
-      - Download Azure Data Studio & Azure Data CLI
-      - Disable Windows Server Manager, remove Internet Explorer, disable Windows Firewall
-      - Download the DataServicesLogonScript.ps1 PowerShell script
-      - Create the Windows schedule task to run the DataServicesLogonScript at first login
-
-  4. *DataServicesLogonScript.ps1* script will run on first login to Windows and will:
-      - Create the *DataServicesLogonScript.log* file
-      - Install the Azure Data Studio Azure Data CLI, Azure Arc and PostgreSQL extensions
-      - Create the Azure Data Studio desktop shortcut
-      - Use Azure CLI to connect the GKE cluster to Azure as an Azure Arc-enabled Kubernetes cluster
-      - Create a custom location for use with the Azure Arc-enabled Kubernetes cluster
-      - Open another Powershell session which will execute a command to watch the deployed Azure Arc Data Controller Kubernetes pods
-      - Deploy an ARM template that will deploy the Azure Arc data controller on the GKE cluster
-      - Execute a secondary *DeployPostgreSQL.ps1* script which will configure the PostgreSQL instance, download and install the sample Adventureworks database, and configure Azure Data Studio to connect to the PostgreSQL database instance
-      - Unregister the logon script Windows scheduler task so it will not run after first login
-
-## Terraform variables
-
-- Before running the Terraform plan, create the _terraform.tfvars_ file in the root of the terraform folder and supply some values for your environment.
-
-   ```HCL
-    gcp_project_id           = "azure-arc-demo-277620"
-    gcp_credentials_filename = "account.json"
-    gcp_region               = "us-west1"
-    gcp_zone                 = "us-west1-a"
-    gke_cluster_name         = "arc-data-gke"
-    admin_username           = "arcdemo"
-    admin_password           = "ArcDemo1234567!!"
-    windows_username         = "arcdemo"
-    windows_password         = "Passw0rd123!!"
-    SPN_CLIENT_ID            = "33333333-XXXX-YYYY-XXXX-YTYTYTYT"
-    SPN_CLIENT_SECRET        = "33333333-XXXX-YTYT-9c21-7777777777"
-    SPN_TENANT_ID            = "33333333-XXXX-41af-1111-7777777777"
-    SPN_AUTHORITY            = "https://login.microsoftonline.com"
-    AZDATA_USERNAME          = "arcdemo"
-    AZDATA_PASSWORD          = "Arcdemo123!!"
-    ARC_DC_NAME              = "arcdatactrl"
-    ARC_DC_SUBSCRIPTION      = "32323232-XXXXX-YYYYY-9e8f-88888888888"
-    ARC_DC_RG                = "Arc-Data-GKE-Demo"
-    ARC_DC_REGION            = "eastus"
-    deploy_SQLMI             = false
-    SQLMIHA                  = false
-    deploy_PostgreSQL        = true
-    templateBaseUrl          = "https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/gke/terraform/"
-    MY_IP                    = "192.168.10.10"
-  ```
-
-- Variable reference:
-
-  - **_`gcp_project_id`_** - Your GCP Project ID (Created in the prerequisites section)
-  - **_`gcp_credentials_filename`_** - Your GCP Credentials JSON filename (Created in the prerequisites section)
-  - **_`gcp_region`_** - GCP region where resource will be created
-  - **_`gcp_zone`_** - GCP zone where resource will be created
-  - **_`gke_cluster_name`_** - GKE cluster name
-  - **_`admin_username`_** - GKE cluster administrator username
-  - **_`admin_password`_** - GKE cluster administrator password
-  - **_`windows_username`_** - Windows Server Client compute instance VM administrator username
-  - **_`windows_password`_** - Windows Server Client compute instance VM administrator password (The password must be at least 8 characters long and contain characters from three of the following four sets: uppercase letters, lowercase letters, numbers, and symbols as well as **not containing** the user's account name or parts of the user's full name that exceed two consecutive characters)
-  - **_`SPN_CLIENT_ID`_** - Your Azure service principal name
-  - **_`SPN_CLIENT_SECRET`_** - Your Azure service principal password
-  - **_`SPN_TENANT_ID`_** - Your Azure tenant ID
-  - **_`SPN_AUTHORITY`_** - _https://login.microsoftonline.com_ **Do not change**
-  - **_`AZDATA_USERNAME`_** - Azure Arc Data Controller admin username
-  - **_`AZDATA_PASSWORD`_** - Azure Arc Data Controller admin password (The password must be at least 8 characters long and contain characters from the following four sets: uppercase letters, lowercase letters, numbers, and symbols)
-  - **_`ARC_DC_NAME`_** - Azure Arc Data Controller name (The name must consist of lowercase alphanumeric characters or '-', and must start and end with a alphanumeric character. This name will be used for k8s namespace as well)
-  - **_`ARC_DC_SUBSCRIPTION`_** - Azure Arc Data Controller Azure subscription ID
-  - **_`ARC_DC_RG`_** - Azure resource group where all future Azure Arc resources will be deployed
-  - **_`ARC_DC_REGION`_** - Azure location where the Azure Arc Data Controller resource will be created in Azure (Currently, supported regions supported are eastus, eastus2, centralus, westus2, westeurope, southeastasia)
-  - **_`deploy_SQLMI`_** - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller only scenario we leave it set to false
-  - **_`SQLMIHA`_** - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to false
-  - **_`deploy_PostgreSQL`_** - Boolean that sets whether or not to deploy PostgreSQL, for this scenario we leave it set to true
-  - **_`templateBaseUrl`_** - GitHub URL to the deployment template - filled in by default to point to [Microsoft/Azure Arc](https://github.com/microsoft/azure_arc) repository, but you can point this to your forked repo as well - e.g. `https://raw.githubusercontent.com/your--github--account/azure_arc/your--branch/azure_arc_data_jumpstart/gke/terraform/`
-  - **_`MY_IP`_** - Your Client IP
-
-### Azure Custom Location Resource Provider (RP) and the Object ID (OID) environment variable
-
-- You will also need to get the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) OID and export it as an environment variable:
-
-  > **NOTE: You need permissions to list all the service principals.**
-
-  #### Option 1: Bash
-
-  ```bash
-  export TF_VAR_CL_OID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $Env:TF_VAR_CL_OID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-## Deployment
-
-> **NOTE: The GKE cluster will use 3 nodes of SKU "n1-standard-8".**
-
-As mentioned, the Terraform plan will deploy a GKE cluster, the Azure Arc Data Controller on that cluster, a Postgres instance with sample database, and a Windows Server 2022 Client GCP compute instance.
-
-- Navigate to the folder that has Terraform binaries.
-
-  ```shell
-  cd azure_arc_data_jumpstart/gke/terraform
-  ```
-
-- Run the ```terraform init``` command which is used to initialize a working directory containing Terraform configuration files and load the required Terraform providers.
-
-  ![terraform init](./22.png)
-
-- Run the ```terraform plan -out=infra.out``` command to make sure everything is configured properly.
-
-  ![terraform plan](./23.png)
-
-- Run the ```terraform apply "infra.out"``` command and wait for the plan to finish. **Runtime for deploying all the GCP resources for this plan is ~20-30min.**
-
-  ![terraform apply completed](./24.png)
-
-- Once completed, you can review the GKE cluster and the worker nodes resources as well as the GCP compute instance VM created.
-
-  ![GKE cluster](./25.png)
-
-  ![GKE cluster](./26.png)
-
-  ![GCP VM instances](./27.png)
-
-  ![GCP VM instances](./28.png)
-
-- In the Azure Portal, a new empty Azure resource group was created which will be used for Azure Arc Data Controller and the other data services you will be deploying in the future.
-
-  ![New empty Azure resource group](./29.png)
-
-## Windows Login & Post Deployment
-
-Now that we have both the GKE cluster and the Windows Server Client instance created, it is time to login to the Client VM.
-
-- Select the Windows instance, click on the RDP dropdown and download the RDP file. Using your *windows_username* and *windows_password* credentials, log in to the VM.
-
-  ![GCP Client VM RDP](./30.png)
-
-  ![GCP Client VM RDP](./31.png)
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-    Let the script run its course and **do not close** the PowerShell session, this will be done for you once completed. You will notice that the Azure Arc Data Controller gets deployed on the GKE cluster. **The logon script run time is approximately 1h long**.
-
-    Once the script finishes its run, the logon script PowerShell session will be closed and the Azure Arc Data Controller will be deployed on the GKE cluster and be ready to use.
-
-  ![PowerShell login script run](./32.png)
-
-  ![PowerShell login script run](./33.png)
-
-  ![PowerShell login script run](./34.png)
-
-  ![PowerShell login script run](./35.png)
-
-  ![PowerShell login script run](./36.png)
-
-  ![PowerShell login script run](./37.png)
-
-  ![PowerShell login script run](./38.png)
-
-  ![PowerShell login script run](./39.png)
-
-  ![PowerShell login script run](./40.png)
-
-  ![PowerShell login script run](./41.png)
-  
-  ![PowerShell login script run](./42.png)
-  
-  ![PowerShell login script run](./43.png)
-  
-  ![PowerShell login script run](./44.png)
-  
-  ![PowerShell login script run](./45.png)
-
-  ![PowerShell login script run](./46.png)
-
-  - When the scripts are complete, all PowerShell windows will close.
-
-  ![PowerShell login script run](./47.png)
-
-- From Azure Portal, navigate to the resource group and confirm that the Azure Arc-enabled Kubernetes cluster, the Azure Arc data controller resource and the Custom Location resource are present.
-
-  ![Azure Portal showing data controller resource](./48.png)
-
-- Another tool automatically deployed is Azure Data Studio along with the *Azure Data CLI*, the *Azure Arc* and the *PostgreSQL* extensions. Azure Data Studio will be opened automatically after the LoginScript is finished. In Azure Data Studio, you can connect to the Postgres instance and see the Adventureworks sample database.
-
-  ![Azure Data Studio shortcut](./49.png)
-
-  ![Azure Data Studio extension](./50.png)
-
-  ![Azure Data studio sample database](./51.png)
-
-  ![Azure Data studio sample database](./52.png)
-
-## Delete the deployment
-
-To completely delete the environment, follow the below steps.
-
-- Delete the data services resources by using kubectl. Run the below command from a PowerShell window on the client VM.
-
-  ```shell
-  kubectl delete namespace arc
-  ```
-
-  ![Delete database resources](./53.png)
-
-- Use terraform to delete all of the GCP resources as well as the Azure resource group. **The *terraform destroy* run time is approximately ~5-6min long**.
-
-  ```shell
-  terraform destroy --auto-approve
-  ```
-
-  ![terraform destroy](./54.png)
-
-<!-- ## Known Issues -->
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/_index.md
deleted file mode 100644
index c7f852914b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Kubernetes Kubeadm"
-linkTitle: "Kubernetes Kubeadm"
-weight: 7
-description: >-
-  If you do not have a Kubernetes cluster, the scenarios in this section will guide on how to create a Kubernetes cluster using kubeadm in Azure VMs with Azure Arc-enabled data services integration in an automated fashion using ARM template.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_dc_vanilla_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_dc_vanilla_arm_template/_index.md
deleted file mode 100644
index b740289d5f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_dc_vanilla_arm_template/_index.md
+++ /dev/null
@@ -1,288 +0,0 @@
----
-type: docs
-title: "Data Controller ARM Template"
-linkTitle: "Data Controller ARM Template"
-weight: 1
-description: >
----
-
-## Deploy a vanilla Azure Arc Data Controller in directly connected mode on Kubeadm Kubernetes cluster with Azure provider using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) deployed on [Kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/) Kubernetes cluster.
-
-By the end of this scenario, you will have a Kubeadm Kubernetes cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with the following Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, and logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/VNET.json) - Deploys a VNET and Subnet for Client and K8s VMs.
-  - [_ubuntuKubeadm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/ubuntuKubeadm.json) - Deploys two Ubuntu Linux VMs which will be transformed into a 
-  - Kubeadm management cluster (a single control-plane and a single Worker node) using the [_installKubeadm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/installKubeadm.sh) and the [_installKubeadmWorker_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/installKubeadmWorker.sh) shell scripts. This Kubeadm cluster will be used by the rest of the Azure Arc-enabled data services automation deploy.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that creates a new Azure Arc-enabled Kubernetes cluster and configure Azure Arc-enabled data services on the Kubeadm Cluster including the Data Controller. Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom location](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller vanilla scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-
-- You will also need to get the Azure Custom Location Resource Provider (RP) Object ID (OID) and export it as an environment variable. This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your cluster.
-
-  > **NOTE: You need permissions to list all the service principals.**
-  #### Option 1: Bash
-
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/kubeadm/azure/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-    --parameters customLocationRPOID="$customLocationRPOID"
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdatademo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json \
-    --parameters customLocationRPOID="$customLocationRPOID" \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_dc_vanilla_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_dc_vanilla_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_dc_vanilla_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller will be deployed on the cluster and be ready to use.
-
-    ![Screenshot showing the PowerShell logon script run](./11.png)
-
-    ![Screenshot showing the PowerShell logon script run](./12.png)
-
-    ![Screenshot showing the PowerShell logon script run](./13.png)
-
-    ![Screenshot showing the PowerShell logon script run](./14.png)
-
-    ![Screenshot showing the PowerShell logon script run](./15.png)
-
-    ![Screenshot showing the PowerShell logon script run](./16.png)
-
-    ![Screenshot showing the PowerShell logon script run](./17.png)
-
-    ![Screenshot showing the PowerShell logon script run](./18.png)
-
-    ![Screenshot showing the PowerShell logon script run](./19.png)
-
-    ![Screenshot showing the PowerShell logon script run](./20.png)
-
-    ![Screenshot showing the PowerShell logon script run](./21.png)
-
-    ![Screenshot showing the PowerShell logon script run](./22.png)
-
-    ![Screenshot showing the PowerShell logon script run](./23.png)
-
-    ![Screenshot showing the post-run desktop](./24.png)
-
-- Since this scenario is onboarding your Kubernetes cluster with Arc and deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - Custom location - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - Azure Arc Data Controller - The data controller that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./25.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./26.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./27.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-- In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./28.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./29.png)
-
-### Exploring logs from the Client virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Arc-Data-Client_, _Arc-Data-Kubeadm-MGMT-Master_ or _Arc-Data-Kubeadm-MGMT-Worker_ virtual machines in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _Arc-Data-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Logfile | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Arc-Data-Client_. |
-| _C:\Temp\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\Temp\installKubeadm.log_ | Output from the custom script extension which runs on _Arc-Data-Kubeadm-MGMT-Master_ and configures the Kubeadm cluster Master Node. If you encounter ARM deployment issues with _ubuntuKubeadm.json_ then review this log. |
-| _C:\Temp\installKubeadmWorker.log_ | Output from the custom script extension which runs on _Arc-Data-Kubeadm-MGMT-Worker and configures the Kubeadm cluster Worker Node. If you encounter ARM deployment issues with _ubuntuKubeadm.json_ then review this log. |
-
-![Screenshot showing the Temp folder with deployment logs](./30.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./31.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_mssql_mi_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_mssql_mi_arm_template/_index.md
deleted file mode 100644
index c153676bd2..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_mssql_mi_arm_template/_index.md
+++ /dev/null
@@ -1,372 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance ARM Template"
-linkTitle: "SQL Managed Instance ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure Arc-enabled SQL Managed Instance in directly connected mode on Kubeadm Kubernetes cluster with Azure provider using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on [Kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/) Kubernetes cluster.
-
-By the end of this scenario, you will have a Kubeadm Kubernetes cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with the following Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, and logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/VNET.json) - Deploys a VNET and Subnet for Client and K8s VMs.
-  - [_ubuntuKubeadm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/ubuntuKubeadm.json) - Deploys two Ubuntu Linux VMs which will be transformed into a 
-  - Kubeadm management cluster (a single control-plane and a single Worker node) using the [_installKubeadm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/installKubeadm.sh) and the [_installKubeadmWorker_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/installKubeadmWorker.sh) shell scripts. This Kubeadm cluster will be used by the rest of the Azure Arc-enabled data services automation deploy.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that creates a new Azure Arc-enabled Kubernetes cluster and configure Azure Arc-enabled data services on the kubeadm workload cluster including the Data Controller. Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom Location](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-- In addition to deploying the data controller and SQL Managed Instance, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this Azure Arc-enabled SQL Managed Instance scenario we will set it to _**true**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, set this to either _**true**_ or _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this scenario we leave it set to _**false**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- You will also need to get the Azure Custom Location Resource Provider (RP) Object ID (OID) and export it as an environment variable. This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your cluster.
-
-  > **NOTE: You need permissions to list all the service principals.**
-  #### Option 1: Bash
-
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/kubeadm/azure/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-    --parameters customLocationRPOID="$customLocationRPOID"
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdatademo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json \
-    --parameters customLocationRPOID="$customLocationRPOID" \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_mssql_mi_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_mssql_mi_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_mssql_mi_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and the Azure Arc Data Controller and the SQL Managed Instance will be deployed on the cluster and be ready to use.
-
-    ![Screenshot showing the PowerShell logon script run](./11.png)
-
-    ![Screenshot showing the PowerShell logon script run](./12.png)
-
-    ![Screenshot showing the PowerShell logon script run](./13.png)
-
-    ![Screenshot showing the PowerShell logon script run](./14.png)
-
-    ![Screenshot showing the PowerShell logon script run](./15.png)
-
-    ![Screenshot showing the PowerShell logon script run](./16.png)
-
-    ![Screenshot showing the PowerShell logon script run](./17.png)
-
-    ![Screenshot showing the PowerShell logon script run](./18.png)
-
-    ![Screenshot showing the PowerShell logon script run](./19.png)
-
-    ![Screenshot showing the PowerShell logon script run](./20.png)
-
-    ![Screenshot showing the PowerShell logon script run](./21.png)
-
-    ![Screenshot showing the PowerShell logon script run](./22.png)
-
-    ![Screenshot showing the PowerShell logon script run](./23.png)
-
-    ![Screenshot showing the PowerShell logon script run](./24.png)
-
-    ![Screenshot showing the PowerShell logon script run](./25.png)
-
-    ![Screenshot showing the post-run desktop](./26.png)
-
-
-- Since this scenario is onboarding your Kubernetes cluster with Arc and deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - Custom location - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - Azure Arc Data Controller - The data controller that is now deployed on the Kubernetes cluster.
-
-  - Azure Arc-enabled SQL Managed Instance - The SQL Managed Instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./27.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./28.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./29.png)
-
-- Additionally, the SQL Managed Instance connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio SQL MI connection](./30.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-- In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./31.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./32.png)
-
-## High Availability with SQL Always-On availability groups
-
-Azure Arc-enabled SQL Managed Instance is deployed on Kubernetes as a containerized application and uses kubernetes constructs such as stateful sets and persistent storage to provide built-in health monitoring, failure detection, and failover mechanisms to maintain service health. For increased reliability, you can also configure Azure Arc-enabled SQL Managed Instance to deploy with extra replicas in a high availability configuration.
-
-For showcasing and testing SQL Managed Instance with [Always On availability groups](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-high-availability#deploy-with-always-on-availability-groups), a dedicated [Jumpstart scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/) is available to help you simulate failures and get hands-on experience with this deployment model.
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance stress simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Screenshot showing opened SqlQueryStress](./33.png)
-
-  ![Screenshot showing SQLMI Endpoints text file](./34.png)
-
-> **NOTE: Secondary SQL Managed Instance endpoint will be available only when using the [HA deployment model ("Business Critical")](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/kubeadm/azure/capi_mssql_ha/).**
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SqlQueryStress connected](./35.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SqlQueryStress settings](./36.png)
-
-  ![Screenshot showing SqlQueryStress running](./37.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./38.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _`kubectl get svc -n arc`_ command to view the _metricsui_ external service IP address.
-
-  ![Screenshot showing metricsui Kubernetes service](./39.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Screenshot showing Grafana username and password](./40.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana dashboards](./41.png)
-
-  ![Screenshot showing Grafana "SQL Managed Instance Metrics" dashboard](./42.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _SqlQueryStress_ (in case it was already finished).
-
-  ![Screenshot showing "Last 5 minutes" time range](./43.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing increased load activity](./44.png)
-
-  ![Screenshot showing increased load activity](./45.png)
-
-### Exploring logs from the Client virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Arc-Data-Client_, _Arc-Data-Kubeadm-MGMT-Master_ or _Arc-Data-Kubeadm-MGMT-Worker_ virtual machines in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _Arc-Data-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Logfile | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Arc-Data-Client_. |
-| _C:\Temp\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\Temp\DeploySQLMI.log_ | Output of _deploySQL.ps1_ which deploys and configures SQL Managed Instance with Azure Arc. |
-| _C:\Temp\installKubeadm.log_ | Output from the custom script extension which runs on _Arc-Data-Kubeadm-MGMT-Master_ and configures the Kubeadm cluster Master Node. If you encounter ARM deployment issues with _ubuntuKubeadm.json_ then review this log. |
-| _C:\Temp\installKubeadmWorker.log_ | Output from the custom script extension which runs on _Arc-Data-Kubeadm-MGMT-Worker and configures the Kubeadm cluster Worker Node. If you encounter ARM deployment issues with _ubuntuKubeadm.json_ then review this log. |
-| _C:\Temp\SQLMIEndpoints.log_ | Output from _SQLMIEndpoints.ps1_ which collects the service endpoints for SQL MI and uses them to configure Azure Data Studio connection settings. |
-
-![Screenshot showing the Temp folder with deployment logs](./46.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./47.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_postgresql_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_postgresql_arm_template/_index.md
deleted file mode 100644
index e6157344ff..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_postgresql_arm_template/_index.md
+++ /dev/null
@@ -1,298 +0,0 @@
----
-type: docs
-title: "PostgreSQL ARM Template"
-linkTitle: "PostgreSQL ARM Template"
-weight: 3
-description: >
----
-
-## Deploy Azure Arc-enabled PostgreSQL in directly connected mode on Cluster API Kubernetes cluster with Azure provider using an ARM Template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [PostgreSQL](https://docs.microsoft.com/azure/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale)deployed on [Kubeadm](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/) Kubernetes cluster.
-
-By the end of this scenario, you will have a Kubeadm Kubernetes cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with the following Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, and logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json) will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/VNET.json) - Deploys a VNET and Subnet for Client and K8s VMs.
-  - [_ubuntuKubeadm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/ubuntuKubeadm.json) - Deploys two Ubuntu Linux VMs which will be transformed into a 
-  - Kubeadm management cluster (a single control-plane and a single Worker node) using the [_installKubeadm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/installKubeadm.sh) and the [_installKubeadmWorker_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/installKubeadmWorker.sh) shell scripts. This Kubeadm cluster will be used by the rest of the Azure Arc-enabled data services automation deploy.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/mgmtStagingStorage.json) - Used for staging files in automation scripts.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs uploads.
-
-- User remotes into client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell script that creates a new Azure Arc-enabled Kubernetes cluster and configure Azure Arc-enabled data services on the kubeadm workload cluster including the Data Controller. Azure Arc-enabled data services deployed in directly connected are using this type of resource in order to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions) as well as for using Azure Arc [Custom Location](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-- In addition to deploying the data controller and PostgreSQL, the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will restored automatically for you as well.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the deployment log analytics workspace.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this scenario we leave it set to _**false**_.
-  - _`SQLMIHA`_ - Boolean that sets whether or not to deploy SQL Managed Instance with high-availability (business continuity) configurations, for this scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this Azure Arc-enabled PostgreSQL scenario we will set it to _**true**_.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion host name.
-
-- You will also need to get the Azure Custom Location Resource Provider (RP) Object ID (OID) and export it as an environment variable. This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your cluster.
-
-  > **NOTE: You need permissions to list all the service principals.**
-  #### Option 1: Bash
-
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/kubeadm/azure/ARM) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-    --parameters customLocationRPOID="$customLocationRPOID"
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Data-Demo --location "East US"
-    az deployment group create \
-    --resource-group Arc-Data-Demo \
-    --name arcdatademo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/azuredeploy.json \
-    --parameters customLocationRPOID="$customLocationRPOID" \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot showing ARM template deployment completed](./01.png)
-
-    ![Screenshot showing the new Azure resource group with all resources](./02.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_postgresql_arm_template/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_postgresql_arm_template/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_azure_postgresql_arm_template/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client-NSG with blocked RDP](./03.png)
-
-  ![Screenshot showing adding a new inbound security rule](./04.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./05.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./06.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./07.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./08.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and PostgreSQL will be deployed on the cluster and be ready to use.
-
-  ![Screenshot showing the PowerShell logon script run](./11.png)
-
-  ![Screenshot showing the PowerShell logon script run](./12.png)
-
-  ![Screenshot showing the PowerShell logon script run](./13.png)
-
-  ![Screenshot showing the PowerShell logon script run](./14.png)
-
-  ![Screenshot showing the PowerShell logon script run](./15.png)
-
-  ![Screenshot showing the PowerShell logon script run](./16.png)
-
-  ![Screenshot showing the PowerShell logon script run](./17.png)
-
-  ![Screenshot showing the PowerShell logon script run](./18.png)
-
-  ![Screenshot showing the PowerShell logon script run](./19.png)
-
-  ![Screenshot showing the PowerShell logon script run](./20.png)
-
-  ![Screenshot showing the PowerShell logon script run](./21.png)
-
-  ![Screenshot showing the PowerShell logon script run](./22.png)
-
-  ![Screenshot showing the PowerShell logon script run](./23.png)
-
-  ![Screenshot showing the post-run desktop](./24.png)
-
-- Since this scenario is onboarding your Kubernetes cluster with Arc and deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group. The important ones to notice are:
-
-  - Custom location - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as target locations for deploying Azure services instances.
-
-  - Azure Arc Data Controller - The data controller that is now deployed on the Kubernetes cluster.
-
-  - Azure Arc-enabled PostgreSQL - The PostgreSQL instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing additional Azure resources in the resource group](./25.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./26.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./27.png)
-
-- Additionally, the PostgreSQL connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio PostgresSQL connection](./28.png)
-
-## Cluster extensions
-
-In this scenario, two Azure Arc-enabled Kubernetes cluster extensions were installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- _arc-data-services_ - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-- In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster extensions settings](./29.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./30.png)
-
-### Exploring logs from the Client virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Arc-Data-Client_, _Arc-Data-Kubeadm-MGMT-Master_ or _Arc-Data-Kubeadm-MGMT-Worker_ virtual machines in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _Arc-Data-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Logfile | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Arc-Data-Client_. |
-| _C:\Temp\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\Temp\DeployPostgreSQL.log_ | Output of _deployPostgreSQL.ps1_ which deploys and configures PostgreSQL with Azure Arc. |
-| _C:\Temp\installKubeadm.log_ | Output from the custom script extension which runs on _Arc-Data-Kubeadm-MGMT-Master_ and configures the Kubeadm cluster Master Node. If you encounter ARM deployment issues with _ubuntuKubeadm.json_ then review this log. |
-| _C:\Temp\installKubeadmWorker.log_ | Output from the custom script extension which runs on _Arc-Data-Kubeadm-MGMT-Worker and configures the Kubeadm cluster Worker Node. If you encounter ARM deployment issues with _ubuntuKubeadm.json_ then review this log. |
-
-![Screenshot showing the Temp folder with deployment logs](./31.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Delete Azure resource group](./32.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/microk8s/_index.md
deleted file mode 100644
index 006d6877db..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "MicroK8s"
-linkTitle: "MicroK8s"
-weight: 6
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on deploying Azure Arc-enabled data services on Microk8s in an automated fashion using ARM templates.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/_index.md
deleted file mode 100644
index c72dfc8edb..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/_index.md
+++ /dev/null
@@ -1,293 +0,0 @@
----
-type: docs
-title: "Data Controller ARM Template"
-linkTitle: "Data Controller ARM Template"
-weight: 1
-description: >
----
-
-## Deploy a vanilla Azure Arc Data Controller on a Microk8s Kubernetes cluster in an Azure VM using ARM template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) deployed on a single-node [Microk8s](https://microk8s.io/) Kubernetes cluster.
-
-By the end of this scenario, you will have a Microk8s Kubernetes cluster deployed with an Azure Arc Data Controller and a Microsoft Windows Server 2022 (Datacenter) Azure Client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    SP_OID=$(az ad sp show --id $SP_CLIENT_ID --query id -o tsv)
-
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the [Microk8s GitHub repo](https://github.com/ubuntu/microk8s):
-
-_"Microk8s is a single-package, fully conformant, lightweight Kubernetes that works on 42 flavors of Linux. Perfect for Developer workstations, IoT, Edge & CI/CD. MicroK8s tracks upstream and releases beta, RC and final bits the same day as upstream K8s."_
-
-in this scenario, we automate the installation of Microk8s on an Ubuntu 20.04 VM running on Azure using a few simple commands to install from the [Snap Store](https://snapcraft.io/microk8s), before proceeding to onboard it as an Azure Arc-enabled Kubernetes Cluster.
-
-Once our K8s Cluster is onboarded, we proceed to create a [Custom Location](https://docs.microsoft.com/azure/azure-arc/kubernetes/custom-locations), and deploy an Azure Arc Data Controller in [Directly Connected mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity#connectivity-modes).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json) ARM template will initiate **five** linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/VNET.json) - Deploys a Virtual Network with a single subnet - used by our VMs.
-  - [_ubuntuMicrok8s_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/ubuntuMicrok8s.json) - Deploys an Ubuntu Linux VM which will have Microk8s installed from the Snap Store.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/clientVm.json) - Deploys the Client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/mgmtStagingStorage.json) - Used for staging files in automation scripts and [kubeconfig](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/).
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs upload.
-
-- User remotes into Client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configure Azure Arc-enabled data services on the Microk8s Kubernetes cluster - including the data controller.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.parameters.example.json).
-
-  - _`sshRSAPublicKey`_ - Your SSH public key - sample syntax: `ssh-rsa AAAAB3N...NDOCE7U3DLBISw==\n`.
-  - _`spnClientId`_ - Your Azure service principal id.
-  - _`spnClientSecret`_ - Your Azure service principal secret.
-  - _`spnTenantId`_ - Your Azure tenant id.
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name.
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for log analytics workspace deployment.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller only scenario we leave it set to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller only scenario we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [_microsoft/azure_arc_](https://github.com/microsoft/azure_arc) GitHub repository, but you can point this to your forked repo as well.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion.
-
-- You will also need to get the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) and export it as an environment variable:
-
-  > **NOTE: You need permissions to list all the service principals.**
-
-  #### Option 1: Bash
-
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/microk8s/azure/arm_template) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --name <The name of this deployment> \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json \
-  --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-  --parameters customLocationRPOID="$customLocationRPOID"
-  ```
-
-  > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-  For example:
-
-  ```shell
-  az group create --name Arc-Data-Microk8s --location "East US"
-  az deployment group create \
-  --resource-group Arc-Data-Microk8s \
-  --name arcdatademo \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json \
-  --parameters customLocationRPOID="$customLocationRPOID" \
-  --parameters azuredeploy.parameters.json
-  --parameters templateBaseUrl="https://raw.githubusercontent.com/your--github--handle/azure_arc/microk8s-data/azure_arc_data_jumpstart/microk8s/azure/arm_template/"
-  ```
-
-  > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-  > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-  ![Screenshot showing deployment time](./01.png)
-
-- Once Azure resources have been provisioned, you will be able to see it in the Azure portal. At this point, the resource group should have **13 various Azure resources deployed**.
-
-  ![Screenshot showing ARM template deployment completed](./02.png)
-
-  ![Screenshot showing new Azure resource group with all resources](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client NSG with blocked RDP](./05.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script run it's course and **do not close** the PowerShell session, this will be done for you once completed.
-
-  ![Screenshot showing PowerShell logon script run](./12.png)
-
-  ![Screenshot showing PowerShell logon script run](./13.png)
-
-  ![Screenshot showing PowerShell logon script run](./14.png)
-
-  ![Screenshot showing PowerShell logon script run](./15.png)
-
-  ![Screenshot showing PowerShell logon script run](./16.png)
-
-  ![Screenshot showing PowerShell logon script run](./17.png)
-
-  ![Screenshot showing PowerShell logon script run](./18.png)
-
-  ![Screenshot showing PowerShell logon script run](./19.png)
-
-  ![Screenshot showing PowerShell logon script run](./20.png)
-
-  ![Screenshot showing PowerShell logon script run](./21.png)
-
-  Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, and the Azure Arc Data Controller will have been deployed on the cluster and be ready for use:
-
-  ![Screenshot showing Wallpaper Change](./22.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **16 various Azure resources deployed**. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled data services deployed in directly connected mode is using this resource to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - Provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - **Azure Arc Data Controller** - The data controller that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing addtional Azure resources in the resource group](./23.png)
-
-- Another tool automatically deployed is Azure Data Studio along with the _Azure Data CLI_, the _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see both extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./24.png)
-
-  ![Screenshot showing Azure Data Studio shortcut](./25.png)
-
-## Cluster extensions
-
-In this scenario, **three** Azure Arc-enabled Kubernetes cluster extensions were deployed:
-
-- `microsoft.azuredefender.kubernetes` - The Azure Defender cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/#create-azure-defender-extensions-instance) scenario.
-
-- `azuremonitor-containers` - The Azure Monitor for containers cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- `arc-data-services` - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-  In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes resource](./26.png)
-
-  And we see the installed extensions:
-  ![Screenshot showing Azure Arc-enabled Kubernetes Cluster Extensions settings](./27.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing how to delete Azure resource group](./28.png)
-
-<!-- ## Known Issues -->
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/_index.md
deleted file mode 100644
index 9b207fa859..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/_index.md
+++ /dev/null
@@ -1,359 +0,0 @@
----
-type: docs
-title: "SQL Managed Instance ARM Template"
-linkTitle: "SQL Managed Instance ARM Template"
-weight: 2
-description: >
----
-
-## Deploy Azure Arc-enabled SQL Managed Instance on a Microk8s Kubernetes cluster in an Azure VM using ARM template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [SQL Managed Instance](https://docs.microsoft.com/azure/azure-arc/data/managed-instance-overview) deployed on a single-node [Microk8s](https://microk8s.io/) Kubernetes cluster.
-
-By the end of this scenario, you will have a Microk8s Kubernetes cluster deployed with an Azure Arc Data Controller & SQL Managed Instance (with a sample database), and a Microsoft Windows Server 2022 (Datacenter) Azure Client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    SP_OID=$(az ad sp show --id $SP_CLIENT_ID --query id -o tsv)
-
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the [Microk8s GitHub repo](https://github.com/ubuntu/microk8s):
-
-_"Microk8s is a single-package, fully conformant, lightweight Kubernetes that works on 42 flavors of Linux. Perfect for Developer workstations, IoT, Edge & CI/CD. MicroK8s tracks upstream and releases beta, RC and final bits the same day as upstream K8s."_
-
-in this scenario, we automate the installation of Microk8s on an Ubuntu 20.04 VM running on Azure using a few simple commands to install from the [Snap Store](https://snapcraft.io/microk8s), before proceeding to onboard it as an Azure Arc-enabled Kubernetes Cluster.
-
-Once our K8s Cluster is onboarded, we proceed to create a [Custom Location](https://docs.microsoft.com/azure/azure-arc/kubernetes/custom-locations), and deploy an Azure Arc Data Controller in [Directly Connected mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity#connectivity-modes).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json) ARM template will initiate **five** linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/VNET.json) - Deploys a Virtual Network with a single subnet - used by our VMs.
-  - [_ubuntuMicrok8s_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/ubuntuMicrok8s.json) - Deploys an Ubuntu Linux VM which will have Microk8s installed from the Snap Store.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/clientVm.json) - Deploys the Client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/mgmtStagingStorage.json) - Used for staging files in automation scripts and [kubeconfig](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/).
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs upload.
-
-- User remotes into Client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configure Azure Arc-enabled data services on the Microk8s Kubernetes cluster - including the data controller.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.parameters.example.json) (ensure to set _`deploySQLMI`_ to _**true**_):
-
-  - _`sshRSAPublicKey`_ - Your SSH public key - sample syntax: `ssh-rsa AAAAB3N...NDOCE7U3DLBISw==\n`.
-  - _`spnClientId`_ - Your Azure service principal id.
-  - _`spnClientSecret`_ - Your Azure service principal secret.
-  - _`spnTenantId`_ - Your Azure tenant id.
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name.
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for log analytics workspace deployment.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller and Azure SQL Managed Instance scenario, we will set it to _**true**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller and Azure SQL Managed Instance scenario, we leave it set to _**false**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [_microsoft/azure_arc_](https://github.com/microsoft/azure_arc) GitHub repository, but you can point this to your forked repo as well.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion.
-
-- You will also need to get the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) and export it as an environment variable:
-
-  > **NOTE: You need permissions to list all the service principals.**
-
-  #### Option 1: Bash
-
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/microk8s/azure/arm_template) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --name <The name of this deployment> \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json \
-  --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-  --parameters customLocationRPOID="$customLocationRPOID"
-  ```
-
-  > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-  For example:
-
-  ```shell
-  az group create --name Arc-Data-Microk8s --location "East US"
-  az deployment group create \
-  --resource-group Arc-Data-Microk8s \
-  --name arcdatademo \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json \
-  --parameters customLocationRPOID="$customLocationRPOID" \
-  --parameters azuredeploy.parameters.json
-  --parameters templateBaseUrl="https://raw.githubusercontent.com/your--github--handle/azure_arc/microk8s-data/azure_arc_data_jumpstart/microk8s/azure/arm_template/"
-  ```
-
-  > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-  > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-  ![Screenshot showing deployment time](./01.png)
-
-- Once Azure resources have been provisioned, you will be able to see it in the Azure portal. At this point, the resource group should have **13 various Azure resources deployed**.
-
-  ![Screenshot showing ARM template deployment completed](./02.png)
-
-  ![Screenshot showing new Azure resource group with all resources](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script run it's course and **do not close** the PowerShell session, this will be done for you once completed.
-
-  ![Screenshot showing PowerShell logon script run](./12.png)
-
-  ![Screenshot showing PowerShell logon script run](./13.png)
-
-  ![Screenshot showing PowerShell logon script run](./14.png)
-
-  ![Screenshot showing PowerShell logon script run](./15.png)
-
-  ![Screenshot showing PowerShell logon script run](./16.png)
-
-  ![Screenshot showing PowerShell logon script run](./17.png)
-
-  ![Screenshot showing PowerShell logon script run](./18.png)
-
-  ![Screenshot showing PowerShell logon script run](./19.png)
-
-  ![Screenshot showing PowerShell logon script run](./20.png)
-
-  ![Screenshot showing PowerShell logon script run](./21.png)
-
-  ![Screenshot showing PowerShell logon script run](./22.png)
-
-  ![Screenshot showing PowerShell logon script run](./23.png)
-
-  Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and the SQL Managed Instance will be deployed on the cluster and be ready to use:
-
-  ![Screenshot showing Wallpaper Change](./24.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and SQL Managed Instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **17 various Azure resources deployed**. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled data services deployed in directly connected mode is using this resource to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - **Azure Arc Data Controller** - The data controller that is now deployed on the Kubernetes cluster.
-
-  - **Azure Arc-enabled SQL Managed Instance** - The SQL Managed Instance that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing addtional Azure resources in the resource group](./25.png)
-
-- Another tool automatically deployed is Azure Data Studio along with the _Azure Data CLI_, the _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see both extensions.
-
-  ![Screenshot showing Azure Data Studio shortcut](./26.png)
-
-  ![Screenshot showing Azure Data Studio shortcut](./27.png)
-
-- Additionally, the SQL Managed Instance connection will be configured within Data Studio, as well as the sample [_AdventureWorks_](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) database will be restored automatically for you.
-
-  ![Screenshot showing configured SQL Managed Instance connection](./28.png)
-
-  > **NOTE: Due to the use of Kubernetes _NodePort_ service in this scenario, the default SQL connection endpoint port number (1443) was changed to 31111.**
-
-## Cluster extensions
-
-In this scenario, **three** Azure Arc-enabled Kubernetes cluster extensions were deployed:
-
-- `microsoft.azuredefender.kubernetes` - The Azure Defender cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/#create-azure-defender-extensions-instance) scenario.
-
-- `azuremonitor-containers` - The Azure Monitor for containers cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- `arc-data-services` - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-  In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes resource](./29.png)
-
-  And we see the installed extensions:
-  ![Screenshot showing Azure Arc-enabled Kubernetes Cluster Extensions settings](./30.png)
-
-## Operations
-
-### Azure Arc-enabled SQL Managed Instance Stress Simulation
-
-Included in this scenario, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance **primary** endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Screenshot showing how to open SqlQueryStress](./31.png)
-
-  ![Screenshot showing SQLMI Endpoints text file](./32.png)
-
-- To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SqlQueryStress connected](./33.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SqlQueryStress settings](./34.png)
-
-  ![Screenshot showing SqlQueryStress running](./35.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-- Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./36.png)
-
-- To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Screenshot showing Grafana username and password](./37.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana dashboards](./38.png)
-
-  ![Screenshot showing Grafana "SQL Managed Instance Metrics" dashboard](./39.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _SqlQueryStress_ (in case it was already finished).
-
-  ![Screenshot showing last 5 minutes time range](./40.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing increased load activity](./41.png)
-
-  ![Screenshot showing increased load activity](./42.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing how to delete Azure resource group](./43.png)
-
-<!-- ## Known Issues -->
diff --git a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/_index.md b/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/_index.md
deleted file mode 100644
index 14d62dbc48..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/_index.md
+++ /dev/null
@@ -1,305 +0,0 @@
----
-type: docs
-title: "PostgreSQL ARM Template"
-linkTitle: "PostgreSQL ARM Template"
-weight: 3
-description: >
----
-
-## Deploy Azure Arc-enabled PostgreSQL on a Microk8s Kubernetes cluster in an Azure VM using ARM template
-
-The following Jumpstart scenario will guide you on how to deploy a "Ready to Go" environment so you can start using [Azure Arc-enabled data services](https://docs.microsoft.com/azure/azure-arc/data/overview) and [PostgreSQL](https://docs.microsoft.com/azure/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale) deployed on a single-node [Microk8s](https://microk8s.io/) Kubernetes cluster.
-
-By the end of this scenario, you will have a Microk8s Kubernetes cluster deployed with an Azure Arc Data Controller & PostgreSQL instance (with a sample database), and a Microsoft Windows Server 2022 (Datacenter) Azure Client VM, installed & pre-configured with all the required tools needed to work with Azure Arc-enabled data services.
-
-> **NOTE: Currently, Azure Arc-enabled data services with PostgreSQL is in [public preview](https://docs.microsoft.com/azure/azure-arc/data/release-notes)**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal Role-based access control (RBAC) is required:
-
-  - "Owner" - Required for provisioning Azure resources, interact with Azure Arc-enabled data services billing, monitoring metrics, logs management and creating role assignment for the Monitoring Metrics Publisher role.
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    SP_OID=$(az ad sp show --id $SP_CLIENT_ID --query id -o tsv)
-
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    SP_CLIENT_ID=$(az ad sp create-for-rbac -n "JumpstartArcDataSvc" --role "Owner" --scopes /subscriptions/$subscriptionId --query appId -o tsv)
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcDataSvc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Architecture (In a nutshell)
-
-From the [Microk8s GitHub repo](https://github.com/ubuntu/microk8s):
-
-_"Microk8s is a single-package, fully conformant, lightweight Kubernetes that works on 42 flavors of Linux. Perfect for Developer workstations, IoT, Edge & CI/CD. MicroK8s tracks upstream and releases beta, RC and final bits the same day as upstream K8s."_
-
-in this scenario, we automate the installation of Microk8s on an Ubuntu 20.04 VM running on Azure using a few simple commands to install from the [Snap Store](https://snapcraft.io/microk8s), before proceeding to onboard it as an Azure Arc-enabled Kubernetes Cluster.
-
-Once our K8s Cluster is onboarded, we proceed to create a [Custom Location](https://docs.microsoft.com/azure/azure-arc/kubernetes/custom-locations), and deploy an Azure Arc Data Controller in [Directly Connected mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity#connectivity-modes).
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit) and export the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) variable to use it as a parameter. These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json) ARM template will initiate **five** linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/VNET.json) - Deploys a Virtual Network with a single subnet - used by our VMs.
-  - [_ubuntuMicrok8s_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/ubuntuMicrok8s.json) - Deploys an Ubuntu Linux VM which will have Microk8s installed from the Snap Store.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/clientVm.json) - Deploys the Client Windows VM. This is where all user interactions with the environment are made from.
-  - [_mgmtStagingStorage_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/mgmtStagingStorage.json) - Used for staging files in automation scripts and [kubeconfig](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/).
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support Azure Arc-enabled data services logs upload.
-
-- User remotes into Client Windows VM, which automatically kicks off the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1) PowerShell script that deploys and configure Azure Arc-enabled data services on the Microk8s Kubernetes cluster - including the data controller.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.parameters.example.json) (ensure to set _`deployPostgreSQL`_ to _**true**_):
-
-  - _`sshRSAPublicKey`_ - Your SSH public key - sample syntax: `ssh-rsa AAAAB3N...NDOCE7U3DLBISw==\n`.
-  - _`spnClientId`_ - Your Azure service principal id.
-  - _`spnClientSecret`_ - Your Azure service principal secret.
-  - _`spnTenantId`_ - Your Azure tenant id.
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name.
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for log analytics workspace deployment.
-  - _`deploySQLMI`_ - Boolean that sets whether or not to deploy SQL Managed Instance, for this data controller and Azure PostgreSQL scenario, we will set it to _**false**_.
-  - _`deployPostgreSQL`_ - Boolean that sets whether or not to deploy PostgreSQL, for this data controller and Azure PostgreSQL scenario, we leave it set to _**true**_.
-  - _`templateBaseUrl`_ - GitHub URL to the deployment template - filled in by default to point to [_microsoft/azure_arc_](https://github.com/microsoft/azure_arc) GitHub repository, but you can point this to your forked repo as well.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion.
-
-- You will also need to get the Azure Custom Location Resource Provider ([RP](https://learn.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types)) Object ID (OID) and export it as an environment variable:
-
-  > **NOTE: You need permissions to list all the service principals.**
-
-  #### Option 1: Bash
-
-  ```bash
-  customLocationRPOID=$(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $customLocationRPOID=(az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv)
-  ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_data_jumpstart/microk8s/azure/arm_template) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --name <The name of this deployment> \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json \
-  --parameters <The _azuredeploy.parameters.json_ parameters file location> \
-  --parameters customLocationRPOID="$customLocationRPOID"
-  ```
-
-  > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the `azuredeploy.parameters.json` file**
-
-  For example:
-
-  ```shell
-  az group create --name Arc-Data-Microk8s --location "East US"
-  az deployment group create \
-  --resource-group Arc-Data-Microk8s \
-  --name arcdatademo \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/azuredeploy.json \
-  --parameters customLocationRPOID="$customLocationRPOID" \
-  --parameters azuredeploy.parameters.json
-  --parameters templateBaseUrl="https://raw.githubusercontent.com/your--github--handle/azure_arc/microk8s-data/azure_arc_data_jumpstart/microk8s/azure/arm_template/"
-  ```
-
-  > **NOTE: The deployment time for this scenario can take ~15-20min**
-
-  > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-  ![Screenshot showing deployment time](./01.png)
-
-- Once Azure resources have been provisioned, you will be able to see it in the Azure portal. At this point, the resource group should have **13 various Azure resources deployed**.
-
-  ![Screenshot showing ARM template deployment completed](./02.png)
-
-  ![Screenshot showing New Azure resource group with all resources](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Data-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Data-Client-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Data-Client NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_DataServicesLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script run it's course and **do not close** the PowerShell session, this will be done for you once completed.
-
-  ![Screenshot showing PowerShell logon script run](./12.png)
-
-  ![Screenshot showing PowerShell logon script run](./13.png)
-
-  ![Screenshot showing PowerShell logon script run](./14.png)
-
-  ![Screenshot showing PowerShell logon script run](./15.png)
-
-  ![Screenshot showing PowerShell logon script run](./16.png)
-
-  ![Screenshot showing PowerShell logon script run](./17.png)
-
-  ![Screenshot showing PowerShell logon script run](./18.png)
-
-  ![Screenshot showing PowerShell logon script run](./19.png)
-
-  ![Screenshot showing PowerShell logon script run](./20.png)
-
-  ![Screenshot showing PowerShell logon script run](./21.png)
-
-  ![Screenshot showing PowerShell logon script run](./22.png)
-
-  ![Screenshot showing PowerShell logon script run](./23.png)
-
-  Once the script will finish it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change and both the Azure Arc Data Controller and the PostgreSQL will be deployed on the cluster and be ready to use:
-
-  ![Screenshot showing Wallpaper Change](./24.png)
-
-- Since this scenario is deploying the Azure Arc Data Controller and PostgreSQL instance, you will also notice additional newly deployed Azure resources in the resources group (at this point you should have **17 various Azure resources deployed**. The important ones to notice are:
-
-  - **Azure Arc-enabled Kubernetes cluster** - Azure Arc-enabled data services deployed in directly connected mode is using this resource to deploy the data services [cluster extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-extensions), as well as using Azure Arc [Custom locations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations).
-
-  - **Custom location** - provides a way for tenant administrators to use their Azure Arc-enabled Kubernetes clusters as a target location for deploying Azure services.
-
-  - **Azure Arc Data Controller** - The data controller that is now deployed on the Kubernetes cluster.
-
-  - **Azure Arc-enabled PostgreSQL** - The PostgreSQL that is now deployed on the Kubernetes cluster.
-
-  ![Screenshot showing addtional Azure resources in the resource group](./25.png)
-
-- As part of the automation, Azure Data Studio is installed along with the _Azure Data CLI_, _Azure CLI_, _Azure Arc_ and the _PostgreSQL_ extensions. Using the Desktop shortcut created for you, open Azure Data Studio and click the Extensions settings to see the installed extensions.
-
-    ![Screenshot showing Azure Data Studio shortcut](./26.png)
-
-    ![Screenshot showing Azure Data Studio extensions](./27.png)
-
-- Additionally, the PostgreSQL connection will be configured automatically for you. As mentioned, the sample _AdventureWorks_ database was restored as part of the automation.
-
-  ![Screenshot showing Azure Data Studio PostgreSQL connection](./28.png)
-
-  > **NOTE: Due to the use of Kubernetes _NodePort_ service in this scenario, the default PostgreSQL connection endpoint port number (5432) was changed to 31111.**
-
-## Cluster extensions
-
-In this scenario, **three** Azure Arc-enabled Kubernetes cluster extensions were deployed:
-
-- `microsoft.azuredefender.kubernetes` - The Azure Defender cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/#create-azure-defender-extensions-instance) scenario.
-
-- `azuremonitor-containers` - The Azure Monitor for containers cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-- `arc-data-services` - The Azure Arc-enabled data services cluster extension that was used throughout this scenario in order to deploy the data services infrastructure.
-
-  In order to view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing Azure Arc-enabled Kubernetes resource](./29.png)
-
-  And we see the installed extensions:
-  ![Screenshot showing Azure Arc-enabled Kubernetes Cluster Extensions settings](./30.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployed resource group from the Azure portal.
-
-  ![Screenshot showing how to delete Azure resource group](./31.png)
-
-<!-- ## Known Issues -->
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/_index.md
deleted file mode 100644
index 9c3355609e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled Kubernetes"
-linkTitle: "Azure Arc-enabled Kubernetes"
-weight: 4
-description: >-
-  The deployment scenarios in this section will guide you through onboarding various Kubernetes distributions as an Azure Arc-enabled Kubernetes clusters.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks/_index.md
deleted file mode 100644
index fd62af122a..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Kubernetes Service (AKS)"
-linkTitle: "Azure Kubernetes Service (AKS)"
-weight: 2
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on creating an AKS cluster in order to simulate an "on-premises" cluster in an automated fashion using either ARM template or Terraform.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/_index.md
deleted file mode 100644
index 7546b69e91..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/_index.md
+++ /dev/null
@@ -1,202 +0,0 @@
----
-type: docs
-title: "AKS cluster ARM template"
-linkTitle: "AKS cluster ARM template"
-weight: 1
-description: >
----
-
-## Deploy AKS cluster and connect it to Azure Arc using an Azure ARM template
-
-The following Jumpstart scenario will guide you on how to use the provided [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview) to deploy an [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster and connected it as an Azure Arc cluster resource.
-
-  > **NOTE: Since AKS is a 1st-party Azure solution and natively supports capabilities such as [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) integration as well as GitOps configurations, it is not expected for an AKS cluster to be projected as an Azure Arc-enabled Kubernetes cluster. Connecting an Azure Kubernetes Service (AKS) cluster to Azure Arc is only required for running Arc enabled services like App Services and Data Services on the cluster.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-  
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User edits the environment variables in the Shell script file (1-time edit) which then be used throughout the deployment.
-
-2. User uploads the script to Azure Cloud Shell and runs the shell script. The script will:
-
-    - Connect to Azure using SPN credentials.
-    - Get AKS credentials.
-    - Install Azure Arc CLI extensions.
-    - Connect the cluster to Azure Arc.
-
-3. User verifies the Arc-enabled Kubernetes cluster.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_k8s_jumpstart%2Faks%2Farm_template%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./01.png)
-
-  ![Screenshot showing Azure portal deployment](./02.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Before deploying the ARM template, determine which AKS Kubernetes versions are available in your region using the below Azure CLI command.
-
-  ```shell
-  az aks get-versions -l "<Your Azure Region>"
-  ```
-
-- The deployment is using the template parameters file. Before initiating the deployment, edit the [*azuredeploy.parameters.json*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.parameters.json) file to match your environment and using one of the available Kubernetes Versions from the previous step.
-
-  ![Screenshot of Azure ARM template](./03.png)
-
-- To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks/arm_template) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --name <The name of this deployment> \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json \
-  --parameters <The *azuredeploy.parameters.json* parameters file location>
-  ```
-
-  For example:
-
-  ```shell
-  az group create --name Arc-AKS-Demo --location "East US"
-  az deployment group create \
-  --resource-group Arc-AKS-Demo \
-  --name arcaksdemo01 \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks/arm_template/azuredeploy.json \
-  --parameters azuredeploy.parameters.json
-  ```
-
-  > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once the ARM template deployment is completed, a new AKS cluster in a new Azure resource group is created.
-
-  ![Screenshot of Azure portal showing AKS resource](./04.png)
-
-  ![Screenshot of Azure portal showing AKS resource](./05.png)
-
-## Connecting to Azure Arc
-
-- Now that you have a running AKS cluster, edit the environment variables section in the included [az_connect_aks](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/arm_template/scripts/az_connect_aks.sh) shell script.
-
-  ![Screenshot of az_connect_aks shell script](./06.png)
-
-  For example:
-
-  ![Screenshot of az_connect_aks shell script](./07.png)
-
-- In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *az_connect_aks* shell script against the AKS cluster. **Make sure Cloud Shell is configured to use Bash.**
-
-  ![Screenshot of Azure Cloud Shell button in Visual Studio Code](./08.png)
-
-- After editing the environment variables in the [*az_connect_aks*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/arm_template/scripts/az_connect_aks.sh) shell script to match your parameters, save the file and then upload it to the Cloud Shell environment and run it using the ```. ./az_connect_aks.sh``` command.
-
-  > **NOTE: The extra dot is due to the script having an *export* function and needs to have the vars exported in the same shell session as the other commands.**
-
-  ![Screenshot showing upload of file to Cloud Shell](./09.png)
-
-  ![Screenshot showing upload of file to Cloud Shell](./10.png)
-
-- Once the script run has finished, the AKS cluster will be projected as a new Azure Arc cluster resource.
-
-  ![Screenshot showing Azure portal with Azure Arc-enabled Kubernetes resource](./11.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./12.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./13.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc cluster resource via the Azure Portal, just select the cluster and delete it.
-
-![Screenshot showing how to delete Azure Arc-enabled Kubernetes resource](./14.png)
-
-If you want to nuke the entire environment, run the below commands.
-
-```shell
-az deployment group delete --name <Deployment name> --resource-group <Azure resource group name>
-```
-
-```shell
-az group delete --name <Azure resource group name> --yes
-```
-
-For example:
-
-```shell
-az deployment group delete --name arcaksdemo01 --resource-group Arc-AKS-Demo
-```
-
-```shell
-az group delete --name Arc-AKS-Demo --yes
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/_index.md
deleted file mode 100644
index 94f365d9cf..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/_index.md
+++ /dev/null
@@ -1,145 +0,0 @@
----
-type: docs
-title: "AKS cluster Terraform plan"
-linkTitle: "AKS cluster Terraform plan"
-weight: 2
-description: >
----
-
-## Deploy AKS cluster and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster and connected it as an Azure Arc-enabled Kubernetes resource.
-
-  > **NOTE: Since AKS is a 1st-party Azure solution and natively supports capabilities such as [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) integration as well as GitOps configurations, it is not expected for an AKS cluster to be projected as an Azure Arc-enabled Kubernetes cluster. Connecting an Azure Kubernetes Service (AKS) cluster to Azure Arc is only required for running Arc enabled services like App Services and Data Services on the cluster.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install Terraform >=1.1.9](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User edits the tfvars to match the environment.
-2. User runs ```terraform init``` to download the required terraform providers.
-3. User is uploading the script to Azure Cloud Shell and running the shell script. The script will:
-
-    - Connect to Azure using SPN credentials.
-    - Get AKS credentials.
-    - Install Azure Arc CLI extensions.
-    - Connecting the cluster to Azure Arc.
-
-4. User verifies the Arc-enabled Kubernetes cluster.
-
-## Deployment
-
-The only thing you need to do before executing the Terraform plan is to create the tfvars file which will be used by the plan. This is based on the Azure service principal you've just created and your subscription.
-
-- Navigate to the [terraform folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks/terraform) and fill in the terraform.tfvars file with the values for your environment.
-
-In addition, validate that the AKS Kubernetes version is available in your region using the below Azure CLI command.
-
-```shell
-az aks get-versions -l "<Your Azure Region>"
-```
-
-In case the AKS service is not available in your region, you can change the AKS Kubernetes version in the [*variables.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/terraform/variables.tf) file by searching for *kubernetes_version*.
-
-- Run the ```terraform init``` command which will download the required terraform providers.
-
-    ![Screenshot showing terraform init being run](./01.png)
-
-- Run the *`terraform apply --auto-approve`* command and wait for the plan to finish.
-
-    Once the Terraform deployment is completed, a new AKS cluster in a new Azure resource group is created.
-
-    ![Screenshot showing terraform plan completing](./02.png)
-
-    ![Screenshot showing Azure portal with AKS resource](./03.png)
-
-    ![Screenshot showing Azure portal with AKS resource](./04.png)
-
-## Connecting to Azure Arc
-
-- Now that you have a running AKS cluster, edit the environment variables section in the included [az_connect_aks](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/terraform/scripts/az_connect_aks.sh) shell script.
-
-    ![Screenshot showing az_connect_aks shell script](./05.png)
-
-    For example:
-
-    ![Screenshot showing az_connect_aks shell script](./06.png)
-
-- In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *az_connect_aks* shell script against the AKS cluster. **Make sure Cloud Shell is configured to use Bash.**
-
-    ![Screenshot showing how to access Cloud Shell in Visual Studio Code](./07.png)
-
-- Edit the environment variables in the [*az_connect_aks*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/terraform/scripts/az_connect_aks.sh) shell script to match your parameters, upload it to the Cloud Shell environment and run it using the *`. ./az_connect_aks.sh`* command.
-
-    > **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Screenshot showing Cloud Shell upload functionality](./08.png)
-
-    ![Screenshot showing Cloud Shell upload functionality](./09.png)
-
-- Once the script run has finished, the AKS cluster will be projected as a new Azure Arc-enabled Kubernetes resource.
-
-    ![Screenshot showing Cloud Shell upload functionality](./10.png)
-
-    ![Screenshot showing Azure portal with Azure Arc-enabled resource](./11.png)
-
-    ![Screenshot showing Azure portal with Azure Arc-enabled resource](./12.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc-enabled Kubernetes resource via the Azure portal, just select the cluster and delete it.
-
-![Screenshot showing delete function in Azure portal](./13.png)
-
-If you want to nuke the entire environment, delete the resource group.
-
-![Screenshot showing delete function in Azure portal](./14.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/_index.md
deleted file mode 100644
index e50fb02d51..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Kubernetes Service (AKS) hybrid"
-linkTitle: "Azure Kubernetes Service (AKS) hybrid"
-weight: 3
-description: >-
-  Azure Kubernetes Service (AKS) hybrid deployment options ("AKS hybrid") is an on-premises implementation. The scenarios in this section will guide on creating an AKS hybrid cluster in order to simulate an "on-premises" cluster in an automated fashion.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/_index.md
deleted file mode 100644
index bcc4c65820..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/_index.md
+++ /dev/null
@@ -1,240 +0,0 @@
----
-type: docs
-title: "AKS Edge Essentials multi-node deployment"
-linkTitle: "AKS Edge Essentials multi-node deployment"
-weight: 2
-description: >
----
-
-## AKS Edge Essentials multi-node deployment with Azure Arc using Azure Bicep
-
-The following Jumpstart scenario will show how to Create an AKS Edge Essentials full deployment with two VMs in Hyper-V nested virtualization in an Azure Windows Server VM, and connect the Hyper-V VMs and AKS Edge Essentials cluster to Azure Arc using [Azure Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview). The provided Azure Bicep templates are responsible for creating the Azure resources as well as executing the LogonScript (AKS Edge Essentials cluster creation and Azure Arc onboarding (Hyper-V VMs and AKS Edge Essentials cluster)) on the Azure Windows Server VM.
-
-> **NOTE: It is not expected to use a nested virtualization in a production environment, let alone using an Azure VM to do so. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-![Architecture diagram](./01.png)
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Create Azure service principal (SP)
-
-    To complete the scenario and its related automation, an Azure service principal with the “Contributor” role assigned is required. To create it, login to your Azure account and run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with ease of use in-mind and adhere to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well as considering use of a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User edits the Azure Bicep template parameters file (1-time edit). These parameter values are used throughout the deployment.
-
-- Main [_main.bicep_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/main.bicep) will initiate the deployment of the following resources:
-
-  - _Virtual Network_ - Virtual Network for Azure Windows Server VM.
-  - _Network Interface_ - Network Interface for Azure Windows Server VM.
-  - _Network Security Group_ - Network Security Group to allow RDP in Azure Windows Server VM.
-  - _Virtual Machine_ - Azure Windows Server VM.
-  - _Custom script_ - Configure the Azure Windows Server virtual machine to host the Hyper-V virtual machines that will act as AKS Edge Essentials nodes.
-
-- User remotes into the Azure Windows Server VM, which automatically kicks off the [_LogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/artifacts/LogonScript.ps1) PowerShell script to create the Hyper-V virtual machines, AKS Edge Essentials cluster, and onboard the Hyper-V VMs and AKS Edge Essentials cluster to Azure Arc.
-
-## Deployment
-
-As mentioned, this deployment will leverage Azure Bicep templates. You will deploy a single template, responsible for creating all the Azure resources in a single resource group as well onboarding the created VM to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the Azure Bicep template, login to Azure using Azure CLI with the ```az login``` command.
-
-- The deployment uses the Azure Bicep parameters file. Before initiating the deployment, edit the [_main.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/main.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template/main.parameters.example.json).
-
-  - _`kubernetesDistribution`_ - Choice (k8s | k3s) kubernetes distribution.
-  - _`spnClientId`_ - Your Azure service principal id.
-  - _`spnClientSecret`_ - Your Azure service principal secret.
-  - _`spnTenantId`_ - Your Azure tenant id.
-  - _`windowsAdminUsername`_ - Azure Windows Server VM Administrator name.
-  - _`windowsAdminPassword`_ - Azure Windows Server VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the Azure Windows Server VM.
-
-- To deploy the Azure Bicep template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full/bicep_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-file <The main.bicep file location> \
-    --parameters <The main.parameters.json parameters file location>
-    ```
-
-    For example:
-
-    ```shell
-    az group create --name AKS-EE-Full-Demo --location "East US"
-    az deployment group create \
-    --resource-group AKS-EE-Full-Demo \
-    --name akseefulldemo \
-    --template-file main.bicep \
-    --parameters main.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in Azure portal.
-
-    ![Screenshot Azure Bicep template output](./02.png)
-
-    ![Screenshot resources in resource group](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to the _AKS-EE-Full-VM_ Azure VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Win-Demo-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _AKS-EE-Full-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing AKS-EE-Full-NSG NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Azure Windows Server VM, use the following steps:
-
-- In the Azure Windows Server VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the Azure Windows Server VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the Azure VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./11.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~25min long.**
-
-    ![Screenshot script output](./12.png)
-
-    ![Screenshot script output](./13.png)
-
-    ![Screenshot script output](./14.png)
-
-    ![Screenshot script output](./15.png)
-
-    ![Screenshot script output](./16.png)
-
-    ![Screenshot script output](./17.png)
-
-    ![Screenshot script output](./18.png)
-
-    ![Screenshot script output](./19.png)
-
-    ![Screenshot script output](./20.png)
-
-    ![Screenshot script output](./21.png)
-
-    ![Screenshot script output](./22.png)
-
-    ![Screenshot script output](./23.png)
-
-    ![Screenshot script output](./24.png)
-
-- Upon successful run, two new Azure Arc-enabled servers and an Azure Arc-enabled Kubernetes cluster will be added to the resource group.
-
-![Screenshot Azure Arc-enabled server on resource group](./25.png)
-
-- You can also run _kubectl get nodes -o wide_ to check the cluster nodes status and _kubectl get pod -A_ to see that the cluster is running and all the needed pods (system, [Azure Arc](https://learn.microsoft.com/azure/azure-arc/kubernetes/overview) and [extension](https://learn.microsoft.com/azure/azure-arc/kubernetes/extensions) [Azure Monitor](https://learn.microsoft.com/azure/azure-monitor/containers/container-insights-overview)) are in running state.
-
-![Screenshot _kubectl get nodes -o wide_ command](./26.png)
-
-![Screenshot _kubectl get pod -A_ command](./27.png)
-
-## Cluster extensions
-
-In this scenario, Azure Arc-enabled Kubernetes cluster Azure Monitor extension was installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-To view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./28.png)
-
-### Exploring logs from the Azure Windows Server VM
-
-Occasionally, you may need to review log output from scripts that run on the _AKS-EE-Full-VM_ VM in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _AKS-EE-Full-VM_ Azure VM. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial _bootstrapping.ps1_ script that runs on _AKS-EE-Full-VM_ Azure VM. |
-| _C:\Temp\LogonScript.log_ | Output of _LogonScript.ps1_ which creates the AKS Edge Essentials cluster, onboard it with Azure Arc creating the needed extensions as well as onboard the Hyper-V VMs. |
-|
-
-![Screenshot showing the Temp folder with deployment logs](./29.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-  ![Screenshot showing Azure resource group deletion](./30.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full_akri/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full_akri/_index.md
deleted file mode 100644
index 558e9751d4..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full_akri/_index.md
+++ /dev/null
@@ -1,283 +0,0 @@
----
-type: docs
-title: "Discover ONVIF cameras with Akri on AKS Edge Essentials multi-node deployment"
-linkTitle: "Discover ONVIF cameras with Akri on AKS Edge Essentials multi-node deployment"
-weight: 4
-description: >
----
-
-## Discover ONVIF cameras with Akri on AKS Edge Essentials multi-node deployment
-
-The following Jumpstart scenario will show how to create an AKS Edge Essentials full deployment with two VMs in Hyper-V nested virtualization in an Azure Windows Server VM, and connect the Hyper-V VMs and AKS Edge Essentials cluster to Azure Arc using [Azure Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview). Once Edge Essentials is deployed [Akri](https://docs.akri.sh/) is installed as a Kubernetes resource interface that exposes an IP mock camera as resources in the Edge Essentials cluster.
-
-Akri is an open-source project for a Kubernetes resource interface that lets you expose heterogenous leaf devices as resources in a Kubernetes cluster. It currently supports OPC UA, ONVIF, and udev protocols, but you can also implement custom protocol handlers provided by the template. In this scenario, Akri is used for handling the dynamic appearance and disappearance of an [ONVIF](https://wikipedia.org/wiki/ONVIF) mock camera as the Discovery Handler.
-
-> **NOTE: It is not expected to use a nested virtualization in a production environment, let alone using an Azure VM to do so. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-![Architecture diagram](./01.png)
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Create Azure service principal (SP)
-
-    To complete the scenario and its related automation, an Azure service principal with the “Contributor” role assigned is required. To create it, login to your Azure account and run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with ease of use in-mind and adhere to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well as considering use of a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User edits the Azure Bicep template parameters file (1-time edit). These parameter values are used throughout the deployment.
-
-- Main [_main.bicep_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/main.bicep) will initiate the deployment of the following resources:
-
-  - _Virtual Network_ - Virtual Network for Azure Windows Server VM.
-  - _Network Interface_ - Network Interface for Azure Windows Server VM.
-  - _Network Security Group_ - Network Security Group to allow RDP in Azure Windows Server VM.
-  - _Virtual Machine_ - Azure Windows Server VM.
-  - _Custom script_ - Configure the Azure Windows Server virtual machine to host the Hyper-V virtual machines that will act as AKS Edge Essentials nodes.
-
-- User remotes into the Azure Windows Server VM, which automatically kicks off the [_LogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/artifacts/LogonScript.ps1) PowerShell script to create the Hyper-V virtual machines, AKS Edge Essentials cluster, onboard the Hyper-V VMs and AKS Edge Essentials cluster to Azure Arc, deploy Akri and the mock camera.
-
-## Deployment
-
-As mentioned, this deployment will leverage Azure Bicep templates. You will deploy a single template, responsible for creating all the Azure resources in a single resource group as well onboarding the created VM to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the Azure Bicep template, login to Azure using Azure CLI with the ```az login``` command.
-
-- The deployment uses the Azure Bicep parameters file. Before initiating the deployment, edit the [_main.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/main.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template/main.parameters.example.json).
-
-  - _`kubernetesDistribution`_ - Choice (k8s | k3s) kubernetes distribution.
-  - _`spnClientId`_ - Your Azure service principal id.
-  - _`spnClientSecret`_ - Your Azure service principal secret.
-  - _`spnTenantId`_ - Your Azure tenant id.
-  - _`windowsAdminUsername`_ - Azure Windows Server VM Administrator name.
-  - _`windowsAdminPassword`_ - Azure Windows Server VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the Azure Windows Server VM.
-
-- To deploy the Azure Bicep template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_full_akri/bicep_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-file <The main.bicep file location> \
-    --parameters <The main.parameters.json parameters file location>
-    ```
-
-    For example:
-
-    ```shell
-    az group create --name AKS-EE-Full-Akri-Demo --location "East US"
-    az deployment group create \
-    --resource-group AKS-EE-Full-Akri-Demo \
-    --name akseefulldemo \
-    --template-file main.bicep \
-    --parameters main.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in Azure portal.
-
-    ![Screenshot resources in resource group](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to the _AKS-EE-Full-VM_ Azure VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Win-Demo-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _AKS-EE-Full-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing AKS-EE-Full-NSG NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Azure Windows Server VM, use the following steps:
-
-- In the Azure Windows Server VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the Azure Windows Server VM](./09.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./10.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the Azure VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./11.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~25min long.**
-
-    ![Screenshot script output](./12.png)
-
-    ![Screenshot script output](./13.png)
-
-    ![Screenshot script output](./14.png)
-
-    ![Screenshot script output](./15.png)
-
-    ![Screenshot script output](./16.png)
-
-    ![Screenshot script output](./17.png)
-
-    ![Screenshot script output](./18.png)
-
-    ![Screenshot script output](./19.png)
-
-    ![Screenshot script output](./20.png)
-
-    ![Screenshot script output](./21.png)
-
-    ![Screenshot script output](./22.png)
-
-    ![Screenshot script output](./23.png)
-
-    ![Screenshot script output](./24.png)
-
-- Upon successful run, two new Azure Arc-enabled servers and an Azure Arc-enabled Kubernetes cluster will be added to the resource group.
-
-![Screenshot Azure Arc-enabled server on resource group](./25.png)
-
-- You can also run _kubectl get nodes -o wide_ to check the cluster nodes status and _kubectl get pod -A_ to see that the cluster is running and all the needed pods (system, [Azure Arc](https://learn.microsoft.com/azure/azure-arc/kubernetes/overview) and [extension](https://learn.microsoft.com/azure/azure-arc/kubernetes/extensions) [Azure Monitor](https://learn.microsoft.com/azure/azure-monitor/containers/container-insights-overview)) are in running state.
-
-![Screenshot _kubectl get nodes -o wide_ command](./26.png)
-
-![Screenshot _kubectl get pod -A_ command](./27.png)
-
-## Cluster extensions
-
-In this scenario, Azure Arc-enabled Kubernetes cluster Azure Monitor extension was installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-To view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./28.png)
-
-## Akri deployment
-
-This scenario deploys Akri and it is used to discover ONVIF cameras that are connected to the same network as your AKS Edge Essentials cluster, in this instance a mock ONVIF camera is deployed as a container. These steps help you get started using Akri to discover IP cameras through the ONVIF protocol and use them via a video broker that enables you to consume the footage from the camera and display it in a web application.
-
-First, verify that Akri can discover the camera, it should be seen as one Akri instance that represents the ONVIF camera:
-
-  ```shell
-    kubectl get akrii
-  ```
-
-  ![Camera as Akri instance](./29.png)
-
-Next, you will need to receive the Linux node IP and the port of your web app service. First, get the port of the web app service by running:
-
-  ```shell
-    kubectl get svc
-  ```
-
-  ![Web App service Port](./30.png)
-
-To get the IP address open Hyper-V manager and access the console of one of the Windows nodes.
-
-  ![Access Console](./31.png)
-
-Once there, authenticate with:
-
-  ```text
-    - Username: Administrator
-    - Password: JS123!!
-  ```
-
-Within the VM, open a PowerShell window and run:
-
-  ```powershell
-    Get-AksEdgeNodeAddr
-  ```
-
-  ![Get AKS edge node](./32.png)
-
-Also from the Windows Hyper-V VM, open the Edge browser and navigate to the service, you should see the video streaming
-
-  ![Video Streaming](./33.png)
-
-### Exploring logs from the Azure Windows Server VM
-
-Occasionally, you may need to review log output from scripts that run on the _AKS-EE-Full-VM_ VM in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _AKS-EE-Full-VM_ Azure VM. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial _bootstrapping.ps1_ script that runs on _AKS-EE-Full-VM_ Azure VM. |
-| _C:\Temp\LogonScript.log_ | Output of _LogonScript.ps1_ which creates the AKS Edge Essentials cluster, onboard it with Azure Arc creating the needed extensions as well as onboard the Hyper-V VMs. |
-|
-
-![Screenshot showing the Temp folder with deployment logs](./34.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-  ![Screenshot showing Azure resource group deletion](./35.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single/_index.md
deleted file mode 100644
index cd07ce188f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single/_index.md
+++ /dev/null
@@ -1,244 +0,0 @@
----
-type: docs
-title: "AKS Edge Essentials single node deployment"
-linkTitle: "AKS Edge Essentials single node deployment"
-weight: 1
-description: >
----
-
-## AKS Edge Essentials single node deployment with Azure Arc using ARM Template
-
-The following Jumpstart scenario will show how to create an AKS Edge Essentials cluster in Azure Windows Server VM and connect the Azure VM and AKS Edge Essentials cluster to Azure Arc using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview). The provided ARM template is responsible for creating the Azure resources as well as executing the LogonScript (AKS Edge Essentials cluster creation and Azure Arc onboarding (Azure VM and AKS Edge Essentials cluster)) on the Azure VM.
-
-Azure VMs leverage the [Azure Instance Metadata Service (IMDS)](https://docs.microsoft.com/azure/virtual-machines/windows/instance-metadata-service) by default to provide information about the VMs, and to manage and configure the VMs. By projecting an Azure VM as an Azure Arc-enabled server, a "conflict" is created which will not allow the Azure Arc server resources to be represented as one resource when the IMDS is being used. Instead, the Azure Arc server will still "act" as a native Azure VM.
-
-However, **for demo purposes only**, the below guide will allow you to use and onboard Azure VMs to Azure Arc. By doing so, you will be able to simulate a server that is deployed outside of Azure (i.e. "on-premises" or in other cloud platforms)
-
-> **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-![Screenshot ARM template output](./01.png)
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Create Azure service principal (SP)
-
-    To complete the scenario and its related automation, an Azure service principal with the “Contributor” role assigned is required. To create it, login to your Azure account and run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with ease of use in-mind and adhere to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well as considering use of a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User edits the ARM template parameters file (1-time edit). These parameter values are used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.json) will initiate the deployment of the following resources:
-
-  - _Virtual Network_ - Virtual Network for Azure Windows Server VM.
-  - _Network Interface_ - Network Interface for Azure Windows Server VM.
-  - _Network Security Group_ - Network Security Group to allow RDP in Azure Windows Server VM.
-  - _Virtual Machine_ - Azure Windows Server VM.
-  - _Custom script and Azure Desired State Configuration extensions_ - Configure the Azure Windows Server VM to host AKS Edge Essentials.
-
-- User remotes into client Windows VM, which automatically kicks off the [_LogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/artifacts/LogonScript.ps1) PowerShell script to create the AKS Edge Essentials cluster in the Windows Server VM, and onboard the Azure VM and AKS Edge Essentials cluster to Azure Arc.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template, responsible for creating all the Azure resources in a single resource group as well onboarding the created VM to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the ARM template, login to Azure using Azure CLI with the ```az login``` command.
-
-- The deployment uses the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.parameters.example.json).
-
-  - _`vmSize`_ - Client Windows VM size.
-  - _`vmName`_ - Client Windows VM name.
-  - _`kubernetesDistribution`_ - Choice (k8s | k3s) kubernetes distribution.
-  - _`windowsNode`_ - Choice (true | false) to deploy AKS Windows Node.
-  - _`adminUsername`_ - Client Windows VM Administrator name.
-  - _`adminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`appId`_ - Your Azure service principal id.
-  - _`password`_ - Your Azure service principal secret.
-  - _`tenantId`_ - Your Azure tenant id.
-  - _`subscriptionId`_ - Your Subscription ID.
-  - _`location`_ - Azure location.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    For example:
-
-    ```shell
-    az group create --name AKS-EE-Demo --location "East US"
-    az deployment group create \
-    --resource-group AKS-EE-Demo \
-    --name akseedemo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in Azure portal.
-
-    ![Screenshot ARM template output](./02.png)
-
-    ![Screenshot resources in resource group](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _AKS-EE-Demo_ Azure VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Win-Demo-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _AKS-EE-Demo-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing AKS-EE-Demo-NSG NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Azure Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the Azure VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~13min long.**
-
-    ![Screenshot script output](./12.png)
-
-    ![Screenshot script output](./13.png)
-
-    ![Screenshot script output](./14.png)
-
-    ![Screenshot script output](./15.png)
-
-    ![Screenshot script output](./16.png)
-
-    ![Screenshot script output](./17.png)
-
-    ![Screenshot script output](./18.png)
-
-    ![Screenshot script output](./19.png)
-
-    ![Screenshot script output](./20.png)
-
-    ![Screenshot script output](./21.png)
-
-- Upon successful run, a new Azure Arc-enabled server and Azure Arc-enabled Kubernetes cluster will be added to the resource group.
-
-![Screenshot Azure Arc-enabled server on resource group](./22.png)
-
-- You can also run _kubectl get nodes -o wide_ to check the cluster node status and _kubectl get pod -A_ to see that the cluster is running and all the needed pods (system, [Azure Arc](https://learn.microsoft.com/azure/azure-arc/kubernetes/overview) and [extension](https://learn.microsoft.com/azure/azure-arc/kubernetes/extensions) [Azure Monitor](https://learn.microsoft.com/azure/azure-monitor/containers/container-insights-overview)) are in running state.
-
-![Screenshot kubectl get nodes -o wide](./23.png)
-
-![Screenshot kubectl get pod -A](./24.png)
-
-## Cluster extensions
-
-In this scenario, Azure Arc-enabled Kubernetes cluster Azure Monitor extension was installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-To view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./25.png)
-
-### Exploring logs from the Client VM
-
-Occasionally, you may need to review log output from scripts that run on the _AKS-EE-Demo_ VM in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _AKS-EE-Demo_ Azure VM. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial _bootstrapping.ps1_ script that runs on _AKS-EE-Demo_ Azure VM. |
-| _C:\Temp\LogonScript.log_ | Output of _LogonScript.ps1_ which creates the AKS Edge Essentials cluster, onboard it with Azure Arc creating the needed extensions as well as onboard the Azure VM. |
-|
-
-![Screenshot showing the Temp folder with deployment logs](./26.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./27.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/_index.md
deleted file mode 100644
index 5b7bece8bf..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/_index.md
+++ /dev/null
@@ -1,281 +0,0 @@
----
-type: docs
-title: "Discover ONVIF cameras with Akri on AKS Edge Essentials single node deployment"
-linkTitle: "Discover ONVIF cameras with Akri on AKS Edge Essentials single node deployment"
-weight: 3
-description: >
----
-
-## Discover ONVIF cameras with Akri on AKS Edge Essentials single node deployment 
-
-The following Jumpstart scenario will show how to create an AKS Edge Essentials single node deployment in an Azure Windows Server VM and connect the Azure VM and AKS Edge Essentials cluster to Azure Arc. The provided ARM template is responsible for creating the Azure resources as well as executing the LogonScript (AKS Edge Essentials cluster creation, Azure Arc onboarding (Azure VM and AKS Edge Essentials cluster) and Akri deployment) on the Azure VM. Once Edge Essentials is deployed [Akri](https://docs.akri.sh/) is installed as a Kubernetes resource interface that exposes an IP mock camera as resources in the Edge Essentials cluster.
-
-Akri is an open-source project for a Kubernetes resource interface that lets you expose heterogenous leaf devices as resources in a Kubernetes cluster. It currently supports OPC UA, ONVIF, and udev protocols, but you can also implement custom protocol handlers provided by the template. In this scenario, Akri is used for handling the dynamic appearance and disappearance of an [ONVIF](https://wikipedia.org/wiki/ONVIF) mock camera as the Discovery Handler.
-
-Azure VMs leverage the [Azure Instance Metadata Service (IMDS)](https://docs.microsoft.com/azure/virtual-machines/windows/instance-metadata-service) by default to provide information about the VMs, and to manage and configure the VMs. By projecting an Azure VM as an Azure Arc-enabled server, a "conflict" is created which will not allow the Azure Arc server resources to be represented as one resource when the IMDS is being used. Instead, the Azure Arc server will still "act" as a native Azure VM.
-
-However, **for demo purposes only**, the below guide will allow you to use and onboard Azure VMs to Azure Arc. By doing so, you will be able to simulate a server that is deployed outside of Azure (i.e. "on-premises" or in other cloud platforms)
-
-> **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-![Screenshot ARM template output](./01.png)
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Create Azure service principal (SP)
-
-    To complete the scenario and its related automation, an Azure service principal with the “Contributor” role assigned is required. To create it, login to your Azure account and run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with ease of use in-mind and adhere to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well as considering use of a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User edits the ARM template parameters file (1-time edit). These parameter values are used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.json) will initiate the deployment of the following resources:
-
-  - _Virtual Network_ - Virtual Network for Azure Windows Server VM.
-  - _Network Interface_ - Network Interface for Azure Windows Server VM.
-  - _Network Security Group_ - Network Security Group to allow RDP in Azure Windows Server VM.
-  - _Virtual Machine_ - Azure Windows Server VM.
-  - _Custom script and Azure Desired State Configuration extensions_ - Configure the Azure Windows Server VM to host AKS Edge Essentials.
-
-- User remotes into client Windows VM, which automatically kicks off the [_LogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/artifacts/LogonScript.ps1) PowerShell script to:
-  - Create the AKS Edge Essentials cluster in the Windows Server VM
-  - Onboard the Azure VM and AKS Edge Essentials cluster to Azure Arc
-  - Deploy Akri and ONVIF mock camera
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template, responsible for creating all the Azure resources in a single resource group as well onboarding the created VM to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the ARM template, login to Azure using Azure CLI with the ```az login``` command.
-
-- The deployment uses the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.parameters.example.json).
-
-  - _`vmSize`_ - Client Windows VM size.
-  - _`vmName`_ - Client Windows VM name.
-  - _`kubernetesDistribution`_ - Choice (k8s | k3s) kubernetes distribution.
-  - _`windowsNode`_ - Choice (true | false) to deploy AKS Windows Node.
-  - _`adminUsername`_ - Client Windows VM Administrator name.
-  - _`adminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`appId`_ - Your Azure service principal id.
-  - _`password`_ - Your Azure service principal secret.
-  - _`tenantId`_ - Your Azure tenant id.
-  - _`subscriptionId`_ - Your Subscription ID.
-  - _`location`_ - Azure location.
-  - _`deployBastion`_ - Choice (true | false) to deploy Azure Bastion or not to connect to the client VM.
-  - _`bastionHostName`_ - Azure Bastion name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region>
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-    For example:
-
-    ```shell
-    az group create --name AKS-EE-Akri-Demo --location "East US"
-    az deployment group create \
-    --resource-group AKS-EE-Akri-Demo \
-    --name akseedemo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_akri/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned, you will be able to see them in Azure portal.
-
-    ![Screenshot ARM template output](./02.png)
-
-    ![Screenshot resources in resource group](./03.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _AKS-EE-Demo_ Azure VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Win-Demo-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _AKS-EE-Demo-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing AKS-EE-Demo-NSG NSG with blocked RDP](./04.png)
-
-  ![Screenshot showing adding a new inbound security rule](./05.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./06.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./07.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./08.png)
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Azure Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./10.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./11.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the Azure VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./09.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~13min long.**
-
-    ![Screenshot script output](./12.png)
-
-    ![Screenshot script output](./13.png)
-
-    ![Screenshot script output](./14.png)
-
-    ![Screenshot script output](./15.png)
-
-    ![Screenshot script output](./16.png)
-
-    ![Screenshot script output](./17.png)
-
-    ![Screenshot script output](./18.png)
-
-    ![Screenshot script output](./19.png)
-
-    ![Screenshot script output](./20.png)
-
-    ![Screenshot script output](./21.png)
-
-- Upon successful run, a new Azure Arc-enabled server and Azure Arc-enabled Kubernetes cluster will be added to the resource group.
-
-![Screenshot Azure Arc-enabled server on resource group](./22.png)
-
-- You can also run _kubectl get nodes -o wide_ to check the cluster node status and _kubectl get pod -A_ to see that the cluster is running and all the needed pods (system, [Azure Arc](https://learn.microsoft.com/azure/azure-arc/kubernetes/overview) and [extension](https://learn.microsoft.com/azure/azure-arc/kubernetes/extensions) [Azure Monitor](https://learn.microsoft.com/azure/azure-monitor/containers/container-insights-overview)) are in running state.
-
-![Screenshot kubectl get nodes -o wide](./23.png)
-
-![Screenshot kubectl get pod -A](./24.png)
-
-## Cluster extensions
-
-In this scenario, Azure Arc-enabled Kubernetes cluster Azure Monitor extension was installed:
-
-- _azuremonitor-containers_ - The Azure Monitor Container Insights cluster extension. To learn more about it, you can check our Jumpstart ["Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/) scenario.
-
-To view these cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes installed extensions](./25.png)
-
-## Akri deployment
-
-This scenario deploys Akri and it is used to discover ONVIF cameras that are connected to the same network as your AKS Edge Essentials cluster, in this instance a mock ONVIF camera is deployed as a container. These steps help you get started using Akri to discover IP cameras through the ONVIF protocol and use them via a video broker that enables you to consume the footage from the camera and display it in a web application.
-
-First, verify that Akri can discover the camera, it should be seen as one Akri instance that represents the ONVIF camera:
-
-  ```shell
-    kubectl get akrii
-  ```
-
-  ![Camera as Akri instance](./26.png)
-
-Next, you will need to receive the Linux node IP and the port of your web app service. First, get the port of the web app service by running:
-
-  ```shell
-    kubectl get svc
-  ```
-
-  ![Web App service Port](./27.png)
-
-  ```powershell
-    Get-AksEdgeNodeAddr
-  ```
-
-  ![Get AKS edge node](./28.png)
-
-Open the Edge browser and navigate to the service, you should see the video streaming
-
-  ![Video Streaming](./29.png)
-
-### Exploring logs from the Client VM
-
-Occasionally, you may need to review log output from scripts that run on the _AKS-EE-Demo_ VM in case of deployment failures. To make troubleshooting easier, the scenario deployment scripts collect all relevant logs in the _C:\Temp_ folder on _AKS-EE-Demo_ Azure VM. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\Temp\Bootstrap.log_ | Output from the initial _bootstrapping.ps1_ script that runs on _AKS-EE-Demo_ Azure VM. |
-| _C:\Temp\LogonScript.log_ | Output of _LogonScript.ps1_ which creates the AKS Edge Essentials cluster, onboard it with Azure Arc creating the needed extensions as well as onboard the Azure VM. |
-|
-
-![Screenshot showing the Temp folder with deployment logs](./30.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing Azure resource group deletion](./31.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/_index.md
deleted file mode 100644
index 6c8db3ddfc..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "AKS on Azure Stack HCI"
-linkTitle: "AKS on Azure Stack HCI"
-weight: 4
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on creating an AKS cluster on Azure Stack HCI in an automated fashion.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/_index.md
deleted file mode 100644
index b508151136..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/_index.md
+++ /dev/null
@@ -1,203 +0,0 @@
----
-type: docs
-title: "AKS on Azure Stack HCI PowerShell"
-linkTitle: "AKS on Azure Stack HCI PowerShell"
-weight: 1
-description: >
----
-
-## Deploy AKS cluster on Azure Stack HCI and connect it to Azure Arc using PowerShell
-
-The following Jumpstart scenario will guide you on how to use the provided PowerShell script to deploy an [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster on [Azure Stack HCI](https://docs.microsoft.com/azure-stack/hci/overview) and connected it as an Azure Arc cluster resource.
-
-Azure Kubernetes Service on Azure Stack HCI is an implementation of AKS on-premises using hyperconverged infrastructure operating system that is delivered as an Azure service.  
-
-This guide will not provide instructions on how to deploy and set up Azure Stack HCI and it assumes you already have a configured cluster. The commands described in this scenario should be run on the management computer or in a host server in a cluster.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-  
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, an Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account using PowerShell and run the below command. To do this, you will need to run the script from a PowerShell session that has access to your AKS on the Azure Stack HCI environment.
-
-    ```powershell
-    Connect-AzAccount
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    For example:
-
-    ```powershell
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    This command will create a variable with a secure string as shown below:
-
-    ```shell
-    Secret                : System.Security.SecureString
-    ServicePrincipalNames : {XXXXXXXXXXXXXXXXXXXXXXXXXXXX, http://AzureArcK8s}
-    ApplicationId         : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    ObjectType            : ServicePrincipal
-    DisplayName           : AzureArcK8s
-    Id                    : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Type                  :
-    ```
-
-    To expose the generated password use this code to export the secret:
-
-    ```powershell
-    $BSTR = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($sp.Secret)
-    $UnsecureSecret = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR)
-    ```
-
-    Copy the Service Principal ApplicationId and Secret as you will need it for later in the automation.
-
-    > **NOTE: It is optional but highly recommended to scope the SP to a specific [Azure subscription and resource group](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal?view=azps-5.4.0)**
-
-- Enable your subscription with the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```powershell
-  Register-AzResourceProvider -ProviderNamespace Microsoft.Kubernetes
-  Register-AzResourceProvider -ProviderNamespace Microsoft.KubernetesConfiguration
-  Get-AzResourceProvider -ListAvailable | Select-Object ProviderNamespace, RegistrationState | Select-String  -Pattern "Microsoft.Kubernetes"
-  ```
-
-- Perform a clean installation of the AksHci PowerShell module. To install the AksHci PowerShell module remove any previous versions by running the below commands:
-
-  ```powershell
-  Install-PackageProvider -Name NuGet -Force 
-  Install-Module -Name PowershellGet -Force -Confirm:$false -SkipPublisherCheck
-  Install-Module -Name Az.Accounts -Repository PSGallery 
-  Install-Module -Name Az.Resources -Repository PSGallery 
-  Install-Module -Name AzureAD -Repository PSGallery 
-  Install-Module -Name AksHci -Repository PSGallery
-  Import-Module Az.Accounts
-  Import-Module Az.Resources
-  Import-Module AzureAD
-  Import-Module AksHci
-  Exit
-  ```
-  
-- Once completed, close all PowerShell windows and verify the installation by tunning the following:
-
-  ```powershell
-  Get-Command -Module AksHci
-  ```
-
-  ![Screenshot AksHci module installation](./01.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the PowerShell script environment variables (1-time edit). These variables values are being used throughout the deployment and Azure Arc onboarding.
-
-- User is running checks on every physical node of Azure Stack HCI to see if all the requirements are satisfied.
-
-- User is running the PowerShell script to deploy a basic DHCP AKS cluster on Azure Stack HCI and onboard onto Azure Arc. Runtime script will:
-
-  - Configure the Azure Kubernetes Service cluster management services using _Set-AksHciConfig_ cmdlet.
-  - Register Azure Kubernetes Service on Azure Stack HCI with Azure ysing _Set-AksHciRegistration_ cmdlet.
-  - Start the deployment of the AKS cluster management services using the _Install-AksHci_ cmdlet.
-  - Retrieve the Azure Kubernetes Service cluster credentials.  
-  - Create a target cluster with the number of Linux and Windows nodes specified.
-  - Onboard the AKS cluster to Azure Arc.
-  
-## Deployment
-
-- Before deploying AKS on Azure Stack HCI, you need to run checks on every physical node to see if all the requirements are satisfied. Open PowerShell as an administrator and run the following command.
-
-  ```powershell
-  Initialize-AksHciNode
-  ```
-
-- Now that all nodes are ready, you will deploy the AKS control management and the target cluster to your Azure Stack HCI using this [PowerShell script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_stack_hci/powershell/aks_hci_deploy.ps1). Edit the file to provide the environment variables that match the parameters of your environment:
-
-  - **vnetName:** the name of the vnet to host your AKS on HCI deployment.
-  - **vSwitchName:** the name of the external virtual switch to connect the virtual machines to. If you already have an external switch on the host, you should pass the name of the switch here. To get the name of your available switches run the command _Get-VMSwitch_.
-  - **vipPoolStart:** first IP address for the cluster VIP Pool. The IP addresses in the VIP pool will be used for the API Server and for Kubernetes services.
-  - **vipPoolEnd:** last IP address for the cluster VIP Pool. The IP addresses in the VIP pool will be used for the API Server and for Kubernetes services.
-  - **k8sNodeIpPoolStart:** The start IP address of a VM pool. The address must be in range of the subnet.
-  - **k8sNodeIpPoolEnd:** The end IP address of a VM pool. The address must be in range of the subnet.
-  - **ipAddressPrefix:** The address prefix to use for Static IP assignment.
-  - **gateway:** The IP address of the default gateway of the subnet.
-  - **dnsServers:**  An array of IP addresses pointing to the DNS servers to be used for the subnet, you should provide at least one.
-  - **imageDir:** path to the directory where AKS on Azure Stack HCI will store its VHD images, provide a shared path or SMB for multinode
-  - **cloudConfigLocation:** path to the directory where the cloud agent will store its configuration, provide a shared path or SMB for multi-node.
-  - **clusterName:** a name for your AKS cluster, **must be lowercase**.
-  - **linuxNodeCount:** number of Linux node VMs for your cluster.
-  - **resourceGroup:** resource group to connect your Azure Arc-enabled Kubernetes cluster.
-  - **location:** Azure region to connect your Azure Arc-enabled Kubernetes cluster.
-  - **subscriptionId:** subscription to connect your Azure Arc-enabled Kubernetes cluster.
-  - **appId:** the appID of the service principal created previously.
-  - **password:** the password of the service principal created.
-  - **tenant:** your tenantID.
-
-  ![Screenshot showing the AKS on HCI deployment script](./02.png)
-
-- As an example:
-  - **vnetName:** 'mgmtvnet'
-  - **vSwitchName:** 'InternalNAT'
-  - **vipPoolStart** '192.168.0.150'
-  - **vipPoolEnd** '192.168.0.250'
-  - **k8sNodeIpPoolStart** '192.168.0.3'
-  - **k8sNodeIpPoolEnd** '192.168.0.149'
-  - **ipAddressPrefix** '192.168.0.0/16'
-  - **gateway** '192.168.0.1'
-  - **dnsServers** '192.168.0.1'
-  - **imageDir** 'C:\AKS-HCI\Image'
-  - **cloudConfigLocation:** 'C:\AKS-HCI\Config'
-  - **clusterName:** 'archcidemo'
-  - **linuxNodeCount:** 1
-  - **resourceGroup:** 'Arc-AKS-HCI-Demo'
-  - **location:** eastus
-  - **subscriptionId:** 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX'
-  - **appId:** 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX'
-  - **password:** 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX'
-  - **tenant:** 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX'
-
-- Note that the script will deploy a simple static IP address based cluster on your Azure Stack HCI and there are additional optional parameters that you could use to customize the deployment to your own environment as described [here](https://docs.microsoft.com/azure-stack/aks-hci/kubernetes-walkthrough-powershell).
-
-- To run the script open PowerShell as an administrator, navigate to the [script folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_stack_hci/powershell/) and run:
-
-  ```powershell
-  .\aks_hci_deploy.ps1
-  ```
-
-  ![Screenshot showing the AKS on HCI deployment script running](./03.png)
-
-  ![Screenshot showing the AKS on HCI deployment script running](./04.png)
-
-  > **NOTE: the script may take around 30 minutes to run**
-
-  ![Screenshot showing the script output](./05.png)
-
-- You should also see the new AKS cluster on Windows Admin Center.
-
-  ![Screenshot showing the AKS on HCI deployment Windows Admin Center](./06.png)
-
-- Once the script run has finished, the AKS cluster on HCI will be projected as a new Azure Arc-enabled Kubernetes cluster resource.
-
-  ![Screenshot showing Arc-enabled Kubernetes in RG](./07.png)
-
-  ![Screenshot showing Arc-enabled Kubernetes](./08.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc-enabled Kubernetes cluster resource via the Azure Portal, just select the cluster and delete it.
-
-![Screenshot showing how to delete Azure Arc-enabled Kubernetes resource](./09.png)
-
-To delete the AKS cluster on HCI run the below command.
-
-```powershell
-Remove-AksHciCluster -name archcidemo
-```
-
-![Screenshot showing how to delete AKS cluster on HCI](./10.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/alibaba/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/alibaba/_index.md
deleted file mode 100644
index 442f55e44d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/alibaba/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Alibaba Cloud Container Service for Kubernetes"
-linkTitle: "Alibaba Cloud Container Service for Kubernetes"
-weight: 9
-description: >-
-  If you are working in a multi-cloud environment, the scenario in this section will guide on creating a Alibaba Cloud Container Service for Kubernetes and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion using Terraform.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/alibaba/alibaba_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/alibaba/alibaba_terraform/_index.md
deleted file mode 100644
index b115048ee6..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/alibaba/alibaba_terraform/_index.md
+++ /dev/null
@@ -1,222 +0,0 @@
----
-type: docs
-title: "Alibaba Cloud Container Service for Kubernetes Terraform plan"
-linkTitle: "Alibaba Cloud Container Service for Kubernetes Terraform plan"
-weight: 1
-description: >
----
-
-## Deploy Alibaba Cloud Container Service for Kubernetes cluster and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an Alibaba Cloud [Container Service for Kubernetes (ACK)](https://www.alibabacloud.com/product/kubernetes) and connect it as an Azure Arc cluster resource.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Install or update Helm to version 3.5.3 and above](https://helm.sh/docs/intro/install/). Use the below command to check your current installed version.
-
-  ```shell
-  helm version
-  ```
-
-* (Optional) [Install or update Aliyun CLI to latest version 3.0.73 and above](https://github.com/aliyun/aliyun-cli). Use the below command to check your current installed version.
-
-  > **NOTE: Ālǐyún or Aliyun is actually the chinese name for Alibaba Cloud**
-
-  ```shell
-  aliyun --version
-  ```
-
-* [Install Terraform >=1.0](https://learn.hashicorp.com/terraform/getting-started/install.html). Use the below command to check your current installed version.
-
-  ```shell
-  terraform -v
-  ```
-
-* [Enable Azure subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes. Login with an identity with sufficient authorizations.
-
-  ```shell
-  az login
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  ```
-
-* Install the Azure Arc for Kubernetes CLI extensions ***connectedk8s*** and ***k8s-configuration***:
-
-  ```shell
-  az extension add --name connectedk8s
-  az extension add --name k8s-configuration
-  ```
-
-  > **NOTE: If you already used this guide before and/or have the extensions installed, use the bellow commands:**
-
-  ```shell
-  az extension update --name connectedk8s
-  az extension update --name k8s-configuration
-  ```
-
-### Create a new Alibaba Cloud access key
-
-* [Sign up to or have an Alibaba Cloud account](https://www.alibabacloud.com/) - domestic or international
-
-  > **NOTE: The screenshots and sample outputs shown here are based on a domestic account.**
-
-* Browse to <https://console.aliyun.com/> and login with your Alibaba Cloud account. Once logged in, create a new access key from your profile. After creating it, be sure to copy down the access and secret key.
-
-  ![Alibaba Cloud new access key](./01.png)
-
-  ![Alibaba Cloud new access key](./02.png)
-
-  ![Alibaba Cloud new access key](./03.png)
-
-* Navigate to product *Container Service - Kubernetes*, activate this service and if demanded **Confirm Cloud Resource Access Authorization**
-
-  ![Cloud Resource Access Authorization](./04.png)
-
-## Deployment
-
-The only thing you need to do before executing the Terraform plan is to export the environment variables which will be used by the plan. This is based on the Azure service principal you've just created and your subscription.  
-
-* Export the environment variables needed for the Terraform plan.
-
-  ```shell
-  export ALICLOUD_ACCESS_KEY="<Your Alibaba Cloud access key>"
-  export ALICLOUD_SECRET_KEY="<Your Alibaba Cloud secret key>"
-  export ALICLOUD_REGION="<Alibaba Cloud region>"
-  export ALICLOUD_PROFILE="<Aliyun CLI profile>"
-  export AZURE_SUBSCRIPTION_ID="<Your Azure subscription id>"
-  export AZURE_LOCATION="<Azure location>"
-  export AZURE_RESOURCE_GROUP="<Azure resource group>"
-  export AZURE_CLUSTER_NAME="<Azure Arc cluster name>"
-  ```
-
-  For example:
-
-  ```shell
-  export ALICLOUD_ACCESS_KEY="aBcDeFgHiJkLmNo"
-  export ALICLOUD_SECRET_KEY="aBcDeFgHiJkLmNoPqRtUvWxYz"
-  export ALICLOUD_REGION="cn-shanghai"
-  export ALICLOUD_PROFILE="akProfile"
-  export AZURE_SUBSCRIPTION_ID="XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-  export AZURE_LOCATION="southeastasia"
-  export AZURE_RESOURCE_GROUP="Azure-Arc-Aliyun-K8s"
-  export AZURE_CLUSTER_NAME="azure-arc-aliyun"
-  ```
-
-  > **NOTE: If you are running in a PowerShell environment, to set the Terraform environment variables, use the _$env:variable-name=variable-value_ (see example below)**
-
-  ```powershell
-  $env:ALICLOUD_ACCESS_KEY="aBcDeFgHiJkLmNo"
-  ```
-
-* From folder `azure_arc_k8s_jumpstart/alibaba/terraform` run the ```terraform init``` command which will download the required terraform providers.
-
-  ![terraform init output](./05.png)
-
-* Deploy cluster by running the below command and wait for the plan to finish.
-
-  ```shell
-  terraform apply --auto-approve
-  ```
-
-  ![terraform deploy output](./06.png)
-  ![terraform deploy output](./07.png)
-
-
-  Sample cluster in Alibaba Cloud Resource Management view:
-
-  ![Alibaba Cloud Resource Management](./08.png)
-
-* The plan will create the _kubeconfig_ file in the home directory `~/.kube/config_alicloudArc`. You can either use this directly or merge it into your _kubeconfig_ to be used with `kubectl` or `helm`.
-
-   ```shell
-   cp ~/.kube/config ~/.kube/config_old
-   KUBECONFIG=~/.kube/config_old:~/.kube/config_alicloudArc kubectl config view --flatten > ~/.kube/config
-   ```
-
-  Get the name of your newly generated kubeconfig:
-  ```shell
-  kubectl config get-contexts
-  ```
-  Use the newly generated kubeconfig:
-  ```shell
-  kubectl config use-context <new config name>
-  ```
-
-## Connecting to Azure Arc
-
-* Now that you have a running cluster, based on the environment variables set and Azure environment prepared above, you can connect the Alibaba Cloud cluster to Azure Arc:
-
-  ```shell
-  az login
-  az account set -s $AZURE_SUBSCRIPTION_ID
-  az group create --location $AZURE_LOCATION --name $AZURE_RESOURCE_GROUP
-  ```
-
-  Output should look like this:
-
-  ```json
-  {
-    "id": "/subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourceGroups/Azure-Arc-Aliyun-K8S",
-    "location": "southeastasia",
-    "managedBy": null,
-    "name": "Azure-Arc-Aliyun-K8S",
-    "properties": {
-      "provisioningState": "Succeeded"
-    },
-    "type": "Microsoft.Resources/resourceGroups"
-  }
-  ```
-
-  connect the cluster:
-
-  ```shell
-  az connectedk8s connect --name $AZURE_CLUSTER_NAME --resource-group $AZURE_RESOURCE_GROUP --location $AZURE_LOCATION --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-  ![Connect Alibaba cluster to Azure Arc](./09.png)
-
-  ![Connect Alibaba cluster to Azure Arc](./10.png)
-
-## Delete the deployment
-
-In Azure, the most straightforward way is to delete the resource group via the Azure Portal or through the CLI.
-
-```shell
-az --resource-group $AZURE_RESOURCE_GROUP -y
-```
-
-![Delete resource group in Azure Portal](./11.png)
-
-To delete the environment in Alibaba Cloud, use Terraform.
-
-```shell
-terraform refresh
-terraform destroy --auto-approve
-```
-
-> **NOTE: `terraform refresh` will update the local state to that `terraform destroy` also handles automatically generated resources like _Elastic IP Address_ and/or _NAT Gateway_.**
-
-output:
-
-```text
-Destroy complete! Resources: 8 destroyed.
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aro/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aro/_index.md
deleted file mode 100644
index 6750c8a875..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aro/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Red Hat OpenShift"
-linkTitle: "Azure Red Hat OpenShift"
-weight: 6
-description: >-
-  If you do not yet have an Azure Red Hat OpenShift cluster, the scenarios in this section will guide you on how to create an Azure-managed OpenShift cluster in an automated fashion and onboard it as an Azure Arc-enabled Kubernetes cluster.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/aro/aro_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/aro/aro_arm_template/_index.md
deleted file mode 100644
index 263b0fd694..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/aro/aro_arm_template/_index.md
+++ /dev/null
@@ -1,202 +0,0 @@
----
-type: docs
-title: "ARO cluster ARM template"
-linkTitle: "ARO cluster ARM template"
-weight: 1
-description: >
----
-
-## Deploy an Azure Red Hat OpenShift cluster and connect it to Azure Arc using an Azure ARM template
-
-The following Jumpstart scenario will guide you on how to use the provided [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview) to deploy an [Azure Red Hat OpenShift](https://docs.microsoft.com/azure/openshift/intro-openshift) cluster and connected it as an Azure Arc cluster resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Owner” role, or “Contributor” and “User Access Administrator” roles are required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "User access administrator" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "User access administrator" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the resource providers for Azure Arc-enabled Kubernetes and Azure Red Hat OpenShift. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes --wait
-  az provider register --namespace Microsoft.KubernetesConfiguration --wait
-  az provider register --namespace Microsoft.ExtendedLocation --wait
-  az provider register --namespace Microsoft.RedHatOpenShift --wait
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  az provider show -n Microsoft.RedHatOpenShift -o table
-  ```
-
-- Check your subscription quota for the DSv3 family.
-
-    > **NOTE: Azure Red Hat OpenShift requires a [minimum of 40 cores](/azure/openshift/tutorial-create-cluster#before-you-begin) to create and run an OpenShift cluster.**
-
-  ```shell
-  LOCATION=eastus
-  az vm list-usage -l $LOCATION --query "[?contains(name.value, 'standardDSv3Family')]" -o table
-  ```
-
-  ![Screenshot of checking DSV3 family cores usage](./01.png)
-
-- Get the Azure Red Hat OpenShift resource provider Id which needs to be assigned with the “Contributor” role.
-
-  ```shell
-  az ad sp list --filter "displayname eq 'Azure Red Hat OpenShift RP'" --query "[?appDisplayName=='Azure Red Hat OpenShift RP'].{name: appDisplayName, objectId: id}"
-  ```
-
-  ![Screenshot of Azure resource provider for Aro](./02.png)
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User provides the ARM template parameter values, either via the portal or editing the [ARM template parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aro/arm_template/azuredeploy.parameters.json) (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_ ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aro/arm_template/azuredeploy.json) will initiate the deployment of the Azure Red Hat OpenShift cluster and the virtual network.
-
-- User edits the environment variables section in the in the [az_connect_aro.sh script file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aro/arm_template/scripts/az_connect_aro.sh) (1-time edit). These variables' values will be used throughout the deployment.
-
-- At a high level, the script will then perform the following tasks:
-  - Install the required Azure Arc-enabled Kubernetes required Azure CLI extension
-  - Automatically login to Azure using the provided service principal credentials and will create the deployment Azure resource group
-  - Download and install all the Azure Red Hat OpenShift CLI.
-  - Onboard the cluster as an Azure Arc-enabled Kubernetes cluster
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_k8s_jumpstart%2Faro%2Farm_template%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- The deployment is using the template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aro/arm_template/azuredeploy.parameters.json) file to match your environment.
-
-  ![Screenshot of Azure ARM template](./05.png)
-
-  To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aro/arm_template) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --name <The name of this deployment> \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aro/arm_template/azuredeploy.json \
-  --parameters <The _azuredeploy.parameters.json_ parameters file location>
-  ```
-
-  For example:
-
-  ```shell
-  az group create --name Arc-Aro-Demo --location "East US"
-  az deployment group create \
-  --resource-group Arc-Aro-Demo \
-  --name arcarodemo01 \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aro/arm_template/azuredeploy.json \
-  --parameters azuredeploy.parameters.json
-  ```
-
-    > **NOTE: It normally takes about ~30-40 minutes for the ARO cluster to deploy.**
-
-- Once the ARM template deployment is completed, a new Azure Red Hat OpenShift cluster in a new Azure resource group is created.
-
-  ![Screenshot of Azure Portal showing Aro resource](./06.png)
-
-  ![Screenshot of Azure Portal showing Aro resource](./07.png)
-
-## Connecting to Azure Arc
-
-- Now that you have a running Azure Red Hat OpenShift cluster, edit the environment variables section in the included [az_connect_aro](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aro/arm_template/scripts/az_connect_aro.sh) shell script.
-
-  ![Screenshot of az_connect_aro shell script](./08.png)
-
-- In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *az_connect_aro* shell script against the Aro cluster. **Make sure Cloud Shell is configured to use Bash.**
-
-  ![Screenshot of Azure Cloud Shell button in Visual Studio Code](./09.png)
-
-- After editing the environment variables in the [*az_connect_aro*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aro/arm_template/scripts/az_connect_aro.sh) shell script to match your parameters, save the file and then upload it to the Cloud Shell environment and run it using the ```. ./az_connect_aro.sh``` command.
-
-  > **NOTE: The extra dot is due to the script having an *export* function and needs to have the vars exported in the same shell session as the other commands.**
-
-  ![Screenshot showing upload of file to Cloud Shell](./10.png)
-
-  ![Screenshot showing upload of file to Cloud Shell](./11.png)
-
-- Once the script run has finished, the Aro cluster will be projected as a new Azure Arc-enabled Kubernetes cluster resource.
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./12.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./13.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./14.png)
-
-## Logging
-
-For ease of troubleshooting and tracking, a deployment log will be created automatically as part of the script runtime. To view the deployment log use the below command:
-
-```shell
-cat /home/<USER>/jumpstart_logs/onboardARO.log
-```
-
-## Cleanup
-
-To delete the entire deployment, simply delete the resource group from the Azure portal.
-
-![Screenshot showing how to delete Azure Arc-enabled Kubernetes resource](./15.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/cluster_api/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/cluster_api/_index.md
deleted file mode 100644
index 4b945118d5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/cluster_api/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Kubernetes Cluster API"
-linkTitle: "Kubernetes Cluster API"
-weight: 5
-description: >-
-  If you are working in a multi-cloud environment, the scenarios in this section will guide on creating clusters using Kubernetes Cluster API (CAPI) and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/_index.md
deleted file mode 100644
index 6c6c3872b2..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/_index.md
+++ /dev/null
@@ -1,173 +0,0 @@
----
-type: docs
-title: "Cluster API Azure Provider"
-linkTitle: "Cluster API Azure Provider"
-weight: 1
-description: >
----
-
-## Deploy Kubernetes cluster and connect it to Azure Arc using Cluster API Azure provider
-
-The following Jumpstart scenario will guide you on how to deploy a Kubernetes cluster in Azure virtual machines and connected it as an Azure Arc cluster resource by using the [Kubernetes Cluster API (CAPI) project](https://cluster-api.sigs.k8s.io/introduction.html) and it's [Cluster API Azure provider (CAPZ)](https://cloudblogs.microsoft.com/opensource/2020/12/15/introducing-cluster-api-provider-azure-capz-kubernetes-cluster-management/).
-
-## Architecture (In a nutshell)
-
-From the Cluster API Book docs:
-
-"Cluster API requires an existing Kubernetes cluster accessible via kubectl; during the installation process the Kubernetes cluster will be transformed into a management cluster by installing the Cluster API provider components, so it is recommended to keep it separated from any application workload."
-
-in this scenario, a [Rancher K3s](https://rancher.com/docs/k3s/latest/en/), single node cluster will be automatically deployed for you and will be used as the management cluster. This cluster will then be used to deploy the workload cluster using the Cluster API Azure provider (CAPZ).
-
-## Prerequisites
-
-- The automation for this scenario is designed with the assumption that an existing (brownfield) Ubuntu server is already deployed. This can achieved in multiple ways but we recommend using either an [Ubuntu Azure virtual machine](https://docs.microsoft.com/azure/virtual-machines/linux/quick-create-portal) or Ubuntu deployed [using Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/windows/wsl/install).
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with "Contributor" Role-based access control (RBAC) is required for provisioning Azure resources
-
-    To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is downloading the [provided deployment shell script file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/capi_azure/installCAPI.sh)
-
-- User is editing the environment variables section in the in the script file (1-time edit). These variables values will be used throughout the deployment.
-
-- At a high level, the script will then perform the following tasks:
-  - Download and install all the required artifacts
-  - Install the required Azure Arc-enabled Kubernetes required Azure CLI extension
-  - Automatically log in to Azure using the provided service principal credentials and will create the deployment Azure resource group
-  - Deploy a single node Rancher K3s cluster and will convert it to a CAPI management cluster
-  - Download the required [Kustomize](https://kustomize.io/) patch files from the Jumpstart repository for deploying the CAPI workload cluster using the Cluster API Azure provider
-  - Onboard the cluster as an Azure Arc-enabled Kubernetes cluster
-
-## Deployment
-
-- As mentioned in the prerequisites section, an existing Ubuntu machine is required.
-
-- In the your directory of the cloned Jumpstart repository, navigate to where the [_installCAPI_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/capi_azure/installCAPI.sh) bash script is located. Alternatively, you can also download just the script instead of cloning the entire repository.
-
-  The script will transform the Rancher K3s Kubernetes cluster to a CAPI management cluster with the Azure Cluster API provisioned (CAPZ) components that are needed. It will then deploy the workload cluster and it's Azure resources based on the environment variables as described in the next bullet. Upon deployment completion, the cluster will be onboarded as an Azure Arc-enabled Kubernetes cluster.
-
-    > **Disclaimer: The CAPI/CAPZ _clusterctl_ CLI tool commands used in the script are taken straight from the ["Cluster API Book"](https://cluster-api.sigs.k8s.io/user/quick-start.html) and deserves it's writers all the credit for it!**
-    **The reason being for this process to be included is to provide you with the end-to-end user experience which also include the proprietary automation developed for this Jumpstart scenario.**
-
-- To download the script from the Ubuntu machine, use the below command.
-
-    ```shell
-    curl -L https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/cluster_api/capi_azure/installCAPI.sh -o ~/installCAPI.sh
-    ```
-
-    ![Screenshot showing the curl command and the downloaded script in the Ubuntu machine](01.png)
-
-- Once downloaded, edit the environment variables to match your Azure subscription and service principal details created in the prerequisites section as well as the required workload cluster details. The following screenshots shows the downloaded/copied script before editing the environment variables.
-
-    ![Screenshot showing the script empty environment variables](02.png)
-
-    > **NOTE: Editing the script can be done either before copy/downloading it to the Ubuntu machine by using an your preferred IDE (for example, VS Code) or after, in the machine itself, using native Linux text editor such as vi or nano.**
-
-- Edit **ONLY** the following environment variables:
-
-    > **NOTE: Both the _`githubAccount`_ and the _`githubBranch`_ are used for testing purposes. Unless you are developing independent tests that are based on the script, there is no need to edit these variables.**
-
-    ![Screenshot showing the githubAccount and the githubBranch environment variables](03.png)
-
-  - _`CONTROL_PLANE_MACHINE_COUNT`_ - Control Plane node count. For example: 1
-  - _`WORKER_MACHINE_COUNT`_ - Workers node count. For example: 2
-  - _`AZURE_LOCATION`_ - Azure region. For example: eastus2
-  - _`AZURE_RESOURCE_GROUP`_ - Name of the Azure resource group will be used for this deployment.
-  - _`AZURE_ARC_CLUSTER_RESOURCE_NAME`_ - Name of the Azure Arc-enabled Kubernetes cluster resource name as it will shown in the Azure portal. A GUID suffix will be added automatically.
-  - _`AZURE_SUBSCRIPTION_ID`_ - Azure subscription id
-  - _`AZURE_TENANT_ID`_ - Azure tenant id
-  - _`AZURE_CLIENT_ID`_ - Azure SPN application client id
-  - _`AZURE_CLIENT_SECRET`_ - Azure SPN application client secret
-  - _`AZURE_CONTROL_PLANE_MACHINE_TYPE`_ - Control Plane node Azure VM type. For example: "Standard_D4s_v4"
-  - _`AZURE_NODE_MACHINE_TYPE`_ - Worker node Azure VM type. For example: "Standard_D8s_v4"
-
-    ![Screenshot showing the user environment variables](./04.png)
-
-- Execute the script using the below command. The script runtime can take ~10-20min, depending on the number of control plane and worker nodes you chose to deploy.
-
-  ```shell
-  sudo chmod +x installCAPI.sh && . ./installCAPI.sh
-  ```
-
-  > **NOTE: The extra dot is due to the script using the _export_ command, used for exporting the environment variables in the same shell session as the other commands in the script.**
-
-    ![Screenshot showing the script runtime](./05.png)
-
-    ![Screenshot showing the script runtime](./06.png)
-
-    ![Screenshot showing the script runtime](./07.png)
-
-    ![Screenshot showing the script runtime](./08.png)
-
-    ![Screenshot showing the script runtime](./09.png)
-
-    ![Screenshot showing the script runtime](./10.png)
-
-    ![Screenshot showing the script runtime](./11.png)
-
-    ![Screenshot showing the script runtime](./12.png)
-
-    ![Screenshot showing the script runtime](./13.png)
-
-    ![Screenshot showing the script runtime](./14.png)
-
-- Upon completion, you will have a new Cluster API Kubernetes cluster deployed on top of Azure virtual machines that are already onboarded as an Azure Arc-enabled Kubernetes cluster.
-
-  ![Screenshot showing the Azure resource group](./15.png)
-
-  ![Screenshot showing the Azure Arc-enabled Kubernetes cluster resource](./16.png)
-
-## Logging
-
-For ease of troubleshooting and tracking, a deployment log will be created automatically as part of the script runtime. To view the deployment log use the below command:
-
-```shell
-cat /home/<USER>/jumpstart_logs/installCAPI.log
-```
-
-![Screenshot showing the installCAPI log file](./17.png)
-
-## Cleanup
-
-To cleanup the deployment, simply delete the Azure resource group.
-
-![Screenshot showing the deletion of the Azure resource group](./18.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/_index.md
deleted file mode 100644
index b6612676df..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Unified Operations Use Cases"
-linkTitle: "Unified Operations Use Cases"
-weight: 14
-description: >-
-  Once you have Kubernetes clusters projected into Azure with Azure Arc, you can start to use native Azure tooling to manage the clusters as native Azure resources. The following scenarios show examples of using Cluster extensions and Azure management tools such as Azure Monitor, GitOps configurations, and Azure Policy.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/_index.md
deleted file mode 100644
index f0df7ec9ab..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "AKS"
-linkTitle: "AKS"
-weight: 1
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_basic/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_basic/_index.md
deleted file mode 100644
index 4739790a1c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_basic/_index.md
+++ /dev/null
@@ -1,230 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform basic GitOps flow on AKS as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform basic GitOps flow on AKS as an Azure Arc Connected Cluster (Flux v2)"
-weight: 1
-description: >
----
-
-## Deploy GitOps configurations and perform basic GitOps flow on AKS as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create GitOps configuration on an Azure Kubernetes Service (AKS) cluster which is projected as an Azure Arc connected cluster resource.
-
-in this scenario, you will deploy & attach GitOps configuration to your cluster which will also include deploying an "Hello World" Azure Arc web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy.
-
-> **NOTE: This guide assumes you already deployed an AKS cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using either [ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/) or [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a connected AKS cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the AKS cluster and has it connected as Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create GitOps configurations on the Azure Arc-connected Kubernetes cluster.
-
-- The script will also create a namespace and deploy Nginx Ingress Controller.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Azure Arc Kubernetes GitOps Configuration
-
-To create the GitOps Configuration, we will use the _k8s-configuration flux create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Azure Portal with no Azure Arc-enabled Kubernetes GitOps configurations](./03.png)
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Mesh, security products, monitoring solutions, etc. A very popular example will also be ingress controllers, which is exactly the Nginx ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and its respective pods, services, ingress routes, etc. In the next section, will have the "Hello Arc" application deployed on a dedicated namespace.
-
-- In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *az_k8sconfig_aks* shell script against the AKS connected cluster. **Make sure Cloud Shell is configured to use Bash.**
-
-- Download [the script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/gitops/basic/az_k8sconfig_aks.sh) using below command
-
-    ```shell
-    curl -L https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks/gitops/basic/az_k8sconfig_aks.sh -o ~/az_k8sconfig_aks.sh
-    ```
-
-    ![Open Azure Cloud Shell](./04.png)
-
-    ![Download the script](./05.png)
-
-- Edit the environment variables in the [*az_k8sconfig_aks*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/gitops/basic/az_k8sconfig_aks.sh) shell script to match your parameters and run it using the _`. ./az_k8sconfig_aks.sh`_ command.
-
-    ![Parameter](./06.png)
-
-    For example:
-
-    ![Parameter examples](./07.png)
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Use Helm to deploy NGINX ingress controller
-  - Create the GitOps configurations and deploy the Flux controllers on the Azure Arc connected cluster
-  - Deploy the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/tree/main/hello-arc/yaml) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "*sync-interval 3s*" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval to rapidly track changes on the repository but it is recommended to have longer interval in your production environment (default value is 5min)**
-
-- Once the script will complete it's run, you will have the GitOps configuration created and all the resources deployed in your Kubernetes cluster.
-
-    > **NOTE: that it takes few min for the GitOps configuration change it's state status from "Creating" to Succeeded.**
-
-    ![Flux extension](./08.png)
-
-    ![New GitOps configurations](./09.png)
-
-    ![New GitOps configurations](./10.png)
-
-    ![New GitOps configurations](./11.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking the GitOps flow, let's verify and "zoom in" to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-- Show the Flux agent and controller pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./12.png)
-
-- Show 3 replicas of the "Hello Arc" application and the NGINX controller.
-
-    ```shell
-    kubectl get pods -n hello-arc
-    ```
-
-    ![kubectl get pods -n hello-arc](./13.png)
-
-- Show NGINX controller Kubernetes Service (Type _LoadBalancer_).
-
-    ```shell
-    kubectl get svc -n hello-arc
-    ```
-
-    ![kubectl get svc -n hello-arc](./14.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./15.png)
-
-- The GitOps flow works as follow:
-
-    1. The Flux controllers holds the "desired state" of the "Hello Arc" application, this is the configuration we deployed against the Azure Arc connected cluster. The controllers "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/tree/main/hello-arc/yaml) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux controllers to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Azure Cloud Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./16.png)
-
-  - In **Your fork** of the "Azure Arc Jumpstart" repository, open the *hello_arc.yaml* file (/hello-arc/yaml/hello_arc.yaml).
-
-  - The external IP address of the Kubernetes Service seen using the _`kubectl get svc -n hello-arc`_ command.
-
-    ![kubectl get svc -n hello-arc](./17.png)
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./18.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./19.png)
-
-- In the repository window showing the _hello_arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./20.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./21.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./22.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_helm/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_helm/_index.md
deleted file mode 100644
index b6dcd2f965..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_helm/_index.md
+++ /dev/null
@@ -1,251 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform Helm-based GitOps flow on AKS as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform Helm-based GitOps flow on AKS as an Azure Arc Connected Cluster (Flux v2)"
-weight: 2
-description: >
----
-
-## Deploy GitOps configurations and perform Helm-based GitOps flow on AKS as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create [Helm](https://helm.sh/)-based GitOps configuration on an Azure Kubernetes Service (AKS) cluster which is projected as an Azure Arc connected cluster resource.
-
-In this scenario, you will deploy & attach two GitOps configurations to your cluster, a cluster-level config to deploy [nginx-ingress controller](https://kubernetes.github.io/ingress-nginx/) and a namespace-level config to deploy the "Hello Arc" web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy. The Flux toolkit component Helm Controller is a Kubernetes operator, allowing one to declaratively manage Helm chart releases with Kubernetes manifests. The Operator is aware of the “HelmRelease” Custom Resource Definition (CRD). This HelmRelease points to a helm chart in a git repo and can optionally contain specific values to input into the helm chart.
-
-> **NOTE: This guide assumes you already deployed an AKS cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using either [ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/) or [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a connected AKS cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the AKS cluster and has it connected as an Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create GitOps configurations on the Azure Arc-connected Kubernetes cluster.
-
-- The GitOps configurations will create the namespace, deploy NGINX Ingress controller and Hello-Arc application.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have an "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Meshes, Security products, Monitoring solutions, etc. A very popular example will also be Ingress Controller which is exactly the nginx-ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and it's respective pods, services, ingress routes, etc. In the next section will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration with Helm
-
-To create the GitOps Configuration, we will use the _`k8s-configuration flux create`_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure portal with no Azure Arc-enabled Kubernetes GitOps configurations](./03.png)
-
-### Deployment Flow
-
-For our scenario, notice we have two Helm charts in the "Azure Arc Jumpstart Apps" repository; one for nginx and one for the Hello-Arc application as well as an Helm Release for each.
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./04.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./05.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./06.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./07.png)
-
-- The nginx-ingress controller (a Cluster-level component) will be deployed with 2 replicas to the *ingress-nginx* namespace.
-
-- The "Hello Arc" application (a Namespace-level component) will be deployed with 3 replica to the *hello-arc* namespace.
-
-### Deployment
-
-- In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *az_k8sconfig_helm_aks* shell script against the AKS connected cluster. **Make sure Cloud Shell is configured to use Bash.**
-
-- Download [the script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/gitops/helm/az_k8sconfig_helm_aks.sh) using below command.
-
-    ```shell
-    curl -L https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks/gitops/helm/az_k8sconfig_helm_aks.sh -o ~/az_k8sconfig_helm_aks.sh
-    ```
-
-    ![Open Azure Cloud Shell](./08.png)
-
-    ![Download file to Azure Cloud Shell](./09.png)
-
-- Edit the environment variables in the [*az_k8sconfig_helm_aks*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/gitops/helm/az_k8sconfig_helm_aks.sh) shell script to match your parameters and run it using the _`. ./az_k8sconfig_helm_aks.sh`_ command.
-
-    ![Screenshot parameter](./10.png)
-
-    For example:
-
-    ![Screenshot parameter examples](./11.png)
-
-    > **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Create the GitOps configuration to deploy the Flux controllers and NGINX ingress controller on the Azure Arc-connected cluster
-  - Create the GitOps configuration to deploy the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "_sync-interval 3s_" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval rapidly track changes on the repository but it is recommended to have a longer interval in your production environment (the default value is 5min)**
-
-- Once the script will complete it's run, you will have the GitOps configuration create all the resources deployed in your Kubernetes cluster. **NOTE:** that it takes a few min for the configuration to change status from "Pending" to Install.
-
-    ![Flux extension](./12.png)
-
-    ![New GitOps configurations](./13.png)
-
-    ![NGINX GitOps configuration](./14.png)
-
-    ![App GitOps configuration](./15.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking off the GitOps flow, let's verify and "zoom in" to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-- Show the Flux operator pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./16.png)
-
-- Show 3 replicas and service of the "Hello Arc" application.
-
-    ```shell
-    kubectl get pods,svc -n hello-arc
-    ```
-
-    ![kubectl get pods,svc -n hello-arc](./17.png)
-
-- Show NGINX controller replicas and Kubernetes Service (Type _LoadBalancer_).
-
-    ```shell
-    kubectl get pods,svc -n ingress-nginx
-    ```
-
-    ![kubectl get pods,svc -n ingress-nginx](./18.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./19.png)
-
-## Initiating "Hello Arc" Application GitOps
-
-- The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" for both the NGINX Ingress Controller and the "Hello Arc" Helm releases, this is the configuration we deployed against the Azure Arc connected cluster. The operator "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux operator to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Azure Cloud Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./20.png)
-
-  - In **your fork** of the "Azure Arc Jumpstart App" repository, open the *hello-arc.yaml* file (/hello-arc/releases/app/hello-arc.yaml).
-
-  - The external IP address of the Kubernetes Service is seen using the _`kubectl get svc -n ingress-nginx`_ command.
-
-    ![kubectl get svc -n ingress-nginx](./21.png)
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./22.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./23.png)
-
-- In the repository window showing the _hello-arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./24.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./25.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./26.png)
-
-## Cleanup
-
-To delete the GitOps configuration and it's respective Kubernetes resources, edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [az_k8sconfig_helm_cleanup](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/gitops/helm/az_k8sconfig_helm_cleanup.sh) script, upload it to Cloud Shell and run it using the _`. ./az_k8sconfig_helm_cleanup.sh`_ command.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_monitor/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_monitor/_index.md
deleted file mode 100644
index 00ecdf1fd2..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_monitor/_index.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-type: docs
-title: "Integrate Azure Monitor for Containers with AKS as an Azure Arc Connected Cluster using a Shell script"
-linkTitle: "Integrate Azure Monitor for Containers with AKS as an Azure Arc Connected Cluster using a Shell script"
-weight: 3
-description: >
----
-
-## Integrate Azure Monitor for Containers with AKS as an Azure Arc Connected Cluster using a Shell script
-
-The following Jumpstart scenario will guide you on how to onboard an Azure Kubernetes Service (AKS) cluster which is projected an Azure Arc connected cluster resource on to [Azure Monitor for Containers](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) using a Shell script.
-
-in this scenario, you will hook the AKS cluster to Azure Monitor by deploying the [OMS agent](https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent) on your Kubernetes cluster to start collecting telemetry.  
-
-> **NOTE: This guide assumes you already deployed an AKS cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using either [ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/) or [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Azure Monitor for Containers Integration
-
-* In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *aks_monitor_onboarding* script against the AKS connected cluster. For your convenient, both shell and PowerShell scripts are [provided](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/aks/azure_monitor).
-
-* Before integrating the cluster with Azure Monitor for Containers, click on the "Insights (preview)" blade for the connected Arc cluster to show how the cluster is not currently being monitored.
-
-    ![An existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![An existing Azure Arc-enabled Kubernetes cluster with no Azure Monitor integration](./02.png)
-
-* Edit the environment variables in either of the scripts to match your environment parameters, upload it to the Cloud Shell environment and run it using the ```. ./aks_monitor_onboarding.sh``` (Bash) or ```./aks_monitor_onboarding.ps1``` (PowerShell) command.
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Open Azure Cloud Shell](./03.png)
-
-    ![Upload a file to Azure Cloud Shell](./04.png)
-
-    ![Upload a file to Azure Cloud Shell](./05.png)
-
-    ![Upload a file to Azure Cloud Shell](./06.png)
-
-    ![Upload a file to Azure Cloud Shell](./07.png)
-
-    The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Download the Azure Monitor agent script
-  * Retrieve the Azure Arc Connected Cluster Azure Resource ID as well as the cluster credentials (KUBECONFIG)
-  * Execute the script which will create Azure Log Analytics workspace, deploy the Azure Monitor agent on the Kubernetes cluster and tag the cluster
-  * Delete the downloaded script
-
-* Once the script will complete it's run, you will have an Azure Arc connected cluster integrated with Azure Monitor for Containers. At the end of it's run, the script generates URL for you to click on. This URL will open a new browser tab leading to the Azure Monitor for Containers Insights page.
-
-    > **NOTE: As the Azure Monitor agent starts collecting telemetry from the cluster nodes and pods, it will take 5-10min for data to start show up in the Azure Portal.**
-
-    ![Installing the Azure Monitor agent  agent on the cluster](./08.png)
-
-    ![Installing the Azure Monitor agent  agent on the cluster](./09.png)
-
-* Click the "Connected Clusters" tab and see the Azure Arc connected cluster was added. Now that your cluster is being monitored, navigate through the different tabs and sections and watch the monitoring telemetry for the cluster nodes and pods.  
-
-    ![Agent install on the cluster](./10.png)
-
-    ![New Azure Monitor telemetry](./11.png)
-
-    ![New Azure Monitor telemetry](./12.png)
-
-    ![New Azure Monitor telemetry](./13.png)
-
-    ![New Azure Monitor telemetry](./14.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_policy/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_policy/_index.md
deleted file mode 100644
index 0927ba36b3..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_policy/_index.md
+++ /dev/null
@@ -1,213 +0,0 @@
----
-type: docs
-title: "Apply GitOps configurations on AKS as an Azure Arc Connected Cluster using Azure Policy for Kubernetes"
-linkTitle: "Apply GitOps configurations on AKS as an Azure Arc Connected Cluster using Azure Policy for Kubernetes"
-weight: 4
-description: >
----
-
-## Apply GitOps configurations on AKS as an Azure Arc Connected Cluster using Azure Policy for Kubernetes
-
-The following Jumpstart scenario will guide you on how to enable [Azure Policy for Kubernetes](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes#:~:text=Azure%20Policy%20extends%20Gatekeeper%20v3,Kubernetes%20clusters%20from%20one%20place.) on an Azure Kubernetes Service (AKS) cluster that is projected as an Azure Arc connected cluster as well as how to create GitOps policy to apply on the cluster.
-
-> **NOTE: This guide assumes you already deployed an AKS cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using either [ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/) or [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* Fork the ["Hello Arc"](https://github.com/likamrat/hello_arc) demo application repository.
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* As mentioned, this scenario starts at the point where you already have a connected AKS cluster to Azure Arc.
-
-    ![Existing AKS Azure Arc connected cluster](./01.png)
-
-    ![Existing AKS Azure Arc connected cluster](./02.png)
-
-* Before installing the Azure Policy Add-on or enabling any of the service features, your subscription must enable the Microsoft.PolicyInsights resource provider and create a role assignment for the cluster service principal. To do that, open [Azure Cloud Shell](https://shell.azure.com/) and run either the Azure CLI or Azure PowerShell command.
-
-    ![Open Azure Cloud Shell](./03.png)
-
-    Azure CLI:
-
-    ```shell
-    az provider register --namespace 'Microsoft.PolicyInsights'
-    ```
-
-    Azure PowerShell:
-
-    ```powershell
-    Register-AzResourceProvider -ProviderNamespace 'Microsoft.PolicyInsights'
-    ```
-
-    To verify successful registration, run either the below Azure CLI or Azure PowerShell command.
-
-    Azure CLI:
-
-    ```shell
-    az provider show --namespace 'Microsoft.PolicyInsights'
-    ```
-
-    Azure PowerShell:
-
-    ```powershell
-    Get-AzResourceProvider -ProviderNamespace 'Microsoft.PolicyInsights'
-    ```
-
-    ![AzResourceProvider Bash](./04.png)
-
-    ![AzResourceProvider PowerShell](./05.png)
-
-* Create Azure service principal (SP)
-
-    > **NOTE: This guide assumes you will be working with a service principal assigned with the 'Contributor' role as described below. If you want to further limit the Role-based access control (RBAC) scope of your service Principal, you can assign it with the 'Policy Insights Data Writer (Preview)' role the Azure Arc-enabled Kubernetes cluster as described [here](https://github.com/MicrosoftDocs/azure-docs/edit/master/articles/governance/policy/concepts/policy-for-kubernetes#L247-L275).**
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in Azure Cloud Shell).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Azure Policy for Azure Arc Connected Cluster Integration
-
-* In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the *aks_policy_onboarding* script against the AKS connected cluster. For your convenient, shell script is [provided to you](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/azure_policy/aks_policy_onboarding.sh).
-
-* Edit the environment variables in the script to match your environment parameters, upload it to the Cloud Shell environment and run it using the ```. ./aks_policy_onboarding.sh``` command. **If you decided to use the 'Policy Insights Data Writer (Preview)' role assignment as described in the perquisites section, make sure to use it's respective *appId*, *password* and *tenantId***
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Upload onboarding script](./06.png)
-
-    ![Upload onboarding script](./07.png)
-
-    ![Upload onboarding script](./08.png)
-
-The script will:
-
-* Login to your Azure subscription using the SPN credentials
-* Install NGINX Ingress Controller
-* Retrieve the Azure Arc Connected Cluster Azure Resource ID
-* Install the 'azure-policy-addon' helm chart & Gatekeeper
-
-After few seconds, by running the the ```kubectl get pods -A``` command, you will notice all pods have been deployed.
-
-![Showing pods deployment](./09.png)
-
-## Deploy GitOps to Azure Arc Kubernetes cluster using Azure Policy
-
-Although you can [deploy GitOps configuration individually](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_helm/) on each of your Azure Arc connected clusters, Azure Policy for Kubernetes allows to do the same on a broader scope (i.e subscription or resource group). That way, you can guarantee existing and newly added Azure Arc connected clusters to all have the same GitOps configuration and as a result, the same cluster baseline and/or application version deployed.
-
-* Before assigning the policy, in the Azure portal, click the *Configuration* setting in your AKS connected cluster. Notice how no GitOps configurations are deployed.
-
-    ![Empty GitOps configurations](./10.png)
-
-* In the Search bar, look for *Policy* and click on *Definitions* which will show you all of the available Azure policies.
-
-    ![Searching for Azure Policy definitions](./11.png)
-
-    ![Searching for Azure Policy definitions](./12.png)
-
-* The "[Preview]: Deploy GitOps to Kubernetes cluster" policy is part of the Kubernetes policies. Once you filter to find these, click on the policy and the 'Assign' button.
-
-    ![GitOps to Kubernetes cluster Azure policy](./13.png)
-
-    ![GitOps to Kubernetes cluster Azure policy](./14.png)
-
-* In the below example, the scope of the policy represent the resource group where the AKS connected cluster Azure Arc resource is located. Alternatively, the scope could have been the entire Azure subscription or a resource group with many Azure Arc connected clusters. Also, make sure *Policy enforcement* is set to *Enabled*.
-
-    For this GitOps configuration policy, we will be using the ["Hello Arc"](https://github.com/likamrat/hello_arc) application repository which includes the Kubernetes Service for external access, Deployment as well as the ingress rule to be used by the NGINX ingress controller.
-
-    ![Assigning Azure policy](./15.png)
-
-    ![Assigning Azure policy](./16.png)
-
-    ![Assigning Azure policy](./17.png)
-
-    ![Assigning Azure policy](./18.png)
-
-    ![Assigning Azure policy](./19.png)
-
-* Once the policy configuration deployed, after ~15-25min, the policy remediation task will start the evaluation against the Kubernetes cluster, recognize it as "Non-compliant" (since it's still does note have the GitOps configuration deployed) and lastly, after the configuration has been deployed the policy will move to a "Compliant" state. To check this, go back to the main Policy page in the Azure portal.
-
-    > **NOTE: The process of evaluation all the way to the point that the GitOps configuration is deployed against the cluster can take ~15-30min.**
-
-    ![Azure policy evaluation](./20.png)
-
-    ![Azure policy evaluation](./21.png)
-
-    ![Azure policy evaluation](./22.png)
-
-    ![Azure policy evaluation](./23.png)
-
-    ![Azure policy evaluation](./24.png)
-
-## Verify GitOps Configuration & App Deployment
-
-* Now that the policy is in compliant state, let's first verify the GitOps configurations. In the Azure portal click the AKS connected Azure Arc cluster and open the Configurations settings.
-
-    ![Successful GitOps config deployment](./25.png)
-
-    ![Successful GitOps config deployment](./26.png)
-
-    ![Successful GitOps config deployment](./27.png)
-
-* In order to verify the "Hello Arc" application and it's component has been deployed, In the Azure Cloud Shell, run the below commands.
-
-    ```shell
-    kubectl get pods -n hello-arc
-    kubectl get ing -n hello-arc
-    kubectl get svc -n hello-arc
-    ```
-
-    You can see how the Flux GitOps operator, Memcached, the "Hello Arc" application and the ingress rule now deployed on the cluster as well the Service with an external IP.
-
-    !["Hello Arc" Kubernetes pods](./28.png)
-
-* Copy the Service external IP and paste in your browser.
-
-    !["Hello Arc" application deployed](./29.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-* Delete the AKS cluster as described in the [ARM Template teardown instructions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_arm_template/) or the [Terraform teardown instructions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/aks_terraform/).
-
-* From the Policy page in the Azure portal, remove the "[Preview]: Deploy GitOps to Kubernetes cluster" policy assignment from the cluster.
-
-    ![Delete Azure Policy assignment](./30.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/_index.md
deleted file mode 100644
index 98220ce3de..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "AKS on Azure Stack HCI"
-linkTitle: "AKS on Azure Stack HCI"
-weight: 2
-description: >-
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_basic/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_basic/_index.md
deleted file mode 100644
index 2c55c40e98..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_basic/_index.md
+++ /dev/null
@@ -1,217 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform basic GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster"
-linkTitle: "Deploy GitOps configurations and perform basic GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster"
-weight: 1
-description: >
----
-
-## Deploy GitOps configurations and perform basic GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster
-
-The following Jumpstart scenario will guide you on how to create GitOps configuration on an Azure Kubernetes Service (AKS) cluster that is running on Azure Stack HCI and which is projected as an Azure Arc connected cluster resource.
-
-in this scenario, you will deploy & attach GitOps configuration to your cluster which will also include deploying an "Hello World" Azure Arc web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-> **NOTE: This guide assumes you already deployed an AKS cluster on Azure Stack HCI and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [PowerShell](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* Fork the ["Hello Arc"](https://github.com/likamrat/hello_arc) demo application repository.
-
-* (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  * [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  * [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  * [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-* As mentioned, this scenario starts at the point where you already have a connected AKS cluster to Azure Arc that is running on Azure Stack HCI.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-* [Install or update Azure PowerShell modules](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-5.6.0). Use the below command to check your current installed version.
-
-  ```PowerShell
-  Get-InstalledModule -Name Az -AllVersions | select Name,Version
-    ```
-
-  > **NOTE: This guide combines automations that uses both Azure PowerShell Az modules as well as Azure CLI, however both of them can and will be run from a PowerShell window.**
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Enable subscription with the resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```PowerShell
-  Register-AzResourceProvider -ProviderNamespace Microsoft.Kubernetes
-  Register-AzResourceProvider -ProviderNamespace Microsoft.KubernetesConfiguration
-  Register-AzResourceProvider -ProviderNamespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```PowerShell
-  Get-AzResourceProvider -ProviderNamespace Microsoft.Kubernetes
-  Get-AzResourceProvider -ProviderNamespace Microsoft.KubernetesConfiguration
-  Get-AzResourceProvider -ProviderNamespace Microsoft.ExtendedLocation
-  ```
-  
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, an Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below PowerShell command.
-
-    ```powershell
-    Connect-AzAccount
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    For example:
-
-    ```powershell
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    This command will return a secure string as shown below:
-
-    ```shell
-    Secret                : System.Security.SecureString
-    ServicePrincipalNames : {XXXXXXXXXXXXXXXXXXXXXXXXXXXX, http://AzureArcK8s}
-    ApplicationId         : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    ObjectType            : ServicePrincipal
-    DisplayName           : AzureArcK8s
-    Id                    : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Type                  :
-    ```
-
-    To expose the generated password use this code to export the secret:
-
-    ```powershell
-    $BSTR = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($sp.Secret)
-    $UnsecureSecret = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR)
-    ```
-
-    > **NOTE: It is optional but highly recommended to scope the SP to a specific [Azure subscription and resource group](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal?view=azps-5.4.0)**
-
-* If you do not have the AksHci PowerShell module already, you will have to perform a clean installation. To install the AksHci PowerShell module remove any previous versions by running the below commands:
-
-  ```powershell
-  Install-Module -Name Az.Accounts -Repository PSGallery -RequiredVersion 2.2.4
-  Install-Module -Name Az.Resources -Repository PSGallery -RequiredVersion 3.2.0
-  Install-Module -Name AzureAD -Repository PSGallery -RequiredVersion 2.0.2.128
-  Install-Module -Name AksHci -Repository PSGallery
-  Import-Module Az.Accounts
-  Import-Module Az.Resources
-  Import-Module AzureAD
-  Import-Module AksHci
-  Exit
-  ```
-
-* After this is done, close all PowerShell windows and verify the installation by tunning the following:
-
-  ```powershell
-  Get-Command -Module AksHci
-  ```
-
-  ![Screenshot AksHci module installation](./03.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-* User is editing the PowerShell script environment variables (1-time edit). These variables values are being used throughout the deployment of the Kubernetes GitOps configuration.
-
-* User is running the PowerShell script to enable and set up a GitOps configuration. Runtime script will:
-  * Login to your Azure subscription using the SPN credentials.
-  * Retrieve the cluster credentials (KUBECONFIG).
-  * Use Helm to deploy NGINX ingress controller.
-  * Create the GitOps configurations and deploy the Flux operator and Memcached on the Azure Arc connected cluster.
-  * Deploy the ["Hello Arc"](https://github.com/likamrat/hello_arc) application along side an Ingress rule to make it available from outside the cluster.
-
-* User will kick the GitOps flow by making changes to the ["Hello Arc"](https://github.com/likamrat/hello_arc) application, this will be considered a new version by the Flux Operator.
-
-* The GitOps flow will pull the new version of the application and deploy new pods, upon committing the changes.
-
-* User will show rolling upgrade of the "Hello Arc" application as the GitOps flow is completed successfully.
-  
-## Azure Arc Kubernetes GitOps Configuration
-
-* Edit the environment variables in the [*az_k8sconfig_aks_hci*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_stack_hci/gitops/basic/az_k8sconfig_aks_hci.ps1) PowerShell script to match your parameters and run it using the ```.\az_k8sconfig_aks_hci.ps1``` command.
-
-    > **Disclaimer: For the purpose of this guide, notice how the "*git-poll-interval 3s*" is set. The 3 seconds interval is useful for demo purposes since it will make the git-poll interval to rapidly track changes on the repository but it is recommended to have longer interval in your production environment (default value is 5min)**
-
-* Once the script will complete it's run, you will have the GitOps configuration created and all the resources deployed in your Kubernetes cluster running on Azure Stack HCI.
-
-    > **NOTE: that it takes few min for the configuration change it's Operator state status from "Pending" to Install.**
-
-    ![New GitOps configurations](./04.png)
-
-    ![New GitOps configurations](./05.png)
-
-    ![New GitOps configurations](./06.png)
-
-## The "Hello Arc" Application & Components
-
-* Before kicking the GitOps flow, let's review the Kubernetes resources deployed by running few *kubectl* commands.
-
-  * ```kubectl get pods -n prod``` - Will show the Flux operator, the Memcached pods and the "Hello Arc" application pods.
-    * ```kubectl get pods -n cluster-mgmt``` - Will show the NGINX controller.
-    * ```kubectl get svc -n prod``` - Will show NGINX controller Kubernetes Service (Type LoadBalancer).
-    * ```kubectl get ing -n prod``` - Will show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ![kubectl get pods -n prod](./07.png)
-
-    ![kubectl get pods -n cluster-mgmt](./08.png)
-
-    ![kubectl get svc -n prod](./09.png)
-
-    ![kubectl get ing -n prod](./10.png)
-
-* The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" of the "Hello Arc" application, this are the configuration we deployed against the Azure Arc connected cluster. The operator "pulls" the state of the ["Hello Arc"](https://github.com/likamrat/hello_arc) application repository.
-
-    2. Changing the application which is consider to be a new version of it, will trigger the Flux operator to kick-in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods is successfully deployed, the old one will be terminated (rolling upgrade).
-
-* To show the above flow, open 2 (ideally 3) side-by-side browser windows:
-
-  * Run ```kubectl get pods -n prod -w``` command
-
-    ![kubectl get pods -n prod -w](./11.png)
-
-  * Your fork of the "Hello Arc" application repository. Open the [*hello_arc.yaml*](https://github.com/likamrat/hello_arc/blob/master/yaml/hello_arc.yaml) file.
-
-  * The IP address of the Kubernetes Service seen using the ```kubectl get svc -n prod``` command.
-
-    ![kubectl get svc -n prod](./12.png)
-
-  * End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./13.png)
-
-* As mentioned in the prerequisites section, it is optional but very recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./14.png)
-
-* In the repository window showing the *hello_arc.yaml* file, change the text under "MESSAGE" section commit the change. Alternatively, you can open the fork repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the "MESSAGE" section](./15.png)
-
-    ![Making a change to the "MESSAGE" section and committing](./16.png)
-
-* Upon committing the changes, notice how the Kubernetes Pod rolling upgrade starts. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./17.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_helm/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_helm/_index.md
deleted file mode 100644
index 770872888d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_helm/_index.md
+++ /dev/null
@@ -1,267 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform Helm-based GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster"
-linkTitle: "Deploy GitOps configurations and perform Helm-based GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster"
-weight: 2
-description: >
----
-
-## Deploy GitOps configurations and perform Helm-based GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster
-
-The following Jumpstart scenario will guide you on how to create [Helm](https://helm.sh/)-based GitOps configuration on an Azure Kubernetes Service (AKS) cluster running on Azure Stack HCI, which is projected as an Azure Arc connected cluster resource.
-
-in this scenario, you will deploy & attach 2 GitOps configuration to your cluster, a cluster-level config to deploy nginx-ingress controller and a namespace-level config to deploy the "Hello Arc" web application on your Kubernetes cluster.
-
-By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-> **NOTE: This guide assumes you already deployed an AKS cluster on Azure Stack HCI and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [PowerShell](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* Fork the ["Hello Arc"](https://github.com/likamrat/hello_arc) demo application repository.
-
-* (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  * [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  * [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  * [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-* As mentioned, this scenario starts at the point where you already have a connected AKS cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-* [Install or update Azure PowerShell modules](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-5.6.0). Use the below command to check your current installed version.
-
-  ```PowerShell
-  Get-InstalledModule -Name Az -AllVersions | select Name,Version
-  ```
-
-  > **NOTE: This guide combines automations that uses both Azure PowerShell Az modules as well as Azure CLI, however both of them can and will be run from a PowerShell window.**
-
-  * [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Enable subscription with the resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```PowerShell
-  Register-AzResourceProvider -ProviderNamespace Microsoft.Kubernetes
-  Register-AzResourceProvider -ProviderNamespace Microsoft.KubernetesConfiguration
-  Register-AzResourceProvider -ProviderNamespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```PowerShell
-  Get-AzResourceProvider -ProviderNamespace Microsoft.Kubernetes
-  Get-AzResourceProvider -ProviderNamespace Microsoft.KubernetesConfiguration
-  Get-AzResourceProvider -ProviderNamespace Microsoft.ExtendedLocation
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command.
-
-    ```powershell
-    Connect-AzAccount
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    For example:
-
-    ```powershell
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    This command will return a secure string as shown below:
-
-    ```shell
-    Secret                : System.Security.SecureString
-    ServicePrincipalNames : {XXXXXXXXXXXXXXXXXXXXXXXXXXXX, http://AzureArcK8s}
-    ApplicationId         : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    ObjectType            : ServicePrincipal
-    DisplayName           : AzureArcK8s
-    Id                    : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Type                  :
-    ```
-
-    To expose the generated password use this code to export the secret:
-
-    ```powershell
-    $BSTR = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($sp.Secret)
-    $UnsecureSecret = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR)
-    ```
-
-    > **NOTE: It is optional but highly recommended to scope the SP to a specific [Azure subscription and resource group](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal?view=azps-5.4.0)**
-
-* If you do not have the AksHci PowerShell module already, you will have to perform a clean installation. To install the AksHci PowerShell module remove any previous versions by running the below commands:
-
-  ```powershell
-  Install-PackageProvider -Name NuGet -Force 
-  Install-Module -Name PowershellGet -Force -Confirm:$false -SkipPublisherCheck
-  Uninstall-Module -Name AksHci -AllVersions -Force -ErrorAction:SilentlyContinue 
-  Uninstall-Module -Name Kva -AllVersions -Force -ErrorAction:SilentlyContinue 
-  Uninstall-Module -Name Moc -AllVersions -Force -ErrorAction:SilentlyContinue 
-  Uninstall-Module -Name MSK8SDownloadAgent -AllVersions -Force -ErrorAction:SilentlyContinue 
-  Unregister-PSRepository -Name WSSDRepo -ErrorAction:SilentlyContinue 
-  Unregister-PSRepository -Name AksHciPSGallery -ErrorAction:SilentlyContinue 
-  Unregister-PSRepository -Name AksHciPSGalleryPreview -ErrorAction:SilentlyContinue
-  Exit
-  ```
-
-* Using a web browser navigate to https://aka.ms/AKS-HCI-Evaluate, complete the registration form, download and save AKS on Azure Stack HCI. Extract the contents of the zip file.
-
-* Open PowerShell as administrator, navigate to the folder where you extracted the software and run the following commands:
-
-  ```powershell
-  Get-ChildItem -Path . -Recurse | Unblock-File -Verbose
-  Import-Module AksHci
-  Get-Command -Module AksHci
-  ```
-
-  ![Screenshot AksHci module installation](./03.png)
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have an "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Meshes, Security products, Monitoring solutions, etc. A very popular example will also be Ingress Controller which is exactly the nginx-ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and it's respective pods, services, ingress routes, etc. In the next section will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration with Helm
-
-### The Mechanism (In a nutshell)
-
-In the process of creating Azure Arc GitOps configuration, [Weaveworks Flux Kubernetes Operator](https://github.com/fluxcd/flux) is deployed on the cluster.
-
-The Operator is aware of the "HelmRelease" Custom Resource Definition (CRD). This HelmRelease points to a HELM chart in a git repo and can optionally contain specific values to input into the helm chart. Due to this configuration, a user can choose to leave the chart values intact or to have different values for different releases.
-
-For example, an application (captured in an Helm chart) dev release can have no pod replication (single pod) while a production release, using the same chart can have 3 pod replicas.
-
-In the next section will use the "Hello Arc" Helm chart to deploy a production release which we will then change and see the results in real-time.
-
-### Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-* User is editing the PowerShell script environment variables (1-time edit). These variables values are being used throughout the deployment of the Kubernetes GitOps configuration.
-
-* User is running the PowerShell script to enable and set up a GitOps configuration. Runtime script will:
-  * Login to your Azure subscription using the SPN credentials.
-  * Retrieve the cluster credentials (KUBECONFIG).
-  * Create the GitOps configurations and deploy the Flux operator and Memcached on the Azure Arc connected cluster.
-  * Deploy an Nginx ingress controller and the ["Hello Arc"](https://github.com/likamrat/hello_arc) application through a HELM-based GitOps flow. There are two Helm charts in the "Hello Arc" repository; one for nginx and one for the actual application as well as an Helm Release for each.
-
-!["Hello Arc" GitHub repository](./04.png)
-
-!["Hello Arc" GitHub repository](./05.png)
-
-* The nginx-ingress controller (a Cluster-level component) will be deployed with 3 replicas to the *cluster-mgmt* namespace.
-
-* The "Hello Arc" application (a Namespace-level component) will be deployed with 1 replica to the *prod* namespace.
-
-* User will kick the GitOps flow by making changes to the ["Hello Arc"](https://github.com/likamrat/hello_arc) application, this will be considered a new version by the Flux Operator.
-
-* The GitOps flow will pull the new version of the application and deploy new pods, upon committing the changes.
-
-* User will show rolling upgrade of the "Hello Arc" application as the GitOps flow is completed successfully.
-
-## Deployment
-
-* Edit the environment variables in the [*az_k8sconfig_helm_aks*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_stack_hci/gitops/helm/az_k8sconfig_helm_aks.ps1) PowerShell script to match your parameters.
-
-  The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Retrieve the cluster credentials (KUBECONFIG)
-  * Create two GitOps configurations for the Azure Arc Connected Cluster. Both configurations will be using the Helm charts located in the "Hello Arc" repository.
-  * Cluster-level config to deploy nginx-ingress controller Helm chart
-  * Namespace-level config to deploy the "Hello Arc" application Helm chart
-
-    > **Disclaimer: For the purpose of this guide, notice how the "*git-poll-interval 3s*" is set. The 3 seconds interval is useful for demo purposes since it will make the git-poll interval to rapidly track changes on the repository but it is recommended to have longer interval in your production environment (default value is 5min)**
-
-* Once the script will complete its run, you will have 2 GitOps configuration created and all the resources deployed in your Kubernetes cluster. **NOTE:** that it takes few min for the configuration change it's Operator state status from "Pending" to Install.
-
-    ![New GitOps configurations](./08.png)
-
-    ![New GitOps configurations](./09.png)
-
-* The Cluster-level config initiated the nginx-ingress Pods and Service resource deployment (along with the Flux operator and Memcached). To see it's resource, use the below *kubectl* commands.
-
-    ```shell
-    kubectl get pods -n cluster-mgmt
-    kubectl get svc -n cluster-mgmt
-    ```
-
-    ![nginx-ingress Pods and Service resource](./10.png)
-
-* The Namespace-level config initiated the "Hello Arc" Pod (1 replica), Service and Ingress Route resource deployment.
-
-    ```shell
-    kubectl get pods -n prod
-    kubectl get svc -n prod
-    kubectl get ing -n prod
-    ```
-
-    ![Hello Arc" Pod, Service and Ingress Route resource](./11.png)
-
-## Initiating "Hello Arc" Application GitOps
-
-* The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" for both the nginx-ingress and the "Hello Arc" Helm releases, this are the configuration we deployed against the Azure Arc connected cluster. The operator will pull every 3 seconds the state of the releases in the repository.
-
-    2. Changing the application release will trigger the Flux operator to kick-in the GitOps flow.
-
-    3. A new version of the application will be deployed on the cluster with more replicas as configured. Once the new pods is successfully deployed, the old ones will be terminated (rolling upgrade).
-
-* To show the above flow, open 2 (ideally 3) side-by-side browser windows:
-
-  * In PowerShell run ```kubectl get pods -n prod -w```
-
-    ![kubectl get pods -n prod -w](./12.png)
-
-  * In your own repository fork, open the "Hello Arc" [*hello-arc.yaml*](https://github.com/likamrat/hello_arc/blob/master/releases/prod/hello-arc.yaml) Helm release file.
-
-  * The external IP address of the Kubernetes Service seen using the ```kubectl get svc -n cluster-mgmt``` command.
-
-    ![kubectl get svc -n cluster-mgmt](./13.png)
-
-  * End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./14.png)
-
-* As mentioned in the prerequisites section, it is optional but very recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./15.png)
-
-* In the repository window showing the *hello-arc.yaml* file, change the number of *replicaCount* to 3 as well as the the message text and commit your changes. Alternatively, you can open the forked repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./16.png)
-
-* Upon committing the changes, notice how the rolling upgrade starts. Once the Pods are up & running, the new "Hello Arc" application version window will show the new messages as well as the additional pods replicas, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    !["Hello Arc" rolling upgrade](./17.png)
-
-    !["Hello Arc" rolling upgrade](./18.png)
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./19.png)
-
-## Cleanup
-
-To delete the GitOps configuration and it's respective Kubernetes resources, edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [az_k8sconfig_helm_cleanup](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks_stack_hci/gitops/helm/az_k8sconfig_helm_cleanup.sh) script, run it using the ```.\az_k8sconfig_helm_cleanup.ps1``` command.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_monitor/aks_hci_monitor_extension/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_monitor/aks_hci_monitor_extension/_index.md
deleted file mode 100644
index 574c5977de..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_monitor/aks_hci_monitor_extension/_index.md
+++ /dev/null
@@ -1,106 +0,0 @@
----
-type: docs
-title: "Integrate Azure Monitor for Containers with AKS on Azure Stack HCI as an Azure Arc Connected Cluster using cluster extensions"
-linkTitle: "Integrate Azure Monitor for Containers with AKS on Azure Stack HCI as an Azure Arc Connected Cluster using cluster extensions"
-weight: 3
-description: >
----
-
-## Integrate Azure Monitor for Containers with AKS on Azure Stack HCI as an Azure Arc Connected Cluster using cluster extensions
-
-The following Jumpstart scenario will guide you on how to enable [Azure Monitor for Containers](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) for an AKS cluster running on Azure Stack HCI that is projected as an Azure Arc connected cluster.
-
-in this scenario, you will hook the AKS cluster on HCI to Azure Monitor by deploying the [Azure Monitor agent](https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent) in order to start collecting telemetry.  
-
-> **NOTE: This guide assumes you already deployed an AKS on HCI cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [PowerShell](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/).**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI and portal UX for deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-The commands below and the script described in this scenario should be run on the management computer.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartHCI" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartHCI",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Create Azure monitor extensions instance
-
-To create a new extension Instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Azure Monitor extension on your Azure Arc-enabled Kubernetes cluster
-
-* Before integrating the cluster with Azure Monitor for Containers, click on the "Insights (preview)" blade for the connected Arc cluster to show how the cluster is not currently being monitored.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./01.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource Insights](./02.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource Insights](./03.png)
-
-* Edit the environment variables in the [PowerShell script](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_stack_hci/monitor_extension/azure_monitor_k8s_extension.ps1) to match your environment parameters. After that run it using the ```.\azure_monitor_k8s_extension.ps1``` command.
-
-    ![Screenshot showing environment variables in script](./04.png)
-
-    The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  * Create monitor k8s extension instance
-
-* You can see that the monitoring is enabled once you visit the Container Insights section of the Azure Arc-enabled Kubernetes cluster resource in Azure.
-
-    > **NOTE: As the Azure Monitor agent starts collecting telemetry from the cluster nodes and pods, it will take 5-10min for data to start show up in the Azure Portal.**
-
-* Click the "Connected Clusters" tab and see the Azure Arc connected cluster was added. Now that your cluster is being monitored, navigate through the different tabs and sections and watch the monitoring telemetry for the cluster nodes and pods.  
-
-![Screenshot showing Monitoring console](./05.png)
-
-### Delete extension instance
-
-The following command only deletes the extension instance, but doesn't delete the Log Analytics workspace. The data within the Log Analytics resource is left intact. You can visit the Insights seciton of Azure Arc resource in Azure Portal and can see the onboarding state as not connected.
-
-```shell
-az k8s-extension delete --name azuremonitor-containers --cluster-type connectedClusters --cluster-name <cluster-name> --resource-group <resource-group>
-```
-
- ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource Insights](./06.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/_index.md
deleted file mode 100644
index 3d21ff6d04..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Cluster API"
-linkTitle: "Cluster API"
-weight: 3
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/_index.md
deleted file mode 100644
index 440690d1db..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/_index.md
+++ /dev/null
@@ -1,148 +0,0 @@
----
-type: docs
-title: "Integrate Microsoft Defender for Cloud with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"
-linkTitle: "Integrate Microsoft Defender for Cloud with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"
-weight: 3
-description: >
----
-
-## Integrate Microsoft Defender for Cloud with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions
-
-The following Jumpstart scenario will guide you on how to enable [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/defender-for-containers-introduction?tabs=defender-for-container-arch-aks) for a Cluster API that is projected as an Azure Arc-connected cluster.
-
-in this scenario, you will hook the Cluster API to Microsoft Defender for Cloud by deploying the [Defender extension](https://docs.microsoft.com/azure/defender-for-cloud/defender-for-containers-enable?tabs=aks-deploy-portal%2Ck8s-deploy-cli%2Ck8s-verify-cli%2Ck8s-remove-arc%2Caks-removeprofile-api#protect-arc-enabled-kubernetes-clusters) on your Kubernetes cluster in order to start collecting security related logs and telemetry.  
-
-> **NOTE: This guide assumes you already deployed a Cluster API and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using a [Shell script](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/).**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI and portal UX for deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  * "Contributor" - Required for provisioning Azure resources
-  * "Security admin" - Required for installing Cloud Defender Azure-Arc enabled Kubernetes extension and dismiss alerts
-  * "Security reader" - Required for being able to view Azure-Arc enabled Kubernetes Cloud Defender extension findings
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Security admin" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Security reader" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-* User has deployed Kubernetes using Cluster API and has it connected as Azure Arc-enabled Kubernetes cluster.
-
-* User is editing the environment variables on the Shell script file (1-time edit) which then be used throughout the extension deployment.
-
-* User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Microsoft Defender for Cloud extension on the Azure Arc connected cluster.
-
-* User is veryfing the cluster is shown in Microsoft Defender for Cloud and that the extension is deployed.
-
-* User is simulating a security alert on the Kubernetes cluster that will cause Microsoft Defender for Cloud to detect this activity and trigger a security alert.
-
-## Create Microsoft Defender for Containers extensions instance
-
-To create a new extension Instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Microsoft Defender for Containers extension on your Azure Arc-enabled Kubernetes cluster.
-
-* Before integrating the cluster with Microsoft Defender for Cloud, click on the "Security (preview)" blade for the connected Azure Arc cluster to show how the cluster is not currently being assessed by Microsoft Defender for Cloud.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./01.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./02.png)
-
-* Edit the environment variables in [the script](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/cluster_api/capi_defender_extension/azure_defender_k8s_extension.sh) to match your environment parameters followed by running the ```. ./azure_defender_k8s_extension.sh``` command.
-
-    ![Screenshot parameter examples](./03.png)
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-   The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  * Create Defender k8s extension instance
-
-* You can see that Microsoft Defender for Cloud is enabled once you visit the security tab section of the Azure Arc-enabled Kubernetes cluster resource in Azure.
-
-![Screenshot extension deployment security tab](./04.png)
-
-* Also verify under the Extensions section of the Azure Arc-enabled Kubernetes cluster that the Microsoft Defender extension is correctly installed.
-
-![Screenshot extension deployment](./05.png)
-
-* You can also verify the deployment by running the command below:
-
-```bash
-kubectl get pods -n azuredefender --kubeconfig <cluster-name>.kubeconfig
-```
-
-![Screenshot extension deployment on cluster](./06.png)
-
-## Simulate a security alert
-
-To verify that Microsoft Defender for Cloud is working properly and alerting on security threats, run the below command to simulate an alert:
-
-```bash
-kubectl get pods --namespace=asc-alerttest-662jfi039n --kubeconfig <cluster-name>.kubeconfig
-```
-
-Within 30 minutes Microsoft Defender for Cloud will detect this event and trigger a security alert that you wil see in the Azure Portal under Microsoft Defender for Cloud's security alerts and also on the security tab of your Azure Arc-enabled cluster.
-
-![Screenshot security alert in Microsoft Defender for Cloud](./07.png)
-
-![Screenshot security alert in Microsoft Defender for Cloud](./08.png)
-
-![Screenshot security alert in Microsoft Defender for Cloud](./09.png)
-
-### Delete extension instance
-
-The following command only deletes the extension instance, but doesn't delete the Log Analytics workspace or disables Microsoft Defender for Cloud.
-
-```bash
-az k8s-extension delete --name microsoft.azuredefender.kubernetes --cluster-type connectedClusters --cluster-name <cluster-name> --resource-group <resource-group>
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_gitops_basic/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_gitops_basic/_index.md
deleted file mode 100644
index 3de4e5faad..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_gitops_basic/_index.md
+++ /dev/null
@@ -1,226 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform basic GitOps flow on Cluster API as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform basic GitOps flow on Cluster API as an Azure Arc Connected Cluster (Flux v2)"
-weight: 1
-description: >
----
-
-## Deploy GitOps configurations and perform basic GitOps flow on Cluster API as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create GitOps configuration on a Cluster API which is projected as an Azure Arc-connected cluster resource.
-
-in this scenario, you will deploy & attach GitOps configuration to your cluster which will also include deploying an "Hello World" Azure Arc web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy.
-
-> **NOTE: This guide assumes you already deployed a Cluster API and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using a [Shell script](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a Cluster API projected as an Azure Arc connected cluster.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the Kubernetes cluster using Cluster API and has it connected as Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create a GitOps configuration on the Azure Arc-connected Kubernetes cluster.
-
-- The script will also create a namespace and deploy Nginx Ingress Controller.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Mesh, security products, monitoring solutions, etc. A very popular example will also be ingress controllers, which is exactly the Nginx ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and its respective pods, services, ingress routes, etc. In the next section, will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration
-
-To create the GitOps Configuration, we will use the _k8s-configuration flux create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-> **NOTE: Before configuring the GitOps, make sure that the _kubectl_ context is pointing to your Azure Arc-enabled Kubernetes cluster. To do that, you can refer to the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/) to find the options to change the kubecontext to different Kubernetes clusters.**
-
-![Screenshot showing current kubectl context pointing to CAPI cluster](./03.png)
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure Portal with no Azure Arc-enabled Kubernetes GitOps configurations](./04.png)
-
-### Deployment
-
-- Download [the script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/gitops/basic/az_k8sconfig_capi.sh) using below command
-
-    ```shell
-    curl -L https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/cluster_api/gitops/basic/az_k8sconfig_capi.sh -o ~/az_k8sconfig_capi.sh
-    ```
-
-- Edit the environment variables to match your environment parameters followed by running the _`. ./az_k8sconfig_capi.sh`_ command.
-
-    ![Screenshot parameter](./05.png)
-
-    For example:
-
-    ![Screenshot parameter examples](./06.png)
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Will use Helm to deploy NGINX ingress controller
-  - Create the GitOps configurations and deploy the Flux controllers on the Azure Arc connected cluster
-  - Deploy the ["Hello Arc"](https://github.com/microsoft/azure_arc/blob/main/artifacts/hello-arc) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "*sync-interval 3s*" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval to rapidly track changes on the repository but it is recommended to have longer interval in your production environment (default value is 5min)**
-
-- Once the script will complete it's run, you will have the GitOps configuration create all the resources deployed in your Kubernetes cluster. Note that it takes a few min for the configuration change status from "Pending" to Install.
-
-    ![Flux extension](./07.png)
-
-    ![New GitOps configuration](./08.png)
-
-    ![New GitOps configuration](./09.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking the GitOps flow, let's verify and "zoom in" to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-- Show the Flux operator pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./10.png)
-
-- Show 3 replicas of the "Hello Arc" application and the NGINX controller.
-
-    ```shell
-    kubectl get pods -n hello-arc
-    ```
-
-    ![kubectl get pods -n hello-arc](./11.png)
-
-- Show NGINX controller Kubernetes Service (Type _LoadBalancer_).
-
-    ```shell
-    kubectl get svc -n hello-arc
-    ```
-
-    ![kubectl get svc -n hello-arc](./12.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./13.png)
-
-- The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" of the "Hello Arc" application, this is the configuration we deployed against the Azure Arc connected cluster. The operator "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure_arc/blob/main/artifacts/hello-arc) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux operator to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./14.png)
-
-  - In **Your fork** of the "Azure Arc Jumpstart App" repository, open the *hello_arc.yaml* file (/hello-arc/yaml/hello_arc.yaml).
-
-  - The external IP address of the Kubernetes Service seen using the ```kubectl get svc -n hello-arc``` command.
-
-    ![kubectl get svc -n hello-arc](./15.png)
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./16.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./17.png)
-
-- In the repository window showing the _hello_arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./18.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./19.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./20.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_gitops_helm/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_gitops_helm/_index.md
deleted file mode 100644
index 45fcdd4b3f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_gitops_helm/_index.md
+++ /dev/null
@@ -1,249 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform Helm-based GitOps flow on Cluster API as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform Helm-based GitOps flow on Cluster API as an Azure Arc Connected Cluster (Flux v2)"
-weight: 2
-description: >
----
-
-## Deploy GitOps configurations and perform Helm-based GitOps flow on Cluster API as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create [Helm](https://helm.sh/)-based GitOps configuration on a Cluster API which is projected as an Azure Arc-connected cluster resource.
-
-In this scenario, you will deploy & attach two GitOps configurations to your cluster, a cluster-level config to deploy [nginx-ingress controller](https://kubernetes.github.io/ingress-nginx/) and a namespace-level config to deploy the "Hello Arc" web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy. The Flux toolkit component Helm Controller is a Kubernetes operator, allowing one to declaratively manage Helm chart releases with Kubernetes manifests. The Operator is aware of the “HelmRelease” Custom Resource Definition (CRD). This HelmRelease points to a HELM chart in a git repo and can optionally contain specific values to input into the helm chart.
-
-> **NOTE: This guide assumes you already deployed a Cluster API and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using a [Shell script](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a Cluster API projected as an Azure Arc connected cluster.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the CAPI cluster and has it connected as an Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create GitOps configurations on the Azure Arc-connected Kubernetes cluster.
-
-- The GitOps configurations will create the namespace, deploy NGINX Ingress controller and Hello-Arc application.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Mesh, security products, monitoring solutions, etc. A very popular example will also be ingress controllers, which is exactly the Nginx ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and its respective pods, services, ingress routes, etc. In the next section, will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration with Helm
-
-To create the GitOps Configuration, we will use the _`k8s-configuration flux create`_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-> **NOTE: Before configuring GitOps, make sure that the _kubectl_ context is pointing to your Azure Arc-enabled Kubernetes cluster. To do that, you can refer to the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/) to find the options to change the kubecontext to different Kubernetes clusters.**
-
-![Screenshot showing current kubectl context pointing to CAPI cluster](./03.png)
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure portal with no Azure Arc-enabled Kubernetes GitOps configurations](./04.png)
-
-### Deployment Flow
-
-For our scenario, notice we have two Helm charts in the "Azure Arc Jumpstart Apps" repository; one for nginx and one for the Hello-Arc application as well as an Helm Release for each.
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./05.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./06.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./07.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./08.png)
-
-- The nginx-ingress controller (a Cluster-level component) will be deployed with 2 replicas to the *ingress-nginx* namespace.
-
-- The "Hello Arc" application (a Namespace-level component) will be deployed with 3 replica to the *hello-arc* namespace.
-
-### Deployment
-
-- Download [the script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/gitops/helm/az_k8sconfig_helm_capi.sh) using below command
-
-    ```shell
-    curl -L https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/cluster_api/gitops/helm/az_k8sconfig_helm_capi.sh -o ~/az_k8sconfig_helm_capi.sh
-    ```
-
-- Edit the environment variables to match your environment parameters followed by running the _`. ./az_k8sconfig_helm_capi.sh`_ command.
-
-    ![Screenshot parameter](./09.png)
-
-    For example:
-
-    ![Screenshot parameter examples](./10.png)
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    The script will:
-
-  - Log in to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Create the GitOps configurations to deploy the Flux controllers and NGINX ingress controller on the Azure Arc-connected cluster
-  - Create the GitOps configurations to deploy the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "_sync-interval 3s_" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval rapidly track changes on the repository but it is recommended to have a longer interval in your production environment (the default value is 5min)**
-
-- Once the script will complete it's run, you will have the GitOps configuration create all the resources deployed in your Kubernetes cluster. **Note** that it takes a few min for the configuration to change status from "Pending" to Install.
-
-    ![Flux extension](./11.png)
-
-    ![New GitOps configuration](./12.png)
-
-    ![NGINX GitOps configuration](./13.png)
-
-    ![App GitOps configuration](./14.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking off the GitOps flow, let's verify and "zoom in" to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-- Show the Flux operator pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./15.png)
-
-- Show 3 replicas and service of the "Hello Arc" application.
-
-    ```shell
-    kubectl get pods,svc -n hello-arc
-    ```
-
-    ![kubectl get pods,svc -n hello-arc](./16.png)
-
-- Show NGINX controller replicas and Kubernetes Service (Type _LoadBalancer_).
-
-    ```shell
-    kubectl get pods,svc -n ingress-nginx
-    ```
-
-    ![kubectl get pods,svc -n hello-arc](./17.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./18.png)
-
-## Initiating "Hello Arc" Application GitOps
-
-- The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" for both the NGINX Ingress Controller and the "Hello Arc" Helm releases, this is the configuration we deployed against the Azure Arc connected cluster. The operator "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux operator to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./19.png)
-
-  - In **your fork** of the "Azure Arc Jumpstart App" repository, open the *hello-arc.yaml* file (/hello-arc/releases/app/hello-arc.yaml).
-
-  - The external IP address of the Kubernetes Service is seen using the _`kubectl get svc -n ingress-nginx`_ command.
-
-    ![kubectl get svc -n ingress-nginx](./20.png)
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./21.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./22.png)
-
-- In the repository window showing the _hello-arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./23.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./24.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./25.png)
-
-## Cleanup
-
-To delete the GitOps configuration and it's respective Kubernetes resources, edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [az_k8sconfig_helm_cleanup](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/gitops/helm/az_k8sconfig_helm_cleanup.sh) script, upload it to Cloud Shell and run it using the _`. ./az_k8sconfig_helm_cleanup.sh`_ command.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_keyvault_extension/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_keyvault_extension/_index.md
deleted file mode 100644
index bb9db01959..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_keyvault_extension/_index.md
+++ /dev/null
@@ -1,157 +0,0 @@
----
-type: docs
-title: "Integrate Azure Key Vault with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"
-linkTitle: "Integrate Azure Key Vault with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"
-weight: 4
-description: >
----
-
-## Integrate Azure Key Vault with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions
-
-The following Jumpstart scenario will guide you on how to enable [Azure Key Vault](https://docs.microsoft.com/azure/key-vault/general/overview) for a Cluster API that is projected as an Azure Arc connected cluster.
-
-in this scenario, you will hook the Cluster API to Azure Key Vault by deploying the Azure Key Vault extension and a sample app on your Kubernetes cluster in order to integrate Azure Key Vault as a secrets store with a Kubernetes cluster via a [Container Storage Interface (CSI)](https://kubernetes-csi.github.io/docs/) volume. This will also include deploying a Key Vault and sample secret on your Azure subscription.
-
-> **NOTE: This guide assumes you already deployed a Cluster API and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using a [Shell script](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/).**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI, and portal UX for the deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the Kubernetes cluster using Cluster API and has it connected as Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the extension deployment.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Azure Key Vault Secrets Provider extension on the Azure Arc connected cluster.
-
-- The script will also deploy the Key Vault, sample secret to Azure Subscription, and a sample app to Azure Arc-enabled Kubernetes cluster
-
-- User is verifying the cluster and making sure the extension is deployed.
-
-- User is checking the secret value mounted in a Kubernetes pod.
-
-## Create Azure Key Vault extensions instance
-
-To create a new extension Instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Azure Key Vault extension on your Azure Arc-enabled Kubernetes cluster.
-
-> **NOTE: Before installing the Key Vault extension, make sure that the _kubectl_ context is pointing to your Azure Arc-enabled Kubernetes cluster. To do that, you can refer to the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/) to find the options to change the kubecontext to different Kubernetes clusters.**
-
-![Screenshot showing current kubectl context pointing to CAPI cluster](./01.png)
-
-- In the screenshot below, notice how currently there are no extensions installed yet in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./02.png)
-
-- Edit the environment variables [in the script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/capi_keyvault_extension/capi_keyvault_k8s_extension.sh) to match your environment parameters followed by running the _`. ./azure_keyvault_k8s_extension.sh`_ command.
-
-    ![Screenshot parameter examples](./03.png)
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-   The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  - Create Resource Group, Key Vault and a sample secret
-  - Create Azure Key Vault k8s extension instance
-  - Create Kubernetes Secret for supporting SPN Authentication
-  - Create Secret Provider Class to read the secrets
-  - Deploy the app
-
-- You can now see that Azure Key Vault extensions are now enabled in the extension tab section of the Azure Arc-enabled Kubernetes cluster resource in Azure.
-
-    ![Screenshot extension deployment extensions tab](./04.png)
-
-- You can also verify the deployment by running the below _kubectl_ commands and seeing the deployed artifacts in the _kube-system_ namespace.
-
-    ```shell
-    kubectl get pods,secret -n hello-arc
-    kubectl get secretproviderclass -n hello-arc
-
-    kubectl get customresourcedefinitions \
-    secretproviderclasses.secrets-store.csi.x-k8s.io \
-    secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io
-    ```
-
-    ![Screenshot extension and app deployment](./05.png)
-
-    ![Screenshot extension and app deployment](./06.png)
-
-## Validate the Secrets
-
-- To verify that Azure Key Vault Secret Provider is working properly and fetching the secrets, run the below command to show secrets held in secrets-store:
-
-    ```shell
-    kubectl -n hello-arc exec busybox-secrets-sync -- ls /mnt/secrets-store/
-    ```
-
-    ![Screenshot Kubernetes App Pod secret store](./07.png)
-
-- Run the below command to print a test secret held in secrets-store:
-
-    ```shell
-    kubectl -n hello-arc exec busybox-secrets-sync -- sh -c 'echo $SECRET_USERNAME'
-    ```
-
-    ![Screenshot Kubernetes App Pod secret](./08.png)
-
-## Delete extension instance
-
-- The following command only deletes the extension instance.
-
-    ```shell
-    az k8s-extension delete --name <extension-name> --cluster-type connectedClusters --cluster-name <cluster-name> --resource-group <resource-group>
-    ```
-
-- You can also delete the extension from the Azure Portal under the extensions section of the Azure Arc-enabled Kubernetes cluster resource.
-
-    ![Screenshot showing uninstalling of the extension](./09.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_osm_extension/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_osm_extension/_index.md
deleted file mode 100644
index 089df79b5c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_osm_extension/_index.md
+++ /dev/null
@@ -1,153 +0,0 @@
----
-type: docs
-title: "Integrate Open Service Mesh (OSM) with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"
-linkTitle: "Integrate Open Service Mesh with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions"
-weight: 5
-description: >
----
-
-## Integrate Open Service Mesh (OSM) with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions
-
-The following Jumpstart scenario will guide you on how to enable [Open Service Mesh](https://openservicemesh.io/) for a Cluster API that is projected as an Azure Arc connected cluster. Open Service Mesh (OSM) is a lightweight, extensible, Cloud Native service mesh that allows users to uniformly manage, secure, and get out-of-the-box observability features for highly dynamic microservice environments.
-
-in this scenario, you will hook the Cluster API to Open Service Mesh by deploying the [Open Service Mesh extension](https://aka.ms/arc-osm-doc) on your Kubernetes cluster in order to start collecting security-related logs and telemetry. Arc-enabled Open Service Mesh will have deep integrations into Azure monitor, and provide a seamless Azure experience for viewing and responding to critical KPIs provided by OSM metrics. This guide also provides you the automation to test Azure monitor integration with Arc-enabled Open Service Mesh.
-
-> **NOTE: This guide assumes you already deployed a Cluster API and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using a [Shell script](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/).**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI, and portal UX for the deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed Kubernetes using Cluster API and has it connected as Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables on the Shell script file (1-time edit) which then be used throughout the extension deployment.
-
-- User will set the current kubectl context to the connected Azure Arc-enabled Kubernetes cluster.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Open Service Mesh extension and Azure monitor extension on the Azure Arc connected cluster.
-
-- The script will also deploy the sample app (bookstore) to Azure Arc-enabled Kubernetes cluster and onboard the app namespaces with OSM to monitor.
-
-- User is verifying the cluster and make sure OSM extension enabled.
-
-- User check the monitoring insights to confirm OSM start capturing the logs and metrics from the custom app sending it over to Azure Monitor.
-
-## Create Open Service Mesh and Azure Monitor extension instances with sample app
-
-To create a new extension Instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Open Service Mesh extension on your Azure Arc-enabled Kubernetes cluster.
-
-> **NOTE: Before installing the Open Service Mesh extension, make sure that the kubectl context is pointing to your Azure Arc-enabled Kubernetes cluster. To do that, you can refer to the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/) to find the options to change the kubecontext to different Kubernetes clusters.**
-
-![Screenshot showing current kubectl context pointing to CAPI cluster](./01.png)
-
-- In the screenshot below, notice how currently there are no extensions installed yet in your Arc-enabled Kubernetes cluster.
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./02.png)
-
-- Edit the environment variables in the [_capi_osm_extension.sh_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/cluster_api/capi_osm_extension/capi_osm_extension.sh) shell script to match your environment parameters followed by running the ```. ./capi_osm_extension.sh``` command.
-
-  ![Screenshot parameter examples](./03.png)
-
-  > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-  The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  - Create Open Service Mesh k8s extension instance
-  - Create Azure Monitor k8s extension instance
-  - Download and install OSM cli locally
-  - Create four namespaces in kubernetes to deploy a test app
-  - Onboard the Namespaces to the OSM Mesh and enable sidecar injection on the namespaces
-  - Enable metrics for pods belonging to app namespaces
-  - Update the namespaces to be monitored by modifying the configmap provided by the OSM
-  - Deploy the apps to the namespaces
-
-- You can now see that Open Service Mesh & Azure Monitor for containers extensions are now enabled in the extension tab section of the Azure Arc-enabled Kubernetes cluster resource in Azure.
-
-  ![Screenshot extension deployment settings tab](./04.png)
-
-- You can also verify the deployment by running the below _kubectl_ commands and see the deployed artifacts in the _arc-osm-system_ namespace.
-
-    ```shell
-    kubectl get all -n arc-osm-system
-    kubectl get mutatingwebhookconfigurations.admissionregistration.k8s.io arc-osm-webhook-osm
-    kubectl get customresourcedefinitions.apiextensions.k8s.io
-    ```
-
-  ![Screenshot extension deployment on cluster](./05.png)
-
-- It can take ~15 minutes before you will be able to verify the integration and monitoring insights coming from OSM to Azure Monitor by following the below steps in the Azure portal.
-
-  - Verify the namespaces are showing up in the insights section of the Arc-enabled Kubernetes resource in Azure portal. Browse to the Insights tab under monitoring.
-
-    ![Screenshot showing the namespaces in the Container Insights](./06.png)
-
-  - Verify if monitoring working correctly by query the logs for pulling the data from the InsightsMetrics schema. Browse to the logs query under monitoring and run below query.
-  
-    ```shell
-    InsightsMetrics | where Name contains "envoy" | extend t=parse_json(Tags) | where t.app == "bookstore"
-    ```
-
-    ![Screenshot showing the InsightsMetrics logs](./07.png)
-
-### Delete extension instances
-
-- The following command only deletes the extension instances but doesn't delete the Log Analytics workspace.
-
-    ```shell
-    az k8s-extension delete --cluster-type connectedClusters --cluster-name <name of the cluster> --resource-group <name of the resource group> --name <name of the extension> -y
-    ```
-
-- You can also delete the extensions from the Azure portal under the extensions section of the Azure Arc-enabled Kubernetes cluster resource.
-
-  ![Screenshot showing uninstalling of the extension](./08.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/_index.md
deleted file mode 100644
index 990b294f14..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "GKE"
-linkTitle: "GKE"
-weight: 4
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_basic/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_basic/_index.md
deleted file mode 100644
index 9d5480aee2..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_basic/_index.md
+++ /dev/null
@@ -1,230 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster (Flux v2)"
-weight: 1
-description: >
----
-
-## Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create GitOps configuration on a Google Kubernetes Engine (GKE) cluster which is projected as an Azure Arc connected cluster resource.
-
-In this scenario, you will deploy & attach GitOps configuration to your cluster which will also include deploying an "Hello Arc" web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy.
-
-**NOTE: This guide assumes you already deployed a GKE cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a connected GKE cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the GKE cluster and has it connected as Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create GitOps configurations on the Azure Arc-connected Kubernetes cluster.
-
-- The script will also create a namespace and deploy Nginx Ingress Controller.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have an "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Meshes, Security products, Monitoring solutions, etc. A very popular example will also be Ingress Controller which is exactly the nginx-ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and it's respective pods, services, ingress routes, etc. In the next section will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration
-
-To create the GitOps Configuration, we will use the _k8s-configuration flux create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure portal with no Azure Arc-enabled Kubernetes GitOps configurations](./03.png)
-
-- In order to keep your local environment clean and untouched, we will use [Google Cloud Shell](https://cloud.google.com/shell) to run the *az_k8sconfig_gke* shell script against the GKE connected cluster.
-
-- Edit the environment variables in the [*az_k8sconfig_gke*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/gitops/basic/az_k8sconfig_gke.sh) shell script to match your parameters, upload it to the Cloud Shell environment and run it using the _`. ./az_k8sconfig_gke.sh`_ command.
-
-    > **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Screenshot parameter](./04.png)
-
-    For example:
-
-    ![Screenshot parameter examples](./05.png)
-
-    ![Open Google Cloud Shell session and authenticate against the GKE cluster](./06.png)
-
-    ![Open Google Cloud Shell session and authenticate against the GKE cluster](./07.png)
-
-    ![Upload a file to Cloud Shell](./08.png)
-
-    ![Upload a file to Cloud Shell](./09.png)
-
-    ![Upload a file to Cloud Shell](./10.png)
-
-    The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Use Helm to deploy NGINX ingress controller
-  - Create the GitOps configurations and deploy the Flux controllers on the Azure Arc connected cluster
-  - Deploy the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/tree/main/hello-arc/yaml) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "_sync-interval 3s_" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval to rapidly track changes on the repository but it is recommended to have longer interval in your production environment (the default value is 5min)**
-
-- Once the script will complete it's run, you will have the GitOps configuration created and all the resources deployed in your Kubernetes cluster.
-
-    > **NOTE: that it takes few min for the GitOps configuration change it's state status from "Creating" to Succeeded.**
-
-    ![Flux extension](./11.png)
-
-    ![New GitOps configurations](./12.png)
-
-    ![New GitOps configurations](./13.png)
-
-    ![New GitOps configurations](./14.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking the GitOps flow, let's verify and "zoom-in" to the Kubernetes resources deployed by running few _kubectl_ commands.
-
-- Show the Flux agent and controller pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./15.png)
-
-- Show 3 replicas of the "Hello Arc" application and the NGINX controller.
-
-    ```shell
-    kubectl get pods -n hello-arc
-    ```
-
-    ![kubectl get pods -n hello-arc](./16.png)
-
-- Show NGINX controller Kubernetes Service (Type _LoadBalancer_).
-
-    ```shell
-    kubectl get svc -n hello-arc
-    ```
-
-    ![kubectl get svc -n hello-arc](./17.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./18.png)
-
-- The GitOps flow works as follow:
-
-    1. The Flux controller holds the "desired state" of the "Hello Arc" application, this is the configuration we deployed against the Azure Arc connected cluster. The controllers "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/tree/main/hello-arc/yaml) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux controllers to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Azure Cloud Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./19.png)
-
-  - In **your fork** of the "Azure Arc Jumpstart" repository, open the *hello_arc.yaml* file (/hello-arc/yaml/hello_arc.yaml).
-
-  - The external IP address of the Kubernetes Service seen using the _`kubectl get svc -n hello-arc`_ command.
-
-    ![kubectl get svc -n hello-arc](./20.png)
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./21.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./22.png)
-
-- In the repository window showing the _hello_arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./23.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./24.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./25.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_helm/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_helm/_index.md
deleted file mode 100644
index 25bae040d1..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_helm/_index.md
+++ /dev/null
@@ -1,255 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform Helm-based GitOps flow on GKE as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform Helm-based GitOps flow on GKE as an Azure Arc Connected Cluster (Flux v2)"
-weight: 2
-description: >
----
-
-## Deploy GitOps configurations and perform Helm-based GitOps flow on GKE as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create [Helm](https://helm.sh/)-based GitOps configuration on a Google Kubernetes Engine (GKE) cluster which is projected as an Azure Arc connected cluster resource.
-
-In this scenario, you will deploy & attach two GitOps configurations to your cluster, a cluster-level config to deploy [nginx-ingress controller](https://kubernetes.github.io/ingress-nginx/) and a namespace-level config to deploy the "Hello Arc" web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy. The Flux toolkit component Helm Controller is a Kubernetes operator, allowing one to declaratively manage Helm chart releases with Kubernetes manifests. The Operator is aware of the “HelmRelease” Custom Resource Definition (CRD). This HelmRelease points to a helm chart in a git repo and can optionally contain specific values to input into the helm chart.
-
-**NOTE: This guide assumes you already deployed a GKE cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a connected GKE cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the GKE cluster and has it connected as an Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create GitOps configurations on the Azure Arc-connected Kubernetes cluster.
-
-- The GitOps configurations will create the namespace, deploy NGINX Ingress controller and Hello-Arc application.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have an "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Meshes, Security products, Monitoring solutions, etc. A very popular example will also be Ingress Controller which is exactly the nginx-ingress controller we will deploy in the next section.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and it's respective pods, services, ingress routes, etc. In the next section will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration with Helm
-
-To create the GitOps Configuration, we will use the _`k8s-configuration flux create`_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure portal with no Azure Arc-enabled Kubernetes GitOps configurations](./03.png)
-
-### Deployment Flow
-
-For our scenario, notice we have two Helm charts in the "Azure Arc Jumpstart Apps" repository; one for nginx and one for the Hello-Arc application as well as an Helm Release for each.
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./04.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./05.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./06.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./07.png)
-
-- The nginx-ingress controller (a Cluster-level component) will be deployed with 2 replicas to the *ingress-nginx* namespace.
-
-- The "Hello Arc" application (a Namespace-level component) will be deployed with 3 replica to the *hello-arc* namespace.
-
-### Deployment
-
-- In order to keep your local environment clean and untouched, we will use [Google Cloud Shell](https://cloud.google.com/shell) to run the [*az_k8sconfig_helm_gke*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/gitops/helm/az_k8sconfig_helm_gke.sh) shell script against the GKE connected cluster.
-
-- Edit the environment variables in the [*az_k8sconfig_helm_gke*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/gitops/helm/az_k8sconfig_helm_gke.sh) shell script to match your parameters, upload it to the Cloud Shell environment and run it using the _`. ./az_k8sconfig_helm_gke`_ command.
-
-    > **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Screenshot parameter](./08.png)
-
-    For example:
-
-    ![Screenshot parameter examples](./09.png)
-
-    ![Open Google Cloud Shell session and authenticate against the GKE cluster](./10.png)
-
-    ![Open Google Cloud Shell session and authenticate against the GKE cluster](./11.png)
-
-    ![Upload a file to Cloud Shell](./12.png)
-
-    ![Upload a file to Cloud Shell](./13.png)
-
-    ![Upload a file to Cloud Shell](./14.png)
-
-    The script will:
-
-  - Install Helm 3 in Google Cloud Shell
-  - Install Azure CLI & Azure Arc extensions
-  - Login to your Azure subscription using the SPN credentials
-  - Create the GitOps configuration to deploy the Flux controllers and NGINX ingress controller on the Azure Arc-connected cluster
-  - Create the GitOps configuration to deploy the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "_sync-interval 3s_" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval rapidly track changes on the repository but it is recommended to have a longer interval in your production environment (the default value is 5min)**
-
-- Once the script will complete it's run, you will have two GitOps configuration created and all the resources deployed in your Kubernetes cluster.
-
-    > **NOTE:** that it takes few min for the GitOps configuration change it's state status from "Creating" to Succeeded.
-
-    ![Flux extension](./15.png)
-
-    ![New GitOps configurations](./16.png)
-
-    ![NGINX GitOps configuration](./17.png)
-
-    ![App GitOps configuration](./18.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking off the GitOps flow, let's verify and "zoom in" to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-- Show the Flux operator pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./19.png)
-
-- Show 3 replicas and service of the "Hello Arc" application.
-
-    ```shell
-    kubectl get pods,svc -n hello-arc
-    ```
-
-    ![kubectl get pods,svc -n hello-arc](./20.png)
-
-- Show NGINX controller replicas and Kubernetes Service (Type _LoadBalancer_).
-
-    ```shell
-    kubectl get pods,svc -n ingress-nginx
-    ```
-
-    ![kubectl get pods,svc -n ingress-nginx](./21.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./22.png)
-
-## Initiating "Hello Arc" Application GitOps
-
-- The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" for both the NGINX Ingress Controller and the "Hello Arc" Helm releases, this is the configuration we deployed against the Azure Arc connected cluster. The operator "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux operator to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Azure Cloud Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./23.png)
-
-  - In **your fork** of the "Azure Arc Jumpstart App" repository, open the *hello-arc.yaml* file (/hello-arc/releases/app/hello-arc.yaml).
-
-  - The external IP address of the Kubernetes Service is seen using the _`kubectl get svc -n ingress-nginx`_ command.
-
-    ![kubectl get svc -n ingress-nginx](./24.png)
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./25.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./26.png)
-
-- In the repository window showing the _hello-arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./27.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./28.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./29.png)
-
-## Cleanup
-
-To delete the GitOps configuration and it's respective Kubernetes resources, edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [az_k8sconfig_helm_cleanup](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/gitops/helm/az_k8sconfig_helm_cleanup.sh) script, upload it to Cloud Shell and run it using the _`. ./az_k8sconfig_helm_cleanup.sh`_ command.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor/_index.md
deleted file mode 100644
index b270a0863a..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor/_index.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-type: docs
-title: "Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using a Shell script"
-linkTitle: "Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using a Shell script"
-weight: 3
-description: >
----
-
-## Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using a Shell script
-
-The following Jumpstart scenario will guide you on how to enable [Azure Monitor for Containers](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) for a Google Kubernetes Engine (GKE) cluster that is projected as an Azure Arc connected cluster using a Shell script.
-
-in this scenario, you will hook the GKE cluster to Azure Monitor by deploying the [Azure Monitor agent](https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent) on your Kubernetes cluster in order to start collecting telemetry.  
-
-> **NOTE: This guide assumes you already deployed a GKE cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Azure Monitor for Containers Integration
-
-* In order to keep your local environment clean and untouched, we will use [Google Cloud Shell](https://cloud.google.com/shell) to run the [*gke_monitor_onboarding*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/gke_monitor/gke_monitor_onboarding.sh) shell script against the GKE connected cluster.
-
-* Before integrating the cluster with Azure Monitor for Containers, click on the "Insights (preview)" blade for the connected Arc cluster to show how the cluster is not currently being monitored.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./01.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource Insights](./02.png)
-
-* Edit the environment variables in the script to match your environment parameters, upload it to the Cloud Shell environment and run it using the ```. ./gke_monitor_onboarding.sh``` command.
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Screenshot showing GKE cluster in GCP console](./03.png)
-
-    ![Screenshot showing connection to GKE cluster in GCP console](./04.png)
-
-    ![Screenshot showing GKE cluster in GCP console](./05.png)
-
-    ![Screenshot showing GKE cluster in GCP console](./06.png)
-
-    ![Screenshot showing GKE cluster in GCP console](./07.png)
-
-    The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Download the Azure Monitor agent script
-  * Retrieve cluster Azure resource ID as well as the cluster credentials (KUBECONFIG)
-  * Execute the script which will create Azure Log Analytics workspace, deploy the Azure Monitor agent on the Kubernetes cluster and tag the cluster
-  * Delete the downloaded script
-
-* Once the script will complete it's run, you will have an Azure Arc connected cluster integrated with Azure Monitor for Containers. At the end of it's run, the script generates URL for you to click on. This URL will open a new browser tab leading to the Azure Monitor for Containers Insights page.a
-
-    > **NOTE: As the Azure Monitor agent starts collecting telemetry from the cluster nodes and pods, it will take 5-10min for data to start show up in the Azure Portal.**
-
-    ![Screenshot showing script being run](./08.png)
-
-    ![Screenshot showing deployment](./09.png)
-
-* Click the "Connected Clusters" tab and see the Azure Arc connected cluster was added. Now that your cluster is being monitored, navigate through the different tabs and sections and watch the monitoring telemetry for the cluster nodes and pods.  
-
-    ![Screenshot showing Azure Portal with connected cluster detail](./10.png)
-
-    ![Screenshot showing Azure Portal with connected cluster detail](./11.png)
-
-    ![Screenshot showing Azure Portal with connected cluster detail](./12.png)
-
-    ![Screenshot showing Azure Portal with connected cluster detail](./13.png)
-
-    ![Screenshot showing Azure Portal with connected cluster detail](./14.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/_index.md
deleted file mode 100644
index dce4f68892..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/_index.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-type: docs
-title: "Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using cluster extensions"
-linkTitle: "Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using cluster extensions"
-weight: 3
-description: >
----
-
-## Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using cluster extensions
-
-The following Jumpstart scenario will guide you on how to enable [Azure Monitor for Containers](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) for a Google Kubernetes Engine (GKE) cluster that is projected as an Azure Arc connected cluster.
-
-in this scenario, you will hook the GKE cluster to Azure Monitor by deploying the Azure Monitor agent](https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent) on your Kubernetes cluster in order to start collecting telemetry.  
-
-> **NOTE: This guide assumes you already deployed a GKE cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/).**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI and portal UX for deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Create Azure monitor extensions instance
-
-To create a new extension Instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Azure Monitor extension on your Azure Arc-enabled Kubernetes cluster
-
-* In order to keep your local environment clean and untouched, we will use [Google Cloud Shell](https://cloud.google.com/shell) to run the [*gke_monitor_onboarding*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/gke_monitor_extension/azure_monitor_k8s_extension.sh) shell script against the GKE connected cluster.
-
-* Before integrating the cluster with Azure Monitor for Containers, click on the "Insights (preview)" blade for the connected Arc cluster to show how the cluster is not currently being monitored.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./01.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource Insights](./02.png)
-
-* Edit the environment variables in the script to match your environment parameters and upload it to the Cloud Shell environment. After than run it using the ```. ./azure_monitor_k8s_extension.sh``` command.
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    ![Screenshot showing GKE cluster in GCP console](./03.png)
-
-    ![Screenshot showing connection to GKE cluster in GCP console](./04.png)
-
-    ![Screenshot showing uploading the script file to cloud shell](./05.png)
-
-    The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  * Create monitor k8s extension instance
-
-* You can see that the monitoring is enabled once you visit the Container Insights section of the Azure Arc-enabled Kubernetes cluster resource in Azure.
-
-    > **NOTE: As the Azure Monitor agent starts collecting telemetry from the cluster nodes and pods, it will take 5-10min for data to start show up in the Azure Portal.**
-
-* Click the "Connected Clusters" tab and see the Azure Arc connected cluster was added. Now that your cluster is being monitored, navigate through the different tabs and sections and watch the monitoring telemetry for the cluster nodes and pods.  
-
-![Screenshot showing Monitoring console](./06.png)
-
-### Delete extension instance
-
-The following command only deletes the extension instance, but doesn't delete the Log Analytics workspace. The data within the Log Analytics resource is left intact. You can visit the Insights seciton of Azure Arc resource in Azure Portal and can see the onboarding state as not connected.
-
-```bash
-az k8s-extension delete --name azuremonitor-containers --cluster-type connectedClusters --cluster-name <cluster-name> --resource-group <resource-group>
-```
-
- ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource Insights](./07.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_policy/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_policy/_index.md
deleted file mode 100644
index 3a738738d3..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_policy/_index.md
+++ /dev/null
@@ -1,216 +0,0 @@
----
-type: docs
-title: "Apply GitOps configurations on GKE as an Azure Arc Connected Cluster using Azure Policy for Kubernetes"
-linkTitle: "Apply GitOps configurations on GKE as an Azure Arc Connected Cluster using Azure Policy for Kubernetes"
-weight: 4
-description: >
----
-
-## Apply GitOps configurations on GKE as an Azure Arc Connected Cluster using Azure Policy for Kubernetes
-
-The following Jumpstart scenario will guide you on how to enable [Azure Policy for Kubernetes](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes#:~:text=Azure%20Policy%20extends%20Gatekeeper%20v3,Kubernetes%20clusters%20from%20one%20place.) on a Google Kubernetes Engine (GKE) cluster that is projected as an Azure Arc connected cluster as well as how to create GitOps policy to apply on the cluster.
-
-> **NOTE: This guide assumes you already deployed a GKE cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using [Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* As mentioned, this scenario starts at the point where you already have a connected GKE cluster to Azure Arc.
-
-    ![Existing GKE Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing GKE Azure Arc-enabled Kubernetes cluster](./02.png)
-
-* Before installing the Azure Policy addon or enabling any of the service features, your subscription must enable the Microsoft.PolicyInsights resource provider and create a role assignment for the cluster service principal. To do that, open [Azure Cloud Shell](https://shell.azure.com/) and run either the Azure CLI or Azure PowerShell command.
-
-    ![Azure Cloud Shell](./03.png)
-
-    Azure CLI:
-
-    ```shell
-    az provider register --namespace 'Microsoft.PolicyInsights'
-    ```
-
-    PowerShell:
-
-    ```powershell
-    Register-AzResourceProvider -ProviderNamespace 'Microsoft.PolicyInsights'
-    ```
-
-* To verify successful registration, run either the below Azure CLI or Azure PowerShell command.
-
-    Azure CLI:
-
-    ```shell
-    az provider show --namespace 'Microsoft.PolicyInsights'
-    ```
-
-    PowerShell:
-
-    ```powershell
-    Get-AzResourceProvider -ProviderNamespace 'Microsoft.PolicyInsights'
-    ```
-
-    ![Installing the Azure Policy addon resource provider](./04.png)
-
-    ![Installing the Azure Policy addon resource provider](./05.png)
-
-* Create Azure service principal (SP)
-
-    > **NOTE: This guide assumes you will be working with a service principal assigned with the 'Contributor' role as described below. If you want to further limit the Role-based access control (RBAC) scope of your service Principal, you can assign it with the 'Policy Insights Data Writer (Preview)' role the Azure Arc-enabled Kubernetes cluster as described [here](https://github.com/MicrosoftDocs/azure-docs/blob/master/articles/governance/policy/concepts/policy-for-kubernetes.md#install-azure-policy-add-on-for-azure-arc-enabled-kubernetes-preview).**
-
-* To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in Azure Cloud Shell).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Azure Policy for Azure Arc Connected Cluster Integration
-
-* In order to keep your local environment clean and untouched, we will use [Google Cloud Shell](https://cloud.google.com/shell) to run the [*gke_policy_onboarding*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/azure_policy/gke_policy_onboarding.sh) shell script against the GKE connected cluster.
-
-* Edit the environment variables in the script to match your environment parameters, upload it to the Cloud Shell environment and run it using the ```. ./gke_policy_onboarding.sh``` command. **If you decided to use the 'Policy Insights Data Writer (Preview)' role assignment as described in the perquisites section, make sure to use it's respective *appId*, *password* and *tenantId***.
-
-    **Note**: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.  
-
-    ![Run GCP Cloud Shell](./06.png)
-
-    ![Run GCP Cloud Shell](./07.png)
-
-    ![Upload a file to GCP Cloud Shell](./08.png)
-
-    ![Upload a file to GCP Cloud Shell](./09.png)
-
-    ![Upload a file to GCP Cloud Shell](./10.png)
-
-    The script will:
-
-  * Install Helm 3 & Azure CLI
-  * Install NGINX Ingress Controller
-  * Login to your Azure subscription using the SPN credentials
-  * Retrieve cluster Azure Resource ID
-  * Install the 'azure-policy-addon' helm chart & Gatekeeper
-
-    After few seconds, by running the the ```kubectl get pods -A``` command, you will notice all pods have been deployed.
-
-    ![kubectl get pods](./11.png)
-
-## Deploy GitOps to Azure Arc Kubernetes cluster using Azure Policy
-
-Although you can [deploy GitOps configuration individually](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_basic/) on each of your Azure Arc connected clusters, Azure Policy for Kubernetes allows to do the same on a broader scope (i.e Subscription or resource group). That way, you can guarantee existing and newly added Azure Arc connected clusters to all have the same GitOps configuration and as a result, the same cluster baseline and/or application version deployed.
-
-* Before assigning the policy, in the Azure portal, click the *Configuration* setting in your GKE connected cluster. Notice how no GitOps configurations are deployed.
-
-    ![No GitOps configurations](./12.png)
-
-* In the Search bar, look for *Policy* and click on *Definitions* which will show you all of the available Azure policies.
-
-    ![Search for Azure Policy Definitions in the Azure portal](./13.png)
-
-    ![Search for Azure Policy Definitions in the Azure portal](./14.png)
-
-* The "[Preview]: Deploy GitOps to Kubernetes cluster" policy is part of the Kubernetes policies. Once you filter to find these, click on the policy and the 'Assign' button.
-
-    ![Azure Policy in the Azure portal](./15.png)
-
-    ![Azure Policy definitions in the Azure portal](./16.png)
-
-* In the below example, the scope of the policy represent the resource group where the GKE connected cluster Azure Arc resource is located. Alternatively, the scope could have been the entire Azure subscription or a resource group with many Azure Arc connected clusters. Also, make sure *Policy enforcement* is set to *Enabled*.
-
-    For this GitOps configuration policy, we will be using the ["Hello Arc"](https://github.com/likamrat/hello_arc) application repository which includes the Kubernetes Service for external access, Deployment as well as the ingress rule to be used by the NGINX ingress controller.
-
-    ![Assign the "[Preview]: Deploy GitOps to Kubernetes cluster" Azure Policy](./17.png)
-
-    ![Assign the "[Preview]: Deploy GitOps to Kubernetes cluster" Azure Policy](./18.png)
-
-    ![Assign the "[Preview]: Deploy GitOps to Kubernetes cluster" Azure Policy](./19.png)
-
-    ![Assign the "[Preview]: Deploy GitOps to Kubernetes cluster" Azure Policy](./20.png)
-
-* Once the policy configuration deployed, after ~10-20min, the policy remediation task will start the evaluation against the Kubernetes cluster, recognize it as "Non-compliant" (since it's still does note have the GitOps configuration deployed) and lastly, after the configuration has been deployed the policy will move to a "Compliant" state. To check this, go back to the main Policy page in the Azure portal.
-
-    > **NOTE: The process of evaluation all the way to the point that the GitOps configuration is deployed against the cluster can take ~15-30min.**
-
-    ![Verifying Azure Policy status and compliance state](./21.png)
-
-    ![Verifying Azure Policy status and compliance state](./22.png)
-
-    ![Verifying Azure Policy status and compliance state](./23.png)
-
-    ![Verifying Azure Policy status and compliance state](./24.png)
-
-    ![Verifying Azure Policy status and compliance state](./25.png)
-
-## Verify GitOps Configuration & App Deployment
-
-* Now that the policy is in compliant state, let's first verify the GitOps configurations. In the Azure portal click the GKE connected Azure Arc cluster and open the Configurations settings.
-
-    ![Newly created GitOps configurations](./26.png)
-
-    ![Newly created GitOps configurations](./27.png)
-
-    ![Newly created GitOps configurations](./28.png)
-
-* In order to verify the "Hello Arc" application and it's component has been deployed, In the Google Cloud Shell, run the below commands.
-
-    ```shell
-    kubectl get pods -n hello-arc
-    kubectl get ing -n hello-arc
-    kubectl get svc -n hello-arc
-    ```
-
-    You can see how the Flux GitOps operator, Memcached, the "Hello Arc" application and the ingress rule now deployed on the cluster as well the Kubernetes service with an external IP.
-
-    ![Running kubectl commands to verifying successful deployment](./29.png)
-
-* Copy the Service external IP and paste in your browser to see the deployed "Hello Arc" application.
-
-    ![Deployed "Hello Arc" application](./30.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-* Delete the GKE cluster as described in the [teardown instructions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/).
-
-* From the Policy page in the Azure portal, remove the "[Preview]: Deploy GitOps to Kubernetes cluster" policy assignment from the cluster.
-
-    ![Delete Azure Policy assignment](./31.png)
-
-    ![Delete Azure Policy assignment](./32.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/kind/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/kind/_index.md
deleted file mode 100644
index 8b499169fd..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/kind/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Kind"
-linkTitle: "Kind"
-weight: 5
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/kind/local_kind_gitops_helm/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/kind/local_kind_gitops_helm/_index.md
deleted file mode 100644
index 982374aae4..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/kind/local_kind_gitops_helm/_index.md
+++ /dev/null
@@ -1,225 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform Helm-based GitOps flow on kind as an Azure Arc Connected Cluster"
-linkTitle: "Deploy GitOps configurations and perform Helm-based GitOps flow on kind as an Azure Arc Connected Cluster"
-weight: 1
-description: >
----
-
-## Deploy GitOps configurations and perform Helm-based GitOps flow on kind as an Azure Arc Connected Cluster
-
-The following Jumpstart scenario will guide you on how to create [Helm](https://helm.sh/)-based GitOps configuration on a [kind (Kubernetes in Docker)](https://kind.sigs.k8s.io/) cluster which is projected as an Azure Arc connected cluster resource.
-
-in this scenario, you will first deploy a nginx ingress controller to your cluster. Then you will deploy & attach a GitOps configuration to your cluster. This will be a namespace-level config to deploy the "Hello Arc" web application on your Kubernetes cluster.
-
-By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-> **NOTE: This guide assumes you already deployed a kind and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in the [kind onboarding guide](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/kind/local_kind/). Furthermore, kind should be deployed with [_kind_cluster_ingress.yaml_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/kind/kind_cluster_ingress.yaml) instead of _kind_cluster.yaml_**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* Fork the ["Hello Arc"](https://github.com/likamrat/hello_arc) demo application repository.
-
-* (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  * [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  * [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  * [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-* As mentioned, this scenario starts at the point where you already have a connected kind cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Manually setting up an ingress controller on kind
-
-The demo application that will be deployed later in this scenario relies on an ingress controller. For ingress controllers to work on kind, a specific configuration of the ingress needs to be deployed. For more information related to this, please refer to the [kind documentation](https://kind.sigs.k8s.io/docs/user/ingress/).
-
-## NGINX Controller Deployment
-
-* Run the following command to install the nginx ingress controller on kind:
-
-    ```shell
-    kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
-    ```
-
-* This command will create a new namespace and deploy the required components in this namespace. To verify the deployment of the ingress controller was successful, make sure the pod with name `ingress-nginx-controller-<random id>-<random id>` is in a running state with 1/1 containers ready:
-
-    ![Running ingress nginx controller](./03.png)
-
-> **NOTE: If the ingress controller fails to start, you should redeploy the kind cluster with [_kind_cluster_ingress.yaml_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/kind/kind_cluster_ingress.yaml) instead of _kind_cluster.yaml_.**
-
-* Finally, test that the ingress is responding to traffic. To test this, either browse to [http://localhost](http://localhost) or use the command line to connect to `localhost`. You should get a HTTP 404 response with a nginx footer. This shows that the ingress is working. The 404 response is to be expected since you haven't setup an ingress route yet. You will do that in the next section.
-
-    ![HTTP 404 response in a web browser](./04.png)
-
-    ![HTTP 404 response in a terminal](./05.png)
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Meshes, Security products, Monitoring solutions, etc.
-
-> **NOTE: You will not be creating a cluster-level config in this scenario. For an example of a cluster-level configuration please refer to either the [Helm-based GitOps on AKS scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_gitops_helm/) or the [GKE one](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_helm/).**
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and its respective pods, services, ingress routes, etc. In the next section will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration with Helm
-
-### The Mechanism (In a nutshell)
-
-In the process of creating Azure Arc-enabled Kubernetes GitOps configuration, [Weaveworks Flux Kubernetes Operator](https://github.com/fluxcd/flux) is deployed on the cluster.
-
-The Operator is aware of the "HelmRelease" Custom Resource Definition (CRD). This HelmRelease points to a HELM chart in a git repo and can optionally contain specific values to input into the helm chart. Due to this configuration, a user can choose to leave the chart values intact or to have different values for different releases.
-
-For example, an application (captured in an Helm chart) dev release can have no pod replication (single pod) while a production release, using the same chart can have 3 pod replicas.
-
-In the next section will use the "Hello Arc" Helm chart to deploy a production release which we will then change and see the results in real-time.
-
-### Deployment Flow
-
-For our scenario, we will deploy the "Hello Arc" application from the ["demo repository"](https://github.com/likamrat/hello_arc) through GitOps. We will deploy the "Hello Arc" application (a Namespace-level component) with 1 replica to the *prod* namespace.
-
-!["Hello Arc" application GitHub repository](./06.png)
-
-!["Hello Arc" application GitHub repository](./07.png)
-
-### Deployment
-
-* Edit the environment variables in the [*az_k8sconfig_helm_kind*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/kind/gitops/helm/az_k8sconfig_helm_kind.sh) shell script to match your parameters, and run it using the ```. az_k8sconfig_helm_kind.sh``` command.
-
-    > **NOTE: The extra dot is due to the script having an *export* function and that needs to have the vars exported in the same shell session as the rest of the commands.**
-
-    The `az_k8sconfig_helm_kind.sh` script will:
-
-  * Login to your Azure subscription using the SPN credentials.
-
-  * Create the GitOps configurations for the Azure Arc Connected Cluster. The configuration will be using the Helm chart located in the "Hello Arc" repository. This will create a namespace-level config to deploy the "Hello Arc" application Helm chart.
-
-    > **Disclaimer: For the purpose of this guide, notice how the "*git-poll-interval 3s*" is set. The 3 seconds interval is useful for demo purposes since it will make the git-poll interval to rapidly track changes on the repository but it is recommended to have longer interval in your production environment (default value is 5min)**
-
-* Once the script will complete its run, you will have the GitOps configuration created and all the resources deployed in your local kind Kubernetes cluster.
-
-    > **NOTE: it can take a few minutes for the configuration to change its Operator state status from "Pending" to "Installed".**
-
-    ![New GitOps configuration created](./08.png)
-
-    ![New GitOps configuration created](./09.png)
-
-* The Namespace-level config initiated the "Hello Arc" Pod (1 replica), Service and Ingress Route resource deployment.
-
-    ```shell
-    kubectl get pods -n prod
-    kubectl get svc -n prod
-    kubectl get ing -n prod
-    ```
-
-    !["Hello Arc" application deployed](./10.png)
-
-## Initiating "Hello Arc" Application GitOps
-
-* The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" of the "Hello Arc" Helm release. This is the configuration we deployed against the Azure Arc connected cluster. The operator will pull the state of the releases in the repository every 3 seconds.
-
-    2. Changing the application release will trigger the Flux operator to kick-in the GitOps flow. In our case, we will be changing the welcome message and the amount of replicas.
-
-    3. A new version of the application will be deployed on the cluster with more replicas as configured. Once the new pods are successfully deployed, the old ones will be terminated (rolling upgrade).
-
-* To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  * Local shell running ```kubectl get pods -n prod -w```
-
-    !['kubectl get pods' command](./11.png)
-
-  * In your own repository fork, open the "Hello Arc" [*hello-arc.yaml*](https://github.com/likamrat/hello_arc/blob/master/releases/prod/hello-arc.yaml) Helm release file.
-
-  * Another browser window that has the webpage <http://localhost> open  
-
-  * End result should look like this:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./12.png)
-
-* As mentioned in the prerequisites section, it is optional but very recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    !["Tab Auto Refresh" extension](./13.png)
-
-* In the repository window showing the *hello-arc.yaml* file, change the number of *replicaCount* to 3 as well as the the message text and commit your changes. Alternatively, you can open the forked repository in your IDE, make the change, commit and push it.
-
-    ![hello-arc.yaml file](./14.png)
-
-* Upon committing the changes, notice how the rolling upgrade starts. Once the Pods are up & running, the new "Hello Arc" application version window will show the new messages as well as the additional pods replicas, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    !["Hello Arc" application rolling upgrade in terminal](./15.png)
-
-    !["Hello Arc" application rolling upgrade in terminal](./16.png)
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the new application version open in a web browser](./17.png)
-
-## Cleanup
-
-* To delete the GitOps configuration and it's respective Kubernetes resources, edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [az_k8sconfig_helm_cleanup_kind](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/kind/gitops/helm/az_k8sconfig_helm_cleanup_kind.sh) shell script.It is recommended to run this script locally, since it also removes elements from the local cluster.
-
-    ```shell
-    . ./az_k8sconfig_helm_cleanup_kind.sh
-    ```
-
-    ![Cleanup script in terminal](./18.png)
-
-* If you also wish to remove the local kind cluster and the Arc connected cluster from Azure, you can run the following commands:
-
-    ```shell
-    kind delete cluster --name <cluster-name>
-    az group delete -n <resource group name>
-    ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/_index.md
deleted file mode 100644
index 286c0fd368..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Microk8s"
-linkTitle: "Microk8s"
-weight: 6
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_gitops_helm/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_gitops_helm/_index.md
deleted file mode 100644
index e71a4a6c17..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_gitops_helm/_index.md
+++ /dev/null
@@ -1,314 +0,0 @@
----
-type: docs
-title: "Deploy GitOps configurations and perform Helm-based GitOps flow on MicroK8s as an Azure Arc Connected Cluster (Flux v2)"
-linkTitle: "Deploy GitOps configurations and perform Helm-based GitOps flow on MicroK8s as an Azure Arc Connected Cluster (Flux v2)"
-weight: 1
-description: >
----
-
-## Deploy GitOps configurations and perform Helm-based GitOps flow on MicroK8s as an Azure Arc Connected Cluster (Flux v2)
-
-The following Jumpstart scenario will guide you on how to create [Helm](https://helm.sh/)-based GitOps configuration on a [MicroK8s](https://microk8s.io/) cluster which is projected as an Azure Arc connected cluster resource.
-
-In this scenario, you will deploy [nginx-ingress controller](https://kubernetes.github.io/ingress-nginx/) and a namespace-level config to deploy the "Hello Arc" web application on your Kubernetes cluster. By doing so, you will be able to make real-time changes to the application and show how the GitOps flow takes effect.
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/), a popular open-source toolset. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories) and automating updates to the configuration when there is new code to deploy. The Flux toolkit component Helm Controller is a Kubernetes operator, allowing one to declaratively manage Helm chart releases with Kubernetes manifests. The Operator is aware of the “HelmRelease” Custom Resource Definition (CRD). This _HelmRelease_ points to a helm chart in a git repo and can optionally contain specific values to input into the helm chart.
-
-> **NOTE: This guide assumes you already deployed MicroK8s and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in the [MicroK8s onboarding guide](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/microk8s/local_microk8s/).**
-
-## Prerequisites
-
-- Fork the ["Azure Arc Jumpstart Apps"](https://github.com/microsoft/azure-arc-jumpstart-apps) repository. In this scenario, you will be making changes on your own forked repository to initiate the GitOps flow.
-
-- (Optional) Install the "Tab Auto Refresh" extension for your browser. This will help you to show the real-time changes on the application in an automated way.
-
-  - [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/odiofbnciojkpogljollobmhplkhmofe)
-
-  - [Google Chrome](https://chrome.google.com/webstore/detail/tab-auto-refresh/jaioibhbkffompljnnipmpkeafhpicpd?hl=en)
-
-  - [Mozilla Firefox](https://addons.mozilla.org/firefox/addon/tab-auto-refresh/)
-
-- As mentioned, this scenario starts at the point where you already have a connected MicroK8s cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Export MicroK8s config
-
-    You can export MicroK8s cluster config to a file and use `kubectl` directly instead of `microk8s kubectl` command.
-
-  - Windows
-
-    ```shell
-    microk8s config view > %HOMEPATH%\.kube\microk8s
-    ```
-
-  - Linux
-
-    ```shell
-    microk8s config view > ~/.kube/microk8s
-    ```
-
-- From this point forward, this guide assumes you have exported MicroK8s config file and have set it in kubectl using `--kubeconfig` flag or `$KUBECONFIG` environment variable. More information can be found in [Organizing Cluster Access Using kubeconfig Files](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/).
-
-## Manually setting up an ingress controller on MicroK8s
-
-The demo application that will be deployed later in this scenario relies on an ingress controller. Given that MicroK8s needs [Multipass](https://multipass.run/) on Windows and MacOS, we'll not be covering that scenario and assuming Multipass is running.
-
-### NGINX Controller Deployment
-
-- Run the following command to install the nginx ingress controller on MicroK8s:
-
-    ```shell
-    kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.3.0/deploy/static/provider/baremetal/deploy.yaml
-    ```
-
-- This command will create a new namespace and deploy the required components in this namespace. To verify the deployment of the ingress controller was successful, make sure the pod with name `ingress-nginx-controller-<random id>-<random id>` is in a running state with 1/1 containers ready and that a service has been exposed as NodePort.
-
-    ```shell
-    kubectl get pods -n ingress-nginx
-    ```
-
-    ![Running ingress nginx controller](./03.png)
-
-    ```shell
-    kubectl get svc -n ingress-nginx
-    ```
-
-    ![Running ingress nginx controller service](./04.png)
-
-- Take note of the port where the ingress has been exposed (in the image above it was assigned port **32046**). We now need to get the IP address assigned to our microk8s-vm instance in multipass:
-
-    ```shell
-    multipass list
-    ```
-
-    ![multipass list](./05.png)
-
-- Combining the IP address from multipass and the NodePort assigned to the ingress controller, we can now test that the NGINX ingress controller has been deployed successfully. In our case, the full address becomes _`http://172.19.174.107:32046`_.
-
-- Using the below in your browser or command line, should get you with a HTTP 404 response with a nginx footer. This shows that the ingress is working. The 404 response is to be expected since you haven't setup an ingress route yet. You will do that in the next section.
-
-    ![HTTP 404 response in a web browser](./06.png)
-
-    ![HTTP 404 response in a terminal](./07.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the Microk8s cluster and has it connected as an Azure Arc-enabled Kubernetes cluster.
-
-- User has deployed the NGINX Ingress Controller
-
-- User is editing the environment variables in the script file (1-time edit) which then be used throughout the GitOps configuration.
-
-- User is running the script. The script will use the extension management feature of Azure Arc to deploy the Flux extension and create GitOps configuration on the Azure Arc-connected Kubernetes cluster.
-
-- The GitOps configuration will create the namespace and deploy Hello-Arc application.
-
-- User is verifying the cluster and making sure the extension and GitOps configuration is deployed.
-
-- User is making an edit on the GitHub repo that will cause Flux GitOps to detect this change and trigger an update to the pod deployment.
-
-## Cluster-level Config vs. Namespace-level Config
-
-### Cluster-level Config
-
-With Cluster-level GitOps config, the goal is to have an "horizontal components" or "management components" deployed on your Kubernetes cluster which will then be used by your applications. Good examples are Service Meshes, Security products, Monitoring solutions, etc.
-
-### Namespace-level Config
-
-With Namespace-level GitOps config, the goal is to have Kubernetes resources deployed only in the namespace selected. The most obvious use-case here is simply your application and it's respective pods, services, ingress routes, etc. In the next section will have the "Hello Arc" application deployed on a dedicated namespace.
-
-## Azure Arc Kubernetes GitOps Configuration with Helm
-
-To create the GitOps Configuration, we will use the _`k8s-configuration flux create`_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to configure the GitOps on your Azure Arc-enabled Kubernetes cluster.
-
-- In the screenshot below, notice how currently there is no GitOps configuration in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure portal with no Azure Arc-enabled Kubernetes GitOps configurations](./08.png)
-
-### Deployment Flow
-
-For our scenario, notice we have Helm chart in the "Azure Arc Jumpstart Apps" repository for the Hello-Arc application as well as the Helm Release.
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./09.png)
-
-!["Azure Arc Jumpstart Apps" GitHub repository](./10.png)
-
-- The "Hello Arc" application (a Namespace-level component) will be deployed with 3 replica to the _hello-arc_ namespace.
-
-### Deployment
-
-To create the GitOps configuration and it's respective Kubernetes resources, we've provided a script in a shell file (Linux, MacOS) and batch file (Windows).
-
-- Linux and MacOS
-
-    Edit the environment variables in the [_az_k8sconfig_helm_microk8s_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/microk8s/gitops/helm/az_k8sconfig_helm_microk8s.sh) shell script to match your parameters, and run the below command.
-
-    ```shell
-    . ./az_k8sconfig_helm_microk8s.sh
-    ```
-
-    > **NOTE: The extra dot is due to the script having an _export_ function and that needs to have the vars exported in the same shell session as the rest of the commands.**
-
-- Windows
-
-    Edit the environment variables in the [_az_k8sconfig_helm_microk8s_windows_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/microk8s/gitops/helm/az_k8sconfig_helm_microk8s_windows.ps1) PowerShell file to match your parameters, and run it using the ```.\az_k8sconfig_helm_microk8s.ps1``` command.
-
-    For example:
-
-    ![Screenshot parameter examples](./11.png)
-
-    The `az_k8sconfig_helm_microk8s` and `az_k8sconfig_helm_microk8s_windows` scripts will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Create the GitOps configuration to deploy the Flux controllers and the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application alongside an Ingress rule to make it available from outside the cluster
-
-    > **Disclaimer: For the purpose of this guide, notice how the "_sync-interval 3s_" is set. The 3 seconds interval is useful for demo purposes since it will make the sync interval rapidly track changes on the repository but it is recommended to have a longer interval in your production environment (the default value is 5min)**
-
-- Once the script will complete it's run, you will have the GitOps configuration create all the resources deployed in your Kubernetes cluster. **NOTE:** that it takes a few min for the configuration to change status from "Pending" to Installed.
-
-    ![Flux extension](./12.png)
-
-    ![New GitOps configurations](./13.png)
-
-    ![App GitOps configuration](./14.png)
-
-## The "Hello Arc" Application & Components
-
-- Before kicking off the GitOps flow, let's verify and "zoom in" to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-- Show the Flux operator pods.
-
-    ```shell
-    kubectl get pods -n flux-system 
-    ```
-
-    ![kubectl get pods -n flux-system ](./15.png)
-
-- Show 3 replicas and service of the "Hello Arc" application.
-
-    ```shell
-    kubectl get pods,svc -n hello-arc
-    ```
-
-    ![kubectl get pods,svc -n hello-arc](./16.png)
-
-- Show NGINX rule which will route the traffic to the "Hello Arc" application from outside the cluster.
-
-    ```shell
-    kubectl get ing -n hello-arc
-    ```
-
-    ![kubectl get ing -n hello-arc](./17.png)
-
-## Initiating "Hello Arc" Application GitOps
-
-- The GitOps flow works as follow:
-
-    1. The Flux operator holds the "desired state" for the "Hello Arc" Helm release, this is the configuration we deployed against the Azure Arc connected cluster. The operator "polls" the state of the ["Hello Arc"](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/hello-arc) application repository.
-
-    2. Changing the application, which is considered to be a new version of it, will trigger the Flux operator to kick in the GitOps flow.
-
-    3. A new Kubernetes pod with the new version of the application will be deployed on the cluster. Once the new pods are successfully deployed, the old one will be terminated (rolling upgrade).
-
-- To show the above flow, open 2 (ideally 3) side-by-side windows:
-
-  - Azure Cloud Shell running the command
-  
-      ```shell
-      kubectl get pods -n hello-arc -w
-      ```
-  
-    ![kubectl get pods -n hello-arc -w](./18.png)
-
-  - In **your fork** of the "Azure Arc Jumpstart Apps" repository, open the _hello-arc.yaml_ file (/hello-arc/releases/app/hello-arc.yaml).
-
-  - Another browser window that has the webpage <http://172.19.174.107:32046> open **(replace with your own values)**.
-
-  - End result should look like that:
-
-    ![Side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./19.png)
-
-- As mentioned in the prerequisites section, it is optional but highly recommended to configure the "Tab Auto Refresh" extension for your browser. If you did, in the "Hello Arc" application window, configure it to refresh every 2 seconds.
-
-    ![Tab Auto Refresh](./20.png)
-
-- In the repository window showing the _hello-arc.yaml_ file, change the text under the "MESSAGE" section commit the change. Alternatively, you can open your cloned repository in your IDE, make the change, commit and push it.
-
-    ![Making a change to the replica count and the "MESSAGE" section](./21.png)
-
-    ![Making a change to the replica count and the "MESSAGE" section](./22.png)
-
-- Upon committing the changes, notice how the Kubernetes Pod rolling upgrade will start. Once the Pod is up & running, the new "Hello Arc" application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-    ![New side-by-side view of terminal, "Hello Arc" GitHub repo and the application open in a web browser](./23.png)
-
-## Cleanup
-
-To delete the GitOps configuration and it's respective Kubernetes resources, we've provided a script in a shell file (Linux, MacOS) and a PowerShell file (Windows).
-
-- Linux and MacOS
-
-    Edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [_az_k8sconfig_helm_cleanup_microk8s_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/microk8s/gitops/helm/az_k8sconfig_helm_cleanup_microk8s.sh) shell script, then run the file:
-
-    ```shell
-    ./az_k8sconfig_helm_cleanup_microk8s.sh
-    ```
-
-- Windows
-
-    Edit the environment variables to match the Azure Arc Kubernetes cluster and Resources in the [_az_k8sconfig_helm_cleanup_microk8s_windows_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/microk8s/gitops/helm/az_k8sconfig_helm_cleanup_microk8s_windows.ps1) script, then run the file:
-
-    ```powershell
-    .\az_k8sconfig_helm_cleanup_microk8s_windows.ps1
-    ```
-
-- You should see the resources being deleted:
-
-    ![Cleanup script in terminal](./24.png)
-
-- If you also wish to remove the local MicroK8s cluster and the Arc connected cluster from Azure, please refer to the [Delete the Deployment section](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/microk8s/local_microk8s/#delete-the-deployment) in the onboarding guide.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_monitor/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_monitor/_index.md
deleted file mode 100644
index 079ebb674b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_monitor/_index.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-type: docs
-title: "Integrate Azure Monitor for Containers with MicroK8s as an Azure Arc Connected Cluster using a Shell script"
-linkTitle: "Integrate Azure Monitor for Containers with MicroK8s as an Azure Arc Connected Cluster using a Shell script"
-weight: 2
-description: >
----
-
-## Integrate Azure Monitor for Containers with MicroK8s as an Azure Arc Connected Cluster using a Shell script
-
-The following Jumpstart scenario will guide you on how to onboard an microK8s cluster which is projected an Azure Arc connected cluster resource on to [Azure Monitor for Containers](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) using a Shell script.
-
-in this scenario, you will hook the microK8s cluster to Azure Monitor by deploying the [Azure Monitor agent](https://docs.microsoft.com/azure/azure-monitor/platform/log-analytics-agent) on your Kubernetes cluster to start collecting telemetry.  
-
-> **NOTE: This guide assumes you already deployed MicroK8s and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in the [MicroK8s onboarding guide](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/microk8s/local_microk8s/).**
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Azure Monitor for Containers Integration
-
-* Retrieve either the shell and PowerShell scripts [provided](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/microk8s/azure_monitor).
-
-* Before integrating the cluster with Azure Monitor for Containers, click on the "Insights (preview)" blade for the connected Arc cluster to show how the cluster is not currently being monitored.
-
-    ![An existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![An existing Azure Arc-enabled Kubernetes cluster with no Azure Monitor integration](./02.png)
-
-* Edit the environment variables in either of the scripts to match your environment parameters, run it using the ```. ./microk8s_monitor_onboarding.sh``` (Bash) or ```./microk8s_monitor_onboarding.ps1``` (PowerShell) command.
-
-    ```shell
-    export subscriptionId='e73c1dbe-XXXX-XXXX-XXXX-c813757b1786'
-    export appId='051b9a58-XXXX-XXXX-XXXX-0e7ae1bca3fb'
-    export password='051b9a58-XXXX-XXXX-XXXX-0e7ae1bca3fb'
-    export tenantId='051b9a58-XXXX-XXXX-XXXX-0e7ae1bca3fb'
-    export resourceGroup='Arc-MicroK8s-Demo'
-    export arcClusterName='Arc-MicroK8s-Demo'
-    ```
-
-    The script will:
-
-  * Login to your Azure subscription using the SPN credentials
-  * Download the Azure Monitor agent script
-  * Retrieve the Azure Arc Connected Cluster Azure Resource ID as well as the cluster credentials (KUBECONFIG)
-  * Retrieve the Kube config using the `microk8s config` command and append the configuration to ~/.kube/config
-  * Execute the script which will create Azure Log Analytics workspace, deploy the Azure Monitor agent on the Kubernetes cluster and tag the cluster
-  * Delete the downloaded script
-
-  * Once the script will complete its run, you will have an Azure Arc connected cluster integrated with Azure Monitor for Containers.
-  
-At the end of its run, the script will generate a URL for you to click on, this URL will open a new browser tab leading to the Azure Monitor for Containers Insights page.
-
-  > **NOTE: As the Azure Monitor agent starts collecting telemetry from the cluster nodes and pods, it will take 5-10min for data to start show up in the Azure Portal.**
-
-  ![Installing the Azure Monitor agent on the cluster](./03.png)
-
-  ![Installing the Azure Monitor agent on the cluster](./04.png)
-
-* Click the "Connected Clusters" tab and see the Azure Arc connected cluster was added. Now that your cluster is being monitored, navigate through the different tabs and sections and watch the monitoring telemetry for the cluster nodes and pods.  
-
-    ![Agent install on the cluster](./05.png)
-
-    ![New Azure Monitor telemetry](./06.png)
-
-    ![New Azure Monitor telemetry](./07.png)
-
-    ![New Azure Monitor telemetry](./08.png)
-
-    ![New Azure Monitor telemetry](./09.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/_index.md
deleted file mode 100644
index 9ea497d595..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Multiple Kubernetes distributions"
-linkTitle: "Multiple Kubernetes distributions"
-weight: 7
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/azure_policy/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/azure_policy/_index.md
deleted file mode 100644
index b8a09d0f25..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/azure_policy/_index.md
+++ /dev/null
@@ -1,213 +0,0 @@
----
-type: docs
-title: "Integrate Azure Policy with an Azure Arc-enabled Kubernetes cluster using extensions"
-linkTitle: "Integrate Azure Policy with an Azure Arc-enabled Kubernetes cluster using extensions"
-weight: 3
-description: >
----
-
-## Integrate Azure Policy with an Azure Arc-enabled Kubernetes cluster using extensions
-
-The following Jumpstart scenario will guide you on how to enable [Azure Policy](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes?toc=%2Fazure%2Fazure-arc%2Fkubernetes%2Ftoc.json) for an Azure Arc-enabled Kubernetes cluster.
-
-In this scenario, you will hook the Azure Arc-enabled Kubernetes cluster to Azure Policy by deploying the [Azure Policy cluster extension](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes?toc=%2Fazure%2Fazure-arc%2Fkubernetes%2Ftoc.json#install-azure-policy-extension-for-azure-arc-enabled-kubernetes) on your Kubernetes cluster in order to start using some of the Kubernetes Azure Policies.
-
-  > **NOTE: This scenario assumes you already deployed a Kubernetes cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion**
-
-- **[Azure Kubernetes Service](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/)**
-- **[AKS on Azure Stack HCI](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/)**
-- **[Kubernetes Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/)**
-- **[Azure Red Hat OpenShift](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aro/)**
-- **[Amazon Elastic Kubernetes Service](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/)**
-- **[Google Kubernetes Engine](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/)**
-- **[Alibaba Cloud Container Service for Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/alibaba/)**
-- **[Rancher K3s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/)**
-- **[Kind](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/kind/)**
-- **[MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/microk8s/)**
-- **[Platform9 Managed Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/pf9/)**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI and Azure Portal for deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with multiple Role-based access control (RBAC) roles is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-  - "Resource Policy Contributor" - Required to assign Azure Policy definition
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Resource Policy Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Resource Policy Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation:
-
-- User has deployed a Kubernetes cluster and has it connected as an Azure Arc-enabled Kubernetes cluster.
-
-- User edits the environment variables on the Shell script file (1-time edit) which then will be used throughout the extension deployment.
-
-- User runs the shell script. The script will use the extension management feature of Azure Arc to deploy the Azure Policy extension on the Azure Arc-enabled Kubernetes cluster and assign an Azure Policy to your Azure Arc-enabled Kubernetes cluster's resource group.
-
-- User verifies that the Azure Policy extension is deployed as well as the Azure Policy assignment was created.
-
-## Create Azure Policy cluster extensions instance
-
-To create a new extension instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Azure Policy cluster extension on your Azure Arc-enabled Kubernetes cluster.
-
-- Before integrating the cluster with Azure Policy, click on the "Extensions" tab for the connected Azure Arc cluster to show how the cluster is not currently being assessed by Azure Policy.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./01.png)
-
-- Edit the environment variables in [the script](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/multi_distributions/azure_policy/azure_policy.sh) to match your environment parameters.
-
-  - _`subscriptionId`_ - Your Azure subscription ID
-  - _`appId`_ - Your Azure service principal name
-  - _`password`_ - Your Azure service principal password
-  - _`tenantId`_ - Your Azure tenant ID
-  - _`resourceGroup`_ - Azure resource group name
-  - _`arcClusterName`_ - Azure Arc Cluster Name
-  - _`k8sExtensionName`_ - Azure Policy extension name, should be azurepolicy
-
-  ![Screenshot parameter examples](./02.png)
-
-- After editing the variables, to run the script, navigate to the [script folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/multi_distributions/azure_policy) and run the command
-
-  ```shell  
-  sudo chmod +x azure_monitor_alerts.sh && . ./azure_policy.sh
-  ```
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-   The script will:
-
-  - Login to your Azure subscription using the service principal credentials
-  - Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  - Create the Azure Policy cluster extension instance
-  - Assign the Azure Policy _Kubernetes cluster containers CPU and memory resource limits should not exceed the specified limits_ (cpuLimit=200m memoryLimit=1Gi) to the resource group of the Azure Arc-enabled Kubernetes cluster
-
-- Verify under the extensions tab of the Azure Arc-enabled Kubernetes cluster that the Azure Policy cluster extension is correctly installed.
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./03.png)
-
-- You can also verify the pods by running the commands below:
-  
-  - The azure-policy pods are installed in the kube-system namespace:
-
-    ```bash
-    kubectl get pods -n kube-system --kubeconfig <kubeconfig> | grep azure-policy
-    ```
-
-    ![Screenshot extension pods on cluster](./04.png)
-
-  - The gatekeeper pods are installed in the gatekeeper-system namespace:
-
-    ```bash
-    kubectl get pods -n gatekeeper-system --kubeconfig <kubeconfig>
-    ```
-
-    ![Screenshot extension pods on cluster](./05.png)
-
-- Verify under the Azure Policy service in the Assignments tab that the Azure Policy Definition was assigned in your resource group:
-
-  ![Screenshot showing Azure Portal Azure Policy service](./06.png)
-
-## Test Azure Policy
-
-> **IMPORTANT NOTE: Please note that it may take up to 30 minutes for the Azure Policy to take effect.**
-
-- The Azure Policy we have assigned works as a [LimitRange](https://kubernetes.io/docs/concepts/policy/limit-range/), but we do not specify any namespace, so the Azure Policy will be applied on all namespaces. The limits specified in the Azure Policy are cpuLimit=200m and memoryLimit=1Gi, so to test it we need to create a pod with higher limits:
-
-  > **pod-test.yaml**
-  ```yaml
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    name: nginx
-  spec:
-    containers:
-    - name: nginx
-      image: nginx
-      resources:
-        requests:
-          memory: "2Gi"
-          cpu: "2"
-        limits:
-          memory: "3Gi"
-          cpu: "16"
-  ```
-
-- Create the above file and run the following command to create the pod:
-
-  ```bash
-  kubectl apply -f pod-test.yaml --kubeconfig <kubeconfig>
-  ```
-
-  ![Screenshot Azure Policy test](./07.png)
-
-  As you can see we cannot create the pod due to the Azure policy that was applied.
-
-- If there were pods that exceeded the limit before applying the Azure Policy, they will not be removed, but we can see which ones do not comply in the Azure Policy service in the Compliance tab, select the non-compliance event
-
-  ![Screenshot Azure Policy test](./08.png)
-
-- Click on Details to find out which pod is not compliant:
-
-  ![Screenshot Azure Policy test](./09.png)
-
-- This is the non-compliant pod:
-
-  ![Screenshot Azure Policy test](./10.png)
-
-### Delete resources
-
-Complete the following steps to clean up your environment. The commands below delete the extension instance and the Azure Policy Assignment.
-
-  ```bash
-  export arcClusterName='<Azure Arc Cluster Name>'
-  export resourceGroup='<Azure resource group name>'
-  az k8s-extension delete --name azurepolicy --cluster-type connectedClusters --cluster-name $arcClusterName --resource-group $resourceGroup
-  resourceGroupId=$(az group show --name $resourceGroup --query id -o tsv | sed 's/\r$//')
-  az policy assignment delete --name "K8s containers should not exceed CPU=200m and Memory=1Gi" --scope $resourceGroupId
-  ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/calico/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/calico/_index.md
deleted file mode 100644
index 6a09df6ce3..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/calico/_index.md
+++ /dev/null
@@ -1,198 +0,0 @@
----
-type: docs
-title: "Use Azure Policy Add-on to audit pods' labels for use with Calico network policy"
-linkTitle: "Use Azure Policy Add-on to audit pods' labels for use with Calico network policy"
-weight: 1
-description: >
----
-
-## Use Azure Policy on an Azure Arc-enabled Kubernetes cluster to audit pods' labels for use with  Calico network policy
-
- > **Disclaimer: This scenario was contributed by the Tigera Project Calico team as part of the "Jumpstart Friends" program**
-
-<p align="center"><img src="/img/jumpstart_friends_logo.png" alt="jumpstart-friends-logo" width="250"></p>
-
-The following Jumpstart scenario will guide you how to use Azure Policy [Azure Policy for Kubernetes](https://docs.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes#:~:text=Azure%20Policy%20extends%20Gatekeeper%20v3,Kubernetes%20clusters%20from%20one%20place.) on an Azure Arc-enabled Kubernetes cluster to audit/enforce labels for pods. [Network policy](https://projectcalico.docs.tigera.io/about/about-network-policy) is applied to pods using label selectors.
-
-  > **NOTE: This guide assumes you already deployed an Amazon Elastic Kubernetes Service (EKS) or Google Kubernetes Engine (GKE) cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using these Jumpstart scenarios:**
-
-- [Deploy EKS cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/)
-- [Deploy GKE cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/)
-
-  > **NOTE: This guide assumes you already have deployed Calico network policy in your cluster. If you haven't, you can use our installation guides for Calico open source or Calico Cloud:**
-
-- [Deploy Calico open source in your managed public cluster](https://projectcalico.docs.tigera.io/getting-started/kubernetes/managed-public-cloud/)
-- [Sign up for a Calico Cloud trial](https://www.calicocloud.io/?utm_campaign=calicocloud&utm_medium=digital&utm_source=microsoft)
-
-Calico Network Policy uses labels to select pods in Kubernetes for applying ingress/egress rules.
-
-In this scenario, we will be using Azure Policy on an Azure-Arc enabled Kubernetes cluster to check whether the “fw-zone” label is present on pods in the “storefront” namespace, and how these labels are used in network policy enforcement.
-
-The Azure Policy will be set to “Audit” mode to check the configuration of existing clusters (it can also be set to “Deny” mode to avoid any missing labels)
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the following command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- As mentioned, this scenario starts at the point where you already have a connected EKS/GKE cluster to Azure Arc.
-
-    ![Existing EKS Azure Arc connected cluster](./01.png)
-
-    ![Existing GKE Azure Arc connected cluster](./02.png)
-
-- Before installing the Azure Policy Add-on or enabling any of the service features, your subscription must enable the _Microsoft.PolicyInsights_ resource provider and create a role assignment for the cluster service principal. To do that, open [Azure Cloud Shell](https://shell.azure.com/) and run either the Azure CLI or PowerShell command.
-
-    ![Open Azure Cloud Shell](./03.png)
-
-    Azure CLI:
-
-    ```shell
-    az provider register --namespace 'Microsoft.PolicyInsights'
-    ```
-
-    PowerShell:
-
-    ```powershell
-    Register-AzResourceProvider -ProviderNamespace 'Microsoft.PolicyInsights'
-    ```
-
-    To verify successful registration, run either the below Azure CLI or PowerShell command.
-
-    Azure CLI:
-
-    ```shell
-    az provider show --namespace 'Microsoft.PolicyInsights'
-    ```
-
-    PowerShell:
-
-    ```powershell
-    Get-AzResourceProvider -ProviderNamespace 'Microsoft.PolicyInsights'
-    ```
-
-    ![AzResourceProvider Bash](./04.png)
-
-- Check whether Azure Policy is installed in an Azure Arc-enabled Kubernetes cluster
-
-  > by running the ```kubectl get pods -n gatekeeper-system``` command.
-  
-- You should see the following pods running.
-
-  ![Showing pods deployment](./05.png)
-
-- Deploy a demo application and Calico Network policy in your Azure Arc-enabled Kubernetes cluster.
-
-  ```shell
-  cd azure_arc/azure_arc_k8s_jumpstart/multi_distributions/calico_policy
-  ```
-
-  ```shell
-  kubectl create -f storefront.yaml
-  ```
-
-- Deploy the `storefront` demo application in your cluster by running the  ```kubectl create -f storefront.yaml``` command.
-
-  ![Showing storefront pods](./20.png)
-
-  ```shell
-  kubectl create -f calico-firewall-policy.yaml
-  ```
-
-- Deploy a sample Calico network policy by running the  ```kubectl create -f calico-firewall-policy.yaml``` command.
-
-  ![Showing storefront network policy](./21.png)
-
-## Deploy an Azure policy to verify if “fw-zone” label exists for pods in the `storefront` namespace
-
-- In the Azure portal search bar, look for _Policy_ and click on _Definitions_ which will show you all of the available Azure policies.
-
-    ![Searching for Azure Policy definitions](./06.png)
-
-    ![Searching for Azure Policy definitions](./07.png)
-
-- Click on _Category_ to search for built-in policies.
-
-    ![Choose policy category](./08.png)
-
-- In the below example, make sure _Category_ is set to _Kubernetes_ only, and type `label` in _Search_, you will find `Kubernetes cluster pods should use specified labels` in _BuiltIn_ Type.
-
-    ![Find the pod label policy for Kubernetes cluster](./09.png)
-
-    ![BuiltIn label policy for Kubernetes cluster](./10.png)
-
-- Click this policy, and assign it to your Azure resource group which includes the Azure Arc-enabled Kubernetes clusters. Alternatively, you can assign the policy to the entire Azure subscription.
-  
-  ![Assign Azure policy ](./11.png)
-
-- Name the assignment, for example `storefront namespace pods should use fw-zone labels for calico _networkpolicy_ enforcement`.
-
-  ![Assignment name](./12.png)
-
-- In the below example, we only audit one namespace which is `storefront` with `fw-zone` as the required label.
-
-  ![Set Parameters](./13.png)
-
-- Once assigned, the policy task will start the evaluation against the Arc connected cluster in your resource group. You can check the status of this assignment under `Compliance`.
-
-  ![Compliance list](./14.png)
-
-  > **NOTE: The process of evaluation can take up 30min, in the meantime will see 0 out of 0 in `Resource compliance`.**
-
-- After the evaluation, the policy will inform you of the result and provide details if there are any resources that are `non-compliant`.  
-
-  > We will deploy a centos and nginx pod to the `storefront` namespace without the `fw-zone` label by running the commands below. Creation of these pods will be allowed as the policy effect is set to `audit` instead of `deny`.
-
-  ```shell
-  kubectl run centos --image=centos -n storefront --restart=Never -- /bin/sh -c "sleep 24h"
-  ```
-
-  ```shell
-  kubectl run nginx --image=nginx -n storefront
-  kubectl -n storefront expose pod nginx --port=80
-  ```
-  
-  ![Compliance result](./15.png)
-
-  ![Audit details](./16.png)
-
-- Test Calico network policy enforcement by adding the `fw-zone` labels to the `centos` and `nginx` pods.
-  > The network policy is set to allow only `trusted` zone connections to the `restricted` zone, and will deny traffic from `dmz` zone. We will label the nginx pod with `fw-zone=restricted`, and test connectivity when changing the centos pod label from `fw-zone=trusted` to `fw-zone=dmz`.
-
-- Test Calico network policy enforcement without labels.
-
-  ![test result](./22.png)
-
-- Test Calico network policy enforcement with proper labels.
-
-  ![test result](./23.png)
-
-- Test Calico network policy enforcement with wrong labels.
-
-  ![test result](./24.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- From each Azure Arc-enabled Kubernetes cluster under your resource group, click the _Azure Policy_ page, and disable the extension of Azure policy under `Onboard to Azure Policy for Azure Arc-enabled Kubernetes cluster`
-
-    ![Disable Azure Policy addon](./17.png)
-
-    ![Disable Azure Policy addon](./18.png)
-
-    ![Disable Azure Policy addon](./19.png)
-
-- You can use these Jumpstart scenarios below for deleting the clusters:
-
-  - [Deploy EKS cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/)
-  - [Deploy GKE cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/connected_cluster/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/connected_cluster/_index.md
deleted file mode 100644
index 9e5b800919..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/connected_cluster/_index.md
+++ /dev/null
@@ -1,138 +0,0 @@
----
-type: docs
-title: "Using Cluster Connect to connect to an Azure Arc-enabled Kubernetes cluster via service account token authentication"
-linkTitle: "Using Cluster Connect to connect to an Azure Arc-enabled Kubernetes cluster via service account token authentication"
-weight: 5
-description: >
----
-
-## Using Cluster Connect to connect to an Azure Arc-enabled Kubernetes cluster via service account token authentication
-
-The following Jumpstart scenario will guide you through how to use the [Cluster Connect](https://docs.microsoft.com/azure/azure-arc/kubernetes/cluster-connect) capability of an Azure Arc connected Kubernetes cluster to manage and connect to the cluster securely without opening inbound firewall ports.
-
-  > **NOTE: This scenario assumes you already deployed a Kubernetes cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion**
-
-- **[Azure Kubernetes Service](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/)**
-- **[AKS on Azure Stack HCI](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/)**
-- **[Kubernetes Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/)**
-- **[Azure Red Hat OpenShift](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aro/)**
-- **[Amazon Elastic Kubernetes Service](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/)**
-- **[Google Kubernetes Engine](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/)**
-- **[Alibaba Cloud Container Service for Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/alibaba/)**
-- **[Rancher K3s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/)**
-- **[Kind](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/kind/)**
-- **[MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/microk8s/)**
-- **[Platform9 Managed Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/pf9/)**
-
-## Prerequisites
-
-- Ensure you are logged in to the Azure CLI or PowerShell
-
-  #### Option 1: Bash
-
-  ```shell
-  az login
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  Connect-AzAccount
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install or update to the latest version of the _connectedk8s_ CLI extension](https://learn.microsoft.com/azure/azure-arc/kubernetes/cluster-connect?tabs=azure-cli).
-
-  ```shell
-  az extension add --name connectedk8s
-  ```
-
-- As mentioned, this scenario starts at the point where you already have an Azure Arc connected cluster.
-
-    ![Screenshot showing existing Azure Arc connected cluster](./01.png)
-
-## Azure Arc Kubernetes Connected Cluster Configuration
-
-The following steps walk through using the Cluster Connect functionality using Azure Active Directory (AAD); however, it can also be done using a service account token.  The benefit of using AAD authentication is that your current, logged-in user from the Azure CLI will be used and you won't have to obtain a service account token from your cluster.
-
-- First, get values for the cluster name and resource group name in your terminal.
-
-  #### Option 1: Bash
-
-  ```shell
-  CLUSTER_NAME=<cluster-name>
-  RESOURCE_GROUP=<resource-group-name>
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $CLUSTER_NAME = <cluster name>
-  $RESOURCE_GROUP = <resource_group>
-  ```
-
-- Second, obtain the _user principal name and ID_ of your AAD user account.
-
-  #### Option 1: Bash
-
-  ```shell
-  AAD_ENTITY=$(az ad signed-in-user show --query "[id, userPrincipalName]" -o tsv)
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  $AAD_ENTITY = (az ad signed-in-user show --query "[id, userPrincipalName]" -o tsv)
-  ```
-
-- Finally, create the Kubernetes _ClusterRoleBinding_ using the following:
-
-  #### Option 1: Bash
-
-  ```shell
-  while ID= read -r line; do  kubectl create clusterrolebinding jumpstart-binding-$line --clusterrole cluster-admin --user=$line; done <<< "$AAD_ENTITY"
-  ```
-
-  #### Option 2: PowerShell
-
-  ```powershell
-  foreach($line in $AAD_ENTITY)
-  { kubectl create clusterrolebinding jumpstart-binding-$line --clusterrole cluster-admin --user=$line }
-  ```
-
-## Access Cluster
-
-From your terminal, run the following command to establish the proxy to the cluster.  Note that the specific port number that's used may differ from the screenshot below.
-
-  ```shell
-  az connectedk8s proxy -n $CLUSTER_NAME -g $RESOURCE_GROUP
-  ```
-
-  ![Screenshot showing proxy established](./02.png)
-
-## Run kubectl commands
-
-With the proxy established, in another terminal session run a kubectl command.
-
-  ```shell
-  kubectl get nodes
-  ```
-
-  ![Screenshot showing a running kubectl command](./03.png)
-
-If you already have a workload running on your cluster, you can view it using other kubectl commands, as the following screenshot illustrates:
-
-  ![Screenshot showing an example kubectl command](./04.png)
-
-## Close Proxy Connection
-
-In your terminal, use the _CTRL+C_ key combination to close the proxy session.
-
-  ![Screenshot showing closing Proxy to the connected cluster](./05.png)
-
-With the proxy session now closed, access to the cluster using kubectl via the proxy is disabled.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/container_insights/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/container_insights/_index.md
deleted file mode 100644
index 5aef4b71ec..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/container_insights/_index.md
+++ /dev/null
@@ -1,210 +0,0 @@
----
-type: docs
-title: "Integrate Azure Monitor Container Insights and recommended alerts with an Azure Arc-enabled Kubernetes cluster using extensions"
-linkTitle: "Integrate Azure Monitor Container Insights and recommended alerts with an Azure Arc-enabled Kubernetes cluster using extensions"
-weight: 3
-description: >
----
-
-## Integrate Azure Monitor Container Insights and recommended alerts with an Azure Arc-enabled Kubernetes cluster using extensions
-
-The following Jumpstart scenario will guide you on how to enable [Azure Monitor Container Insights](https://docs.microsoft.com/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters?toc=%2Fazure%2Fazure-arc%2Fkubernetes%2Ftoc.json) and configure all [recommended metric alerts from Container insights](https://docs.microsoft.com/azure/azure-monitor/containers/container-insights-metric-alerts) for an Azure Arc-enabled Kubernetes cluster.
-
-In this scenario, you will hook the Azure Arc-enabled Kubernetes cluster to Azure Monitor Container Insights by deploying the [Azure Monitor cluster extension](https://docs.microsoft.com/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters?toc=%2Fazure%2Fazure-arc%2Fkubernetes%2Ftoc.json#create-extension-instance-using-azure-cli) on your Kubernetes cluster in order to start collecting Kubernetes related logs and telemetry. Then the recommended alerts will be enabled by an [ARM template](https://docs.microsoft.com/es-es/azure/azure-resource-manager/templates/overview).
-
-  > **NOTE: This scenario assumes you already deployed a Kubernetes cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion**
-
-- **[Azure Kubernetes Service](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks/)**
-- **[AKS on Azure Stack HCI](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/)**
-- **[Kubernetes Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/)**
-- **[Azure Red Hat OpenShift](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aro/)**
-- **[Amazon Elastic Kubernetes Service](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/)**
-- **[Google Kubernetes Engine](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/)**
-- **[Alibaba Cloud Container Service for Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/alibaba/)**
-- **[Rancher K3s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/)**
-- **[Kind](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/kind/)**
-- **[MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/microk8s/)**
-- **[Platform9 Managed Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/pf9/)**
-
-Kubernetes extensions are add-ons for Kubernetes clusters. The extensions feature on Azure Arc-enabled Kubernetes clusters enables usage of Azure Resource Manager based APIs, CLI and Azure Portal for deployment of extension components (Helm charts in initial release) and will also provide lifecycle management capabilities such as auto/manual extension version upgrades for the extensions.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with an Role-based access control (RBAC) _Contributor_ role is required:
-
-  - "Contributor" - Required for provisioning Azure resources
-
-    To create it login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation:
-
-- User has deployed a Kubernetes cluster and has it connected as an Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables on the Shell script file (1-time edit) which then will be used throughout the extension deployment.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Azure Monitor cluster extension on the Azure Arc-enabled Kubernetes cluster and create all the recommended alerts.
-
-- User is veryfing that the cluster is shown in Azure Monitor and that the extension is deployed as well as all the recommended alerts.
-
-- User is simulating an alert.
-
-## Create Azure Monitor cluster extensions instance
-
-To create a new extension instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Azure Monitor cluster extension on your Azure Arc-enabled Kubernetes cluster.
-
-- Before integrating the cluster with Azure Monitor, click on the "Extensions" tab for the connected Azure Arc cluster to show how the cluster is not currently being assessed by Azure Monitor.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./01.png)
-
-- Navigate to the folder that has the deployment script.
-
-- Edit the environment variables in [the script](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/multi_distributions/container_insights/azure_monitor_alerts.sh) to match your environment parameters.
-
-  - _`subscriptionId`_ - Your Azure subscription ID
-  - _`appId`_ - Your Azure service principal name
-  - _`password`_ - Your Azure service principal password
-  - _`tenantId`_ - Your Azure tenant ID
-  - _`resourceGroup`_ - Azure resource group name
-  - _`arcClusterName`_ - Azure Arc Cluster Name
-  - _`azureLocation`_ - Azure region
-  - _`logAnalyticsWorkspace`_ - Log Analytics Workspace Name
-  - _`k8sExtensionName`_ - Azure Monitor extension name, should be azuremonitor-containers
-  - _`actionGroupName`_ - Action Group for the Alerts
-  - _`email`_ - Email for the Action Group
-
-  ![Screenshot parameter examples](./02.png)
-
-- After editing the variables, to run the script, navigate to the [script folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/multi_distributions/container_insights) and run the command
-
-  ```shell  
-  sudo chmod +x azure_monitor_alerts.sh && . ./azure_monitor_alerts.sh
-  ```
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-   The script will:
-
-  - Login to your Azure subscription using the service principal credentials
-  - Add or Update your local _connectedk8s_ and _k8s-extension_ Azure CLI extensions
-  - Create the Azure Monitor cluster extension instance
-  - Create an action group and all recommended alerts
-
-- Verify under the extensions tab of the Azure Arc-enabled Kubernetes cluster that the Azure Monitor cluster extension is correctly installed.
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./03.png)
-
-- You can also verify the pods by running the command below:
-
-  ```bash
-  kubectl get pod -n kube-system --kubeconfig <kubeconfig> | grep omsagent
-  ```
-
-  ![Screenshot extension pods on cluster](./04.png)
-
-- Verify under the Alert rules tab on alerts section of the Azure Arc-enabled Kubernetes cluster that the alert rules are correctly created.
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource alerts rules](./05.png)
-
-## Simulate an alert
-
-- To verify that the recommended alerts are working properly, create the below pod to simulate an OOMKilledContainers alert:
-
-  > **pod-test.yaml**
-  ```yaml
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    name: memory-demo
-  spec:
-    containers:
-    - name: memory-demo-ctr
-      image: polinux/stress
-      resources:
-        requests:
-          memory: "50Mi"
-        limits:
-          memory: "100Mi"
-      command: ["stress"]
-      args: ["--vm", "1", "--vm-bytes", "250M", "--vm-hang", "1"]
-  ```
-- Create the above file and run the following command to create the pod:
-
-  ```bash
-  kubectl apply -f pod-test.yaml --kubeconfig <kubeconfig>
-  ```
-  
-- In few minutes an alert will be created, you will see it in the Azure Portal under Alerts tab of your Azure Arc-enabled cluster.
-
-  ![Screenshot Monitor alert](./06.png)
-
-- You also will receive an email like this:
-
-  ![Screenshot Monitor alert email](./07.png)
-
-### Delete resources
-
-Complete the following steps to clean up your environment. The commands below delete the extension instance, recommended alerts, action group and Log Analytics workspace.
-
-  ```bash
-  export arcClusterName='<Azure Arc Cluster Name>'
-  export resourceGroup='<Azure resource group name>'
-  export logAnalyticsWorkspace='<Log Analytics Workspace Name>'
-  export actionGroupName='<Action Group for the Alerts>'
-  az k8s-extension delete --name azuremonitor-containers --cluster-type connectedClusters --cluster-name $arcClusterName --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentContainerCPU --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentContainerWorkingSetMemory --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentNodeCPU --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentNodeDiskUsage --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentNodeNotReady --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentNodeWorkingSetMemory --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentOOMKilledContainers --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentPodsReady --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentFailedPodCounts --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentPersistentVolumeUsage --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentRestartingContainerCount --resource-group $resourceGroup
-  az monitor metrics alert delete --name alertDeploymentCompletedJobCount --resource-group $resourceGroup
-  az monitor scheduled-query delete --name alertDailyDataCapBreachedForWorkspace --resource-group $resourceGroup
-  az monitor action-group delete --name $actionGroupName --resource-group $resourceGroup
-  az monitor log-analytics workspace delete --resource-group $resourceGroup --workspace-name $logAnalyticsWorkspace
-  ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/gitops/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/gitops/_index.md
deleted file mode 100644
index 2b35328603..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/day2/multi_distributions/gitops/_index.md
+++ /dev/null
@@ -1,139 +0,0 @@
----
-type: docs
-title: "Managing Calico Network Policy using GitOps in an Azure Arc-enabled Kubernetes cluster"
-linkTitle: "Managing Calico Network Policy using GitOps in an Azure Arc-enabled Kubernetes cluster"
-weight: 1
-description: >
----
-
-## Use GitOps in an Azure Arc-enabled Kubernetes cluster for managing Calico Network Policy
-
- > **Disclaimer: This scenario was contributed by the Tigera Project Calico team as part of the "Jumpstart Friends" program**
-
-<p align="center"><img src="/img/jumpstart_friends_logo.png" alt="jumpstart-friends-logo" width="250"></p>
-
-The following Jumpstart scenario will guide you how to use GitOps [GitOps for Azure Arc](https://docs.microsoft.com/azure/azure-arc/kubernetes/tutorial-use-gitops-connected-cluster) in an Azure Arc connected Kubernetes cluster to manage Calico Network Policy [Network Policy](https://projectcalico.docs.tigera.io/about/about-network-policy).
-
-  > **NOTE: This guide assumes you already deployed an Amazon Elastic Kubernetes Service (EKS) or Google Kubernetes Engine (GKE) cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion using these Jumpstart scenarios:**
-
-- [Deploy EKS cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/)
-- [Deploy GKE cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/)
-
-  > **NOTE: This guide assumes you already have deployed Calico network policy in your cluster. If you haven't, you can use our installation guides for Calico open source or Calico Cloud:**
-
-- [Deploy Calico open source in your managed public cluster](https://projectcalico.docs.tigera.io/getting-started/kubernetes/managed-public-cloud/)
-- [Sign up for a Calico Cloud trial](https://www.calicocloud.io/?utm_campaign=calicocloud&utm_medium=digital&utm_source=microsoft)
-
-Calico Network Policy provides the [Network Set](https://projectcalico.docs.tigera.io/archive/v3.21/reference/resources/networkset) resource to label an arbitrary set of IP subnetworks/CIDRs, allowing it to be matched by Calico policy.
-
-In this scenario, we will be using GitOps in an Azure Arc connected Kubernetes cluster to update `Network Sets`. The changes will be committed to a Git repository, and Flux will pick up these changes and apply them to the cluster.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Fork the [Tigera Azure-arc-demo repository](https://github.com/tigera-solutions/Azure-arc-demo)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the following command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- As mentioned, this scenario starts at the point where you already have an Azure Arc connected EKS/GKE cluster.
-
-    ![Existing EKS Azure Arc connected cluster](./01.png)
-
-    ![Existing GKE Azure Arc connected cluster](./02.png)
-
-## Azure Arc Kubernetes GitOps Configuration for Calico
-
-- We will use a shell script [*calico_k8sconfig_gitops*](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/multi_distributions/calico_gitops/calico_k8sconfig_gitops.sh) against the GKE/EKS connected cluster. You can use Cloud Shell in order to keep your local environment clean.
-
-  [Google Cloud Shell](https://cloud.google.com/shell)
-  [AWS Cloud Shell](https://aws.amazon.com/cloudshell/)
-
-- Edit the environment variables in the [*calico_k8sconfig_gitops*](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/multi_distributions/calico_gitops/calico_k8sconfig_gitops.sh) shell script to match your parameters, upload it to the Cloud Shell environment and run it using the ```. ./calico_k8sconfig_gitops.sh``` command to create the GitOps configuration.
-
-    > **NOTE: The extra dot is due to the script having an *export* function and needs to have the vars exported in the same shell session as the rest of the commands.**
-    > **NOTE: The default branch is `master`. Newer repositories have a root branch named main, in which case you need to set `--git-branch=main` in operator params.**
-
-    ![Upload a file to Cloud Shell](./03.png)
-
-    ![Upload a file to Cloud Shell](./04.png)
-
-    The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Retrieve the cluster credentials (KUBECONFIG)
-  - Install Helm 3 & Azure CLI & Azure Arc Extensions
-  - Create the GitOps configuration and deploy the Flux operator and Memcached on the Azure Arc connected cluster
-  - Deploy the `dev` utilities as well as `network policy` and `network set` on the Azure Arc connected cluster
-
-    > **Disclaimer: For the purpose of this guide, notice that "*git-poll-interval 30s*" is set. The 30 seconds interval is useful for demo purposes since changes can be observed quickly but it is recommended to have a longer interval in your production environment (default value is 5min)**
-
-- Once the script completes running, a GitOps configuration will be created with all the resources deployed in your Kubernetes cluster. Note that it takes a few minutes for the configuration to change it's Operator state status from "Pending" to "Installed".
-
-    ![New GitOps configuration](./05.png)
-
-    ![New GitOps configuration](./06.png)
-
-- Check whether the Flux operator is installed in an Azure Arc connected cluster by running the ```kubectl get pods -n calico-config``` command.
-  > You should see the following pods running.
-
-  ![Showing operator deployment](./07.png)
-
-## Confirm Network Sets exist in the Azure Arc connected cluster
-
-- Check `Network Sets` are installed in an Azure Arc connected Cluster by running the ```kubectl get networkset -n dev ```  command.
-  > You should see the following output.
-
-  ![Showing network set deployment](./08.png)
-
-- Check that the `dev-deny-ip` and `dev-allow-ip` CIDRs in the cluster are the same as your the definitions in the Git repository by running the ```kubectl get networkset -n dev dev-deny-ip -o yaml ``` and ```kubectl get networkset -n dev dev-allow-ip -o yaml ``` command.
-  > You should see the following output.
-  ![Confirm the CIDR](./09.png)  
-  ![Confirm the CIDR](./10.png)  
-
-- You can also verify  `Network Sets` in the Calico Cloud dashboard.
-
-  ![Showing network set deployment](./11.png)  
-
-- Modify the CIDRs by editing the `tigera-allow.yaml` and `tigera-deny.yaml` files in the `networkset` folder and commit the changes to your Git repository. Flux will pickup these changes and apply them to the cluster.
-  ![Edit network set](./12.png)
-  ![Edit network set](./13.png)
-  
-  > **NOTE: The sync process can take some time depending on your platform, you can restart your Flux operator to trigger the sync.**
-
-- Check that the `dev-deny-ip` and `dev-allow-ip` CIDRs have been updated in your Azure Arc connected cluster by running the ```kubectl get networkset -n dev dev-deny-ip -o yaml ``` and ```kubectl get networkset -n dev dev-allow-ip -o yaml ``` commands.
-  > You should see the following output.
-  ![Confirm the CIDR](./14.png)
-  ![Confirm the CIDR](./15.png)
-
-- You can also verify that `Network Sets` have been updated in the Calico Cloud dashboard.
-
-  ![Showing network set deployment](./16.png)  
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- For each Azure Arc connected cluster in your resource group, click the _GitOps_ page, and delete `calico-gitops-test`.
-  ![Delete GitOps config](./17.png)
-
-- Delete the k8s-configuration `calico-gitops-test` by running the following command:
-
-    ```shell
-    az k8s-configuration delete --name calico-gitops-test \
-    --cluster-name $arcClusterName --resource-group $resourceGroup \
-    --cluster-type connectedClusters
-    ```
-
-- You can use follow these Jumpstart scenarios below for deleting the clusters:
-
-  - [Deploy EKS cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/)
-  - [Deploy GKE cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/developer/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/developer/_index.md
deleted file mode 100644
index bdb12a95e2..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/developer/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Developer Use Cases"
-linkTitle: "Developer Use Cases"
-weight: 13
-description: >-
-  Once you onboarded your Azure Arc-enabled Kubernetes clusters, you can start to use native Azure tooling to manage the clusters as native Azure resources. The following scenarios show examples of using developer-centric use-cases.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/developer/dapr/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/developer/dapr/_index.md
deleted file mode 100644
index 874217e6b8..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/developer/dapr/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Dapr"
-linkTitle: "Dapr"
-weight: 1
-description: >-
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/developer/dapr/dapr_statestore/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/developer/dapr/dapr_statestore/_index.md
deleted file mode 100644
index 640851c060..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/developer/dapr/dapr_statestore/_index.md
+++ /dev/null
@@ -1,226 +0,0 @@
----
-type: docs
-title: "Deploy an application using the Dapr Cluster extension for Azure Arc-enabled Kubernetes cluster"
-linkTitle: "Deploy an application using the Dapr Cluster extension for Azure Arc-enabled Kubernetes cluster"
-weight: 1
-description: >
----
-
-## Deploy an application using the Dapr Cluster extension for Azure Arc-enabled Kubernetes cluster
-
-The following Jumpstart scenario will guide you on how to set up [Dapr](https://dapr.io/) for the Azure Arc-enabled Kubernetes cluster. In this scenario, you will enable Dapr by deploying the Dapr Cluster extension on your Azure Arc-enabled Kubernetes cluster alongside a Python application that generates messages and a Node.js application that consumes and persists them on [Azure Cache for Redis](https://docs.microsoft.com/azure/azure-cache-for-redis/cache-overview).
-
-Dapr is a portable, event-driven runtime that makes it easy for any developer to build resilient, stateless, and stateful applications that run on the cloud and edge and embraces the diversity of languages and developer frameworks. Leveraging the benefits of a sidecar architecture, Dapr helps you tackle the challenges that come with building microservices and keeps your code platform agnostic.
-
-> **NOTE: This guide assumes you already deployed a Kubernetes cluster and connected it to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion for various [Kubernetes distributions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/).**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- As mentioned, this scenario starts at the point where you already have a connected Kubernetes cluster to Azure Arc.
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./01.png)
-
-    ![Existing Azure Arc-enabled Kubernetes cluster](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User has deployed the Kubernetes cluster and connected it as an Azure Arc-enabled Kubernetes cluster.
-
-- User is editing the environment variables in the below Shell script file (1-time edit) which then be used throughout the configuration.
-
-- User is running the shell script. The script will use the extension management feature of Azure Arc to deploy the Dapr Cluster extension.
-
-- The script will also create and configure the state store (Azure Cache for Redis), and deploy the Node.js app with the sidecar.
-
-- User is verifying the cluster and ensuring the Dapr Cluster extension is deployed.
-
-- User is verifying the service and confirming the order was persisted in the state store.
-
-- Additionally, the user will deploy the Python app with the Dapr sidecar and observe messages to confirm successful persistence.
-
-## Deployment
-
-To create a new Cluster extension instance, we will use the _k8s-extension create_ command while passing in values for the mandatory parameters. This scenario provides you with the automation to deploy the Dapr Cluster extension on your Azure Arc-enabled Kubernetes cluster.
-
-> **NOTE: Before installing the Dapr extension, make sure that the _kubectl_ context is pointing to your Azure Arc-enabled Kubernetes cluster. To do that, you can refer to the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/) to find the options to change the kubecontext to different Kubernetes clusters.**
-
-![Screenshot showing current kubectl context pointing to K8s cluster](./03.png)
-
-- In the screenshot below, notice how currently there are no extensions installed yet in your Arc-enabled Kubernetes cluster.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource extensions](./04.png)
-
-- Edit the environment variables [in the script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/multi_distributions/dapr/dapr_k8s_statestore.sh) to match your environment parameters followed by running the _`. ./dapr_k8s_statestore.sh`_ command.
-
-    ![Screenshot parameter](./05.png)
-
-    ![Screenshot parameter examples](./06.png)
-
-    > **NOTE: The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-   The script will:
-
-  - Login to your Azure subscription using the SPN credentials
-  - Add or Update your local _k8s-extension_ Azure CLI extension
-  - Create Azure resource group, Redis store, and Kubernetes Secret for the Redis Key
-  - Create Dapr extension Cluster instance
-  - Configure the state store on Kubernetes and deploy the Node.js app
-
-- Once the script will complete it’s run, you can see that the Dapr Cluster extension is now enabled in the extension tab section of the Azure Arc-enabled Kubernetes cluster resource in Azure. The script usually takes 10-20 minutes to complete.
-
-    ![Screenshot script completion](./07.png)
-
-    ![Screenshot extension deployment extensions tab](./08.png)
-
-## Dapr Components & Node.js application
-
-- Before validating the app, let’s verify and “zoom in” to the Kubernetes resources deployed by running a few _kubectl_ commands.
-
-    ```shell
-    kubectl get pods -n dapr-system
-    kubectl get component
-    ```
-
-    ![Screenshot Dapr pods ](./09.png)
-
-    ![Screenshot state store ](./10.png)
-
-- Show the Node.js app and Service, and make note of the External IP of the service.
-
-    ```shell
-    kubectl get pods,svc
-    ```
-
-    ![Screenshot Node App pod and service](./11.png)
-
-    > **NOTE: The Dapr control plane will automatically inject the Dapr sidecar to the Pod, as the "dapr.io/enabled: true" annotation is added to the Node.js app deployment.**
-
-- Verify the Node App service.
-
-    ```shell
-    export EXTERNAL_IP=<External IP>
-    curl $EXTERNAL_IP/ports
-    ```
-
-    ![Screenshot Node App service call](./12.png)
-
-- Navigate to the [dapr folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/multi_distributions/dapr/) and submit an order to the application.
-
-    ```shell
-    curl --request POST --data "@sample.json" --header Content-Type:application/json $EXTERNAL_IP/neworder
-    ```
-
-    ![Screenshot submit order](./13.png)
-
-- Validate the order was persisted by requesting from the app.
-
-    ```shell
-    curl $EXTERNAL_IP/order
-    ```
-
-    ![Screenshot validate order](./14.png)
-
-## Deploy the Python application with the Dapr sidecar
-
-The following is a basic "hello world" [Python app](https://github.com/dapr/quickstarts/tree/master/tutorials/hello-world) that posts JSON messages to localhost:3500, which is the default listening port for Dapr. You can invoke the Node.js application's _neworder_ endpoint by posting to _v1.0/invoke/nodeapp/method/neworder_. The message contains some data with an _orderId_ that increments once per second.
-
-- Deploy the Python App to your cluster.
-
-    ```shell
-    kubectl apply -f python.yaml
-    kubectl get pods
-    ```
-
-    ![Screenshot deploy python app](./15.png)
-
-    > **NOTE: The Dapr control plane will automatically inject the Dapr sidecar to the Pod, as the "dapr.io/enabled: true" annotation is added to the Node App deployment.**
-
-- Now that the Node.js and Python applications are deployed, review messages and API call come through.
-
-    ```shell
-    kubectl logs --selector=app=node -c node --tail=-1
-    kubectl logs --selector=app=node -c daprd --tail=-1
-    kubectl logs --selector=app=python -c daprd --tail=-1
-    ```
-
-    ![Screenshot validate messages and API calls](./16.png)
-
-    ![Screenshot validate messages and API calls](./17.png)
-
-    ![Screenshot validate messages and API calls](./18.png)
-
-- Call the Node.js app's order endpoint to get the latest order and confirm successful persistence. You should see the latest JSON in the response.
-
-    ```shell
-    curl $EXTERNAL_IP/order
-    ```
-
-    ![Screenshot validate persistence](./19.png)
-
-## Delete the deployment
-
-Complete the following steps to clean up your environment.
-
-- Run below _kubectl_ commands to delete the Kubernetes resources.
-
-    ```shell
-    kubectl delete -f python.yaml
-    kubectl delete deployment,service nodeapp
-    kubectl delete component statestore
-    kubectl delete secret redis
-    ```
-
-- Delete the Azure Cache for Redis from the Azure Portal.
-
-    ![Screenshot delete Redis](./20.png)
-
-- Uninstall the Dapr Cluster extension from the Azure Portal.
-
-    ![Screenshot delete extension](./21.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/eks/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/eks/_index.md
deleted file mode 100644
index df9a097735..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/eks/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Amazon Elastic Kubernetes Service"
-linkTitle: "Amazon Elastic Kubernetes Service"
-weight: 7
-description: >-
-  If you are working in a multi-cloud environment, the scenario in this section will guide on creating an Amazon Elastic Kubernetes Service (EKS) and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion using Terraform.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/_index.md
deleted file mode 100644
index c207f2d5cd..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/eks/eks_terraform/_index.md
+++ /dev/null
@@ -1,230 +0,0 @@
----
-type: docs
-title: "EKS cluster Terraform plan"
-linkTitle: "EKS cluster Terraform plan"
-weight: 1
-description: >
----
-
-## Deploy EKS cluster and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an Amazon Web Services (AWS) [Kubernetes Engine cluster](https://aws.amazon.com/eks/) and connected it as an Azure Arc cluster resource.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) and [Configure](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html#cli-quick-configuration) AWS CLI
-
-* [Install AWS IAM Authenticator](https://docs.aws.amazon.com/eks/latest/userguide/install-aws-iam-authenticator.html)
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Create a free Amazon Web Service's account](https://aws.amazon.com/free/)
-
-* [Install Terraform >=1.0](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-* [Install Kubectl](https://kubernetes.io/docs/tasks/tools/)
-
-* Login to Azure CLI
-
-    To be able to complete the scenario and its related automation, you will need access to an Azure subscription in which you are assigned the role of at least "Contributor".
-
-    ```shell
-    az login
-    az account set --subscription "<SubscriptionID>"
-    ```
-
-    For example:
-
-    ```shell
-    az account set --subscription "d4617bb1-551c-4450-88a7-f3e4d17cbe46"
-    ```
-
-* [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-* Install the Azure Arc for Kubernetes CLI extensions ***connectedk8s*** and ***k8s-configuration***:
-
-  ```shell
-  az extension add --name connectedk8s
-  az extension add --name k8s-configuration
-  ```
-
-  > **NOTE:  If you already used this guide before and/or have the extensions installed, use the bellow commands:**
-
-  ```shell
-  az extension update --name connectedk8s
-  az extension update --name k8s-configuration
-  ```
-
-* Create AWS User IAM Key
-
-  An access key grants programmatic access to your resources. To create an AWS Access Key for a user:
-
-  * Navigate to the [IAM Access page](https://console.aws.amazon.com/iam/home#/home) and select the **Users** from the side menu.
-
-    ![Screenshot showing AWS IAM users](./aws_iam_users.png)
-
-  * Select the **User** you want to create the access key for.
-
-    ![Screenshot showing AWS IAM user details](./iam_user_select.png)
-
-  * Select **Security credentials** of the **User** selected.
-
-    ![Screenshot showing AWS IAM user security credentials](./iam_security_credentials.png)
-
-  * Under **Access Keys** select **Create Access Keys**.
-
-    ![Screenshot showing how to create AWS IAM key](./iam_create_access_key.png)
-
-  * In the popup window it will show you the ***Access key ID*** and ***Secret access key***. Save both of these values to configure **AWS CLI** later
-
-    ![Screenshot showing how to reveal the created AWS IAM key](./iam_show_access_key.png)
-
-  * Set your credentials via the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY, environment variables, representing your AWS Access Key and AWS Secret Key.
-
-      ```shell
-      export TF_VAR_AWS_ACCESS_KEY_ID="<AWS ACCESS KEY ID>"
-      export TF_VAR_AWS_SECRET_ACCESS_KEY="<AWS ACCESS KEY SECRET>"
-      export TF_VAR_AWS_DEFAULT_REGION="us-west-2"
-      ```
-
-## Deployment
-
-* Navigate to the folder that has **EKS** terraform binaries.
-
-  ```shell
-  cd azure_arc_k8s_jumpstart/eks/terraform
-  ```
-
-* Run the ```terraform init``` command which will initialize Terraform, creating the state file to track our work:
-
-  ![Screenshot showing terraform init being run](./terraform_init.png)
-
-* Plan the Terraform deployment by running the ```terraform plan -out=infra.out``` command.
-  Wait for the plan to finish:
-
-  ![Screenshot showing terraform plan being run](./terraform_plan.png)
-
-  > **NOTE:  Screenshot has been clipped for brevity**
-
-* Deploy EKS by running the ```terraform apply "infra.out"``` command.
-  Wait for the plan to finish:
-
-  ![Screenshot showing terraform apply being run](./terraform_apply.png)
-
-* You will need the configuration output from Terraform in order to use kubectl to interact with your new cluster. Create your kube configuration directory, and output the configuration from Terraform into the config file using the Terraform output command:
-
-  **Mac/Linux**
-  ```shell
-  mkdir ~/.kube/
-  terraform output -raw kubeconfig > ~/.kube/config
-  ```
-
-  **Windows**
-  ```text
-  mkdir %USERPROFILE%\.kube
-  terraform output -raw kubeconfig > %USERPROFILE%\.kube\config
-  ```
-
-  Check to see if cluster is discoverable by ```kubectl``` by running:
-
-  ```shell
-  kubectl version
-  ```
-
-  Output should look similar to this:
-
-  ```shell
-  Client Version: version.Info{Major:"1", Minor:"23", GitVersion:"v1.24.0", GitCommit:"ab69524f795c42094a6630298ff53f3c3ebab7f4", GitTreeState:"clean", BuildDate:"2021-12-07T18:16:20Z", GoVersion:"go1.17.3", Compiler:"gc", Platform:"windows/amd64"}
-  Server Version: version.Info{Major:"1", Minor:"21+", GitVersion:"v1.21.5-eks-bc4871b", GitCommit:"5236faf39f1b7a7dabea8df12726f25608131aa9", GitTreeState:"clean", BuildDate:"2021-10-29T23:32:16Z", GoVersion:"go1.16.8", Compiler:"gc", Platform:"linux/amd64"}
-  ```
-
-* Configure EKS Nodes to communicate to EKS Control Plane
-
-  Now let’s add the ConfigMap to the cluster from Terraform as well. The ConfigMap is a Kubernetes configuration, in this case for granting access to our EKS cluster. This ConfigMap allows our ec2 instances in the cluster to communicate with the EKS master, as well as allowing our user account access to run commands against the cluster. You’ll run the Terraform output command to a file, and the kubectl apply command to apply that file:
-
-  ```shell
-  terraform output -raw config_map_aws_auth > configmap.yml
-  kubectl apply -f configmap.yml
-  ```
-
-  ![Screenshot showing kubectl apply being run](./kubectl_apply_configmap.png)
-
-  Once this is complete, you should see your nodes from your autoscaling group either starting to join or joined to the cluster. Once the second column reads Ready the node can have deployments pushed to it. Again, your output may vary here:
-
-  ```shell
-  kubectl get nodes -o wide
-  ```
-
-  ![Screenshot showing kubectl get nodes being run](./kubectl_get_nodes.png)
-
-* Verify EKS deployment
-
-  Once done, you will have a ready EKS cluster under the ***Elastic Kubernetes Service*** section in your AWS console.
-
-  ![Screenshot showing AWS cloud console](./aws_eks_search.png)
-
-  ![Screenshot showing AWS cloud console with EKS cluster](./eks_cluster_console.png)
-
-## Connecting to Azure Arc
-
-Now that you have a running EKS cluster, lets connect the EKS cluster to Azure Arc by:
-
-* Create a resource group
-
-   ```shell
-   az group create --name "Arc-EKS-Demo" --location "eastus"
-   ```
-
-   > **NOTE:  Before deploying, make sure to check the Azure Arc-enabled Kubernetes region availability [page](https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc).**
-
-* Deploy Arc binaries using Azure CLI:
-
-  ```shell
-  az connectedk8s connect --name "Arc-EKS-Demo" --resource-group "Arc-EKS-Demo" --location "eastus" --tags "Project=jumpstart_azure_arc_k8s" --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-* Upon completion, you will have your EKS cluster connect as a new Azure Arc-enabled Kubernetes resource in a new resource group.
-
-  ![Screenshot showing Azure CLI command to onboard EKS cluster](./connectedk8s_onboard.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./arc_cluster_portal.png)
-
-  ![Screenshot showing Azure POrtal with Azure Arc-enabled Kubernetes resource detail](./arc_cluster_portal_connected.png)
-
-## Delete the deployment
-
-In Azure, the most straightforward way is to delete the cluster or the resource group via the Azure Portal or through the CLI.
-
-```shell
-az group delete --name "Arc-EKS-Demo"
-```
-
-![Screenshot showing delete resource group function in Azure Portal](./delete_resource_group.png)
-
-To delete the EKS cluster and supporting components, use the ```terraform destroy --auto-approve``` command.
-
-![Screenshot showing terraform destroy being run](./terraform_destroy.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/general/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/general/_index.md
deleted file mode 100644
index 0ee25f1358..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/general/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Onboarding"
-linkTitle: "Onboarding"
-weight: 1
-description: >-
-  This example demonstrates how to connect an existing Kubernetes cluster to Arc. It assumes you already have a cluster ready to work with.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/general/onboard_k8s/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/general/onboard_k8s/_index.md
deleted file mode 100644
index 51362d6f02..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/general/onboard_k8s/_index.md
+++ /dev/null
@@ -1,187 +0,0 @@
----
-type: docs
-title: "Existing cluster"
-linkTitle: "Existing cluster"
-weight: 1
-description: >
----
-
-## Connect an existing Kubernetes cluster to Azure Arc
-
-The following Jumpstart scenario will guide you on how to connect an existing Kubernetes cluster to Azure Arc using a simple shell script.
-
-## Prerequisites
-
-* Make sure your *kubeconfig* file is configured properly and you are working against your [k8s cluster context](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/).
-
-* (Optional) To simplify work against multiple k8s contexts, consider using [kubectx](https://github.com/ahmetb/kubectx).
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Install and Set Up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-
-* [Install Helm 3](https://helm.sh/docs/intro/install/). If you are on a Windows environment, a recommended and easy way is to use the [Helm 3 Chocolatey package](https://chocolatey.org/packages/kubernetes-helm).
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-* Create a new Azure resource group where you want your cluster(s) to show up.
-
-  ```shell
-  az group create -l <Azure Region> -n <resource group name>
-  ```
-
-  For example:
-
-  ```shell
-  az group create -l eastus -n Arc-k8s-Clusters
-  ```
-
-  > **NOTE: Currently, Azure Arc-enabled Kubernetes resource creation is supported only in the following locations: eastus, westeurope. Use the --location (or -l) flag to specify one of these locations.**
-
-  ![Screenshot showing Azure Portal with empty resource group](./01.png)
-
-* Change the following environment variables according to your Azure service principal name and Azure environment.
-
-  If using shell:
-
-  ```shell
-  export appId='<Your Azure service principal name>'
-  export password='<Your Azure service principal password>'
-  export tenantId='<Your Azure tenant ID>'
-  export resourceGroup='<Azure resource group name>'
-  export arcClusterName='<The name of your k8s cluster as it will be shown in Azure Arc>'
-  ```
-
-  If using PowerShell:
-
-  ```powershell
-  $env:appId=<Your Azure service principal name>
-  $env:password=<Your Azure service principal password>
-  $env:tenantId=<Your Azure tenant ID>
-  $env:resourceGroup=<Azure resource group name>
-  $env:arcClusterName=<The name of your k8s cluster as it will be shown in Azure Arc>
-  ```
-
-## Deployment
-
-* Install the Azure Arc for Kubernetes CLI extensions ***connectedk8s*** and ***k8s-configuration***:
-
-  ```shell
-  az extension add --name connectedk8s
-  az extension add --name k8s-configuration
-  ```
-
-  > **NOTE: If you already used this guide before and/or have the extensions installed, use the bellow commands:**
-
-  ```shell
-  az extension update --name connectedk8s
-  az extension update --name k8s-configuration
-  ```
-
-* Login to your Azure subscription using the SP you created.  
-
-  If using shell:
-
-  ```shell
-  az login --service-principal --username $appId --password $password --tenant $tenantId
-  ```
-
-  If using PowerShell:
-
-  ```powershell
-  az login --service-principal --username $env:appId --password $env:password --tenant $env:tenantId
-  ```
-
-* If you are working in a Linux OS or MacOS environment, make sure you are the owner of the following:
-
-  ```shell
-  sudo chown -R $USER /home/${USER}/.kube
-  sudo chown -R $USER /home/${USER}/.kube/config
-  sudo chown -R $USER /home/${USER}/.azure/config
-  sudo chown -R $USER /home/${USER}/.azure
-  sudo chmod -R 777 /home/${USER}/.azure/config
-  sudo chmod -R 777 /home/${USER}/.azure
-  ```
-
-* To connect the Kubernetes cluster to Azure Arc use the below command.
-
-  If using shell:
-
-  ```shell
-  az connectedk8s connect --name $arcClusterName --resource-group $resourceGroup --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-  If using PowerShell:
-
-  ```powershell
-  az connectedk8s connect --name $env:arcClusterName --resource-group $env:resourceGroup --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-Upon completion, you will have your Kubernetes cluster, connected as a new Azure Arc-enabled Kubernetes resource inside your resource group.
-
-![Screenshot showing Azure ARM template deployment](./02.png)
-
-![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./03.png)
-
-![Screenshot showing Azure Portal with Azure Arc-enabled Kubernetes resource](./04.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc-enabled Kubernetes resource is via the Azure Portal, just select cluster and delete it.
-
-![Screenshot showing how to delete resources in Azure Portal](./05.png)
-
-If you want to delete the entire environment, just delete the Azure resource group.
-
-![Screenshot showing how to delete resource groups in Azure Portal](./06.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/gke/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/gke/_index.md
deleted file mode 100644
index f33621c2f4..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/gke/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Google Kubernetes Engine"
-linkTitle: "Google Kubernetes Engine"
-weight: 8
-description: >-
-  If you are working in a multi-cloud environment, the scenario in this section will guide on creating a Google Kubernetes Engine (GKE) and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion using Terraform.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/_index.md
deleted file mode 100644
index 7572d5482d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/_index.md
+++ /dev/null
@@ -1,219 +0,0 @@
----
-type: docs
-title: "GKE cluster Terraform plan"
-linkTitle: "GKE cluster Terraform plan"
-weight: 1
-description: >
----
-
-## Deploy GKE cluster and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a Google Cloud Platform [Kubernetes Engine cluster](https://cloud.google.com/kubernetes-engine) and connected it as an Azure Arc-enabled Kubernetes resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Create a Google Cloud account](https://cloud.google.com/free)
-
-- [Install Terraform >=1.1.9](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-### Create a new GCP Project
-
-- Browse to <https://console.cloud.google.com/> and login with your Google Cloud account. Once logged in, [create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo". After creating it, be sure to copy down the project id as it is usually different then the project name.
-
-  ![GCP new project](./01.png)
-
-  ![GCP new project](./02.png)
-
-  ![GCP new project](./03.png)
-
-- Enable the Compute Engine API for the project, create a project Owner service account credentials and download the private key JSON file and copy the file to the directory where Terraform files are located. Change the JSON file name (for example *account.json*). The Terraform plan will be using the credentials stored in this file to authenticate against your GCP project.
-
-  ![Enable Compute Engine API](./04.png)
-
-  ![Enable Compute Engine API](./05.png)
-
-  ![Enable Compute Engine API](./06.png)
-
-  ![Add credentials](./07.png)
-
-  ![Add credentials](./08.png)
-
-  ![Add credentials](./09.png)
-
-  ![Create Service Account](./10.png)
-
-  ![Create Service Account](./11.png)
-
-  ![Create Service Account](./12.png)
-
-  ![Create Service Account](./13.png)
-
-  ![Create private key](./14.png)
-  
-  ![Create private key](./15.png)
-
-  ![Create private key](./16.png)
-
-  ![Create private key](./17.png)
-
-  ![account.json](./18.png)
-
-- Enable the Kubernetes Engine API for the project
-
-  ![Enable the Kubernetes Engine API](./19.png)
-
-  ![Enable the Kubernetes Engine API](./20.png)
-
-## Deployment
-
-The only thing you need to do before executing the Terraform plan is to create the tfvars file which will be used by the plan. This is based on the Azure service principal you've just created and your subscription.  
-
-- Navigate to the [terraform folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/gke/terraform) and create a terraform.tfvars file with values for your environment.
-
-  ```shell
-  subscriptionId="<Your Azure subscription ID>"
-  servicePrincipalAppId="<Your Azure service principal App ID>"
-  servicePrincipalSecret="<Your Azure service principal App Password>"
-  servicePrincipalTenantId="<Your Azure tenant ID"
-  gcp_project_id="<Your GCP Project ID>"
-  location="<Azure Region>"
-  resource_group_name="<Azure resource group name>"
-  gcp_credentials_filename="<Location on the Keys JSON file>"
-  gcp_region="<GCP Region to deploy resources>"
-  gke_cluster_name="<GKE cluster name>"
-  admin_username="<GKE control plane administrator username>"
-  admin_password="<GKE control plane administrator password>"
-  gke_cluster_node_count="<GKE cluster node count>"
-  gke_cluster_node_machine_type="<GKE cluster node machine type>"
-  ```  
-
-  For example:
-
-  ```shell
-  subscriptionId="ea2faf71-b368-4143-b5a5-4f6bc3c6a606"
-  servicePrincipalAppId="cf59c3b0-3545-43c3-bfb5-219f9b430b55"
-  servicePrincipalSecret="fakeSecretValue123458125712ahjeacjh"
-  servicePrincipalTenantId="3eb88a17-b9ae-4bdc-bd69-69a22255968d"
-  gcp_project_id="azure-arc-demo-352117"
-  location="eastus"
-  resource_group_name="Arc-GKE-Demo"
-  gcp_credentials_filename="account.json"
-  gcp_region="us-west1"
-  gke_cluster_name="arc-gke-demo"
-  admin_username="arcdemo"
-  admin_password="ArcDemo1234567!!"
-  gke_cluster_node_count=1
-  gke_cluster_node_machine_type="n1-standard-2"
-  ```
-
-- Run the *`terraform init`* command which will download the required terraform providers.
-
-  ![terraform init](./21.png)
-
-- Run the *`terraform apply --auto-approve`* command and wait for the apply to finish. Once done, you will have a new empty Azure resource group and and a GKE cluster under the *Kubernetes Engine* page in your GCP console.
-
-  ![terraform apply](./22.png)
-
-  ![An empty Azure resource group](./23.png)  
-
-  ![New GKE cluster in the Google Console](./24.png)
-
-  ![New GKE cluster in the Google Console](./25.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the environment variables in the Shell script file (1-time edit) which then be used throughout the deployment.
-- User is uploading the script to Cloud Shell and running the shell script. The script will:
-  - Connect to Azure using SPN credentials.
-  - Install Azure Arc CLI extensions.
-  - Connecting the cluster to Azure Arc.
-- User is verifying the Arc-enabled Kubernetes cluster.
-
-## Connecting to Azure Arc
-
-- Now that you have a running GKE cluster, edit the environment variables section in the included [az_connect_gke](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/terraform/scripts/az_connect_gke.sh) shell script.
-
-  ![Export environment variables](./26.png)
-
-  For example:
-
-  ![Export environment variables](./27.png)
-
-- Open a new Cloud Shell session which will pre-authenticated against your GKE cluster.
-
-  ![Open Google Cloud Shell session and authenticate against the GKE cluster](./28.png)
-
-  ![Open Google Cloud Shell session and authenticate against the GKE cluster](./29.png)
-
-  ![Open Google Cloud Shell session and authenticate against the GKE cluster](./30.png)
-
-- Upload the [*az_connect_gke*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/gke/terraform/scripts/az_connect_gke.sh) shell script and run it using the *`. ./az_connect_gke.sh`* command.
-
-  > **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-  ![Upload a file to Cloud Shell](./31.png)
-
-  ![Upload a file to Cloud Shell](./32.png)
-
-  ![Upload a file to Cloud Shell](./33.png)
-
-- Once the script run has finished, the GKE cluster will be projected as a new Azure Arc-enabled Kubernetes resource.
-
-  ![New Azure Arc-enabled Kubernetes cluster](./34.png)
-
-  ![New Azure Arc-enabled Kubernetes cluster](./35.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc-enabled Kubernetes resource via the Azure portal, just select the cluster and delete it.
-
-![New Azure Arc-enabled Kubernetes cluster](./36.png)
-
-To delete the GKE environment, use the *`terraform destroy --auto-approve`* command.
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/_index.md
deleted file mode 100644
index 91c4fd6a36..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "IoT Uses Cases"
-linkTitle: "IoT Uses Cases"
-weight: 16
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide you on using AKS as an Azure Arc-enabled Kubernetes cluster and simulate Azure IoT Edge environment in an automated fashion.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/13.PNG b/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/13.PNG
deleted file mode 100644
index 395349fb93..0000000000
Binary files a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/13.PNG and /dev/null differ
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/15.PNG b/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/15.PNG
deleted file mode 100644
index 78da746900..0000000000
Binary files a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/15.PNG and /dev/null differ
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/16.PNG b/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/16.PNG
deleted file mode 100644
index 0afe0b34ed..0000000000
Binary files a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/16.PNG and /dev/null differ
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/_index.md
deleted file mode 100644
index e4cb442787..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/_index.md
+++ /dev/null
@@ -1,236 +0,0 @@
----
-type: docs
-title: "Azure IoT Edge integration with AKS as an Azure Arc Connected Cluster"
-linkTitle: "Azure IoT Edge integration with AKS as an Azure Arc Connected Cluster"
-weight: 1
-description: >
----
-
-## Deploy AKS cluster on Azure IoT Edge and connect it to Azure Arc using Terraform
-
-This scenario allows us to see how Azure IoT Edge and Azure Arc services complement each other in an easy and simple way, providing mechanisms for AKS cluster operators to configure the fundamental components of an AKS cluster and apply policies by monitoring its supervision, through Azure Arc. Furthermore, from Azure IoT Edge, application operators can remotely deploy and manage workloads at scale with convenient ingest from the cloud and in a bi-directional way.
-
-  > **NOTE: Azure Kubernetes Service is now in preview on Azure IoT Edge. You can find more details about this service in the [IoT Edge's support for Kubernetes document](https://microsoft.github.io/iotedge-k8s-doc/)**
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster and connect it as an Azure Arc-enabled Kubernetes resource.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Install Terraform >=0.15](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az extension add --name connectedk8s
-  az extension add --name k8sconfiguration
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  ```
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-* First bash script ([_edge_azure_vm.sh_]((https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_iot_edge/terraform/scripts/edge/edge_azure_vm.sh)) - Used specifically for provisioning the necessary components in the VM to be able to deploy our "simulated" edge device:
-
-  * Download Install the required tools _moby-engine_
-  * Download & install the Azure _aziot-edge_
-  * Creation of a new configuration file for aziot-edge (_/etc/aziot/config.toml_)
-
-* Second bash script ([_az_k8sconfig_helm_aks.sh_](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_iot_edge/terraform/scripts/helm/az_k8sconfig_helm_aks.sh)) Allow us to deploy our IoT Edge solution for AKS, configure our and associate our AKS cluster with Azure Arc, for this:
-
-  * Log in to Azure with Service Principal & Getting AKS credentials (kubeconfig)
-  * Associate our AKS with Azure Arc
-  * Create Namespace _iotedge_ in AKS
-  * Generate a secret that contains the connection string of our edge device.
-  * Create Cluster-level GitOps-Config for deploying IoT Edge workload
-
-## Deployment
-
-Before running the Terraform automation, you need to export the environment variables that will be used by the plan to customize your environment.
-
-In addition, validate that the AKS Kubernetes version is available in your region using the below Azure CLI command.
-
-```shell
-az aks get-versions -l "<Your Azure Region>"
-```
-
-In case the AKS service is not available in your region, you can change the AKS Kubernetes version in the [*variables.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/aks/terraform/variables.tf) file by searching for *kubernetes_version*.
-
-* Export the environment variables needed for the Terraform plan.
-
-    ```shell
-    export TF_VAR_client_id=<Your Azure service principal App ID>
-    export TF_VAR_client_secret=<Your Azure service principal App Password>
-    ```
-
-    > **NOTE: If you are running in a PowerShell environment, to set the Terraform environment variables, use the _Set-Item -Path env:_ prefix (see example below)**
-
-    ```powershell
-    Set-Item -Path env:TF_VAR_client_id
-    ```
-
-* Run the ```terraform init``` command which will download the Terraform AzureRM provider.
-
-    ![Screenshot showing terraform init being run](./01.png)
-
-* Run the ```terraform apply -auto-approve`` command and wait for the plan to finish.
-
-    Once the Terraform deployment is completed, a new Resource Group and all services (Vnet, Subnets, VMs, IoT Hub, EventHub, AKS Cluster) are created.
-
-    ![Screenshot showing terraform plan completing](./02.png)
-
-    ![Screenshot showing Azure Portal with AKS resource](./03.png)
-
-    ![Screenshot showing Azure Portal with AKS resource](./04.png)
-
-* In this scenario we will use a VM to "simulate" an IoT Edge device. To do this, we must register a new Edge device in our IoT Hub that we will later configure.
-
-* In order to keep your local environment clean and untouched, we will use [Azure Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview) (located in the top-right corner of the Azure portal) to run the next commands:
-
-    ![Screenshot showing how to access Cloud Shell in Visual Studio Code](./05.png)
-
-* Create IoT Edge Device
-
- ```shell
-az iot hub device-identity create --device-id "EdgeDeviceSim" --edge-enabled --hub-name k8sedgejumpstart
- ```
-
-> * We will obtain the connection string of the new IoT Edge device to be able to make the link
-
-```shell
-az iot hub device-identity connection-string show --device-id "EdgeDeviceSim" --hub-name k8sedgejumpstart
-  ```
-
-  ![Screenshot showing how to access Cloud Shell in Visual Studio Code](./06.png)
-
-  ![Screenshot showing how to access Cloud Shell in Visual Studio Code](./07.png)
-
-* Next, log into the deployment VM using your SSH credentials and edit the _/etc/aziot/config.toml_ by replacing the connection string using the one we obtained in the previous step.
-
-```shell
-# Manual provisioning with connection string
-[provisioning]
-source = "manual"
-connection_string = "<ADD DEVICE CONNECTION STRING HERE>"
- ```
-
-* In order to synchronize the configuration of the device that we have paired we must execute the following command:
-
-```shell
-sudo iotedge config apply
- ```
-
-![Screenshot showing sync config IoT Edge device in VM](./08.png)
-
-* Once completed the above steps, return to the Azure Cloud Shell where we will assign to our new device a module to simulate a temperature sensor. For this we will upload the file through the Azure Cloud Shell interface:  
-
-![Screenshot showing sync config IoT Edge device in VM](./09.png)
-
-* Once the file is uploaded, execute the following command:
-
-> **NOTE: You can see an example of the [deployment.json](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_iot_edge/terraform/scripts/edge/deployment.json) file that we use.**
-
-```shell
-az iot edge set-modules --hub-name k8sedgejumpstart --device-id "EdgeDeviceSim" --content ./deployment.json
-```
-
-* From the Azure portal, select the IoT Hub instance under _K8sEdgeJumpStart_. By selecting our IoT Edge device, we can see all the information about the modules it is running and If everything has been successful we will see that the "SimulatedTemperatureSensor" module is running correctly.
-
-![Screenshot showing IoT Edge device in IoT Hub](./10.png)
-
-![Screenshot showing IoT Edge device in IoT Hub](./11.png)
-
-* We can also check from the virtual machine itself the modules that are running at that moment, using the following command:
-
-```shell
-sudo iotedge list
-```
-
-![Screenshot showing IoT Edge modules running in the device](./12.png)
-
-* Now download the [values.yaml](https://github.com/Azure/iotedge/blob/preview/iiot/kubernetes/charts/edge-kubernetes/values.yaml) file for IoT Edge Helm chart and replace the deviceConnectionString placeholder at the end of the file with the connection string you noted earlier.
-
-```yaml
-# Manual provisioning configuration using a connection string
-provisioning:
-  source: "manual"
-  deviceConnectionString: "<ADD DEVICE CONNECTION STRING HERE>"
-  dynamicReprovisioning: false
-```
-
-* Edit the environment variables section in the included in the [_az_k8sconfig_helm_aks.sh_](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/aks_iot_edge/terraform/scripts/helm/az_k8sconfig_helm_aks.sh) shell script. As we did in the previous steps, upload the files to our Azure Cloud Shell.
-
-![Screenshot environment variables section](./13.png)
-
-* Once the script run has finished, the AKS cluster will be projected as a new Azure Arc-enabled Kubernetes resource. We will proceed to connect to our AKS cluster and in a couple of minutes you should see the workload modules defined in the edge deployment running as pods along with edgeagent and iotedged.
-We can use the following commands to check it:
-
-![Screenshot environment variables section](./16.png)
-
-```shell
-kubectl get pods -n iotedge
-kubectl logs -n iotedge <replace-with-iot-edge-pod-name> simulatedtemperaturesensor
-```
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc-enabled Kubernetes resource via the Azure Portal, just select the Resource Group and delete it.
-
-![Screenshot showing delete function in Azure Portal](./14.png)
-
-If you want to nuke the entire environment, delete both the AKS and the AKS resources resource groups or run the ```terraform destroy -auto-approve``` command.
-
-![Screenshot showing terraform destroy being run](./15.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/kind/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/kind/_index.md
deleted file mode 100644
index 0517913055..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/kind/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Kind"
-linkTitle: "Kind"
-weight: 11
-description: >-
-  If you do not have a Kubernetes cluster, the scenario in this section will guide on creating a kind (kubernetes in docker) cluster on your local machine and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/kind/local_kind/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/kind/local_kind/_index.md
deleted file mode 100644
index a3b29f1586..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/kind/local_kind/_index.md
+++ /dev/null
@@ -1,202 +0,0 @@
----
-type: docs
-title: "Kind cluster"
-linkTitle: "Kind cluster"
-weight: 1
-description: >
----
-
-## Deploy a local Kubernetes Cluster using kind and connect it to Azure Arc
-
-The following Jumpstart scenario will guide you on how to use [kind](https://kind.sigs.k8s.io/) to run a Kubernetes cluster locally and connect it as an Azure Arc-enabled Kubernetes cluster resource.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Install and Set Up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-
-* [Install Helm 3](https://helm.sh/docs/intro/install/)
-
-* Kind leverages Docker to run the Kubernetes nodes. You will need to install Docker locally:
-
-  * If you are a Windows user, install [Docker Desktop](https://www.docker.com/products/docker-desktop). You can also use the [Chocolatey package](https://chocolatey.org/packages/docker-desktop) to automate the installation.
-  * If you are a MacOS User, install [Docker Desktop for Mac](https://docs.docker.com/docker-for-mac/).
-  * If you are a Linux user, use your package manager to install the [Docker engine](https://docs.docker.com/engine/install/).
-
-* Install the [Go programming language](https://golang.org/dl/).
-
-* Create Azure service principal (SP)
-
-  The Azure service principal assigned with the "Contributor" role is required to complete the scenario and its related automation. To create it, log in to your Azure account run the below command (you could also do this in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-* Install the Azure Arc for Kubernetes CLI extensions ***connectedk8s*** and ***k8s-configuration***:
-
-  ```shell
-  az extension add --name connectedk8s
-  az extension add --name k8s-configuration
-  ```
-
-  > **NOTE: If you already used this guide before and/or have the extensions installed, use the below commands:**
-
-  ```shell
-  az extension update --name connectedk8s
-  az extension update --name k8s-configuration
-  ```
-
-## Deployment
-
-* Install kind
-
-  On Linux:
-
-  ```shell
-  curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.9.0/kind-linux-amd64
-  chmod +x ./kind
-  sudo mv ./kind /usr/local/bin/kind
-  ```
-
-  On MacOS:
-
-  ```shell
-  brew install kind
-  ```
-
-  On Windows:
-
-  ```powershell
-  choco install kind
-  ```
-
-  * Navigate to the folder that has the kind cluster definition.
-
-  ```shell
-  cd azure_arc/azure_arc_k8s_jumpstart/kind
-  ```
-
-  * Create the kind cluster. We are using a configuration file called `kind_cluster.yaml` to specify our cluster configuration. This will create a 3 node cluster, with 1 master node and 2 worker nodes.
-
-  ```shell
-  kind create cluster --config kind_cluster.yaml --name arc-cluster
-  ```
-
-  ![kind create cluster](./01.png)
-
-  > **NOTE: By default, kind will store the kubeconfig file used to connect to your cluster in the ~/.kube directory. If you want to use a custom directory to store the kubeconfig file, use the `--kube-config` flag.**
-
-  If you chose a specific location for the cluster's *kubeconfig* file, make sure you export its location as an environment variable using the `export KUBECONFIG=/path/to/kubeconfig` location or in Windows, add this location to your PATH.
-
-* Verify that kind has created the cluster successfully, and you can access the cluster using `kubectl`.
-
-  ```shell
-  kubectl get nodes
-  ```
-
-  ![kubectl get nodes](./02.png)
-
-## Connecting to Azure Arc
-
-* Now that you have a running kind cluster let's connect the kind cluster to Azure Arc.
-
-  ```shell
-  az login --service-principal -u mySpnClientId -p mySpnClientSecret --tenant myTenantID
-  ```
-
-* Create a resource group
-
-  ```shell
-  az group create --name Arc-kind-Demo -l EastUS -o table
-  ```
-
-   > Note:  Before deploying, make sure to check the Azure Arc-enabled Kubernetes region availability [page](https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc).
-
-  ![Create Azure resource group](./03.png)
-
-* Deploy the Arc binaries using Azure CLI:
-
-  ```shell
-  az connectedk8s connect -n Arc-kind-Demo -g Arc-kind-Demo --tags 'Project=jumpstart_azure_arc_k8s' --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-* Upon completion, you will have your kind cluster connected as a new Azure Arc Kubernetes cluster resource in a new resource group.
-
-  ![New Azure Arc-enabled Kubernetes cluster](./04.png)
-
-  ![New Azure Arc-enabled Kubernetes cluster](./05.png)
-
-  ![New Azure Arc-enabled Kubernetes cluster](./06.png)
-
-## Delete the deployment
-
-* In Azure, the most straightforward way is to delete the cluster or the resource group via the Azure Portal or through the CLI.
-
-  ```shell
-  az group delete --name Arc-kind-Demo
-  ```
-
-  ![Delete the Azure Arc-enabled Kubernetes cluster](./07.png)
-
-  ![Delete Azure resource group](./08.png)
-
-* To delete the kind cluster locally, use the following command:
-
-  ```shell
-  kind delete cluster --name arc-cluster
-  ```
-
-  ![kind delete cluster](./09.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/microk8s/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/microk8s/_index.md
deleted file mode 100644
index 0a56fabb29..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/microk8s/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "MicroK8s"
-linkTitle: "MicroK8s"
-weight: 12
-description: >-
-  If you do not have a Kubernetes cluster, the scenario in this section will guide on creating a MicroK8s Kubernetes cluster on your local machine and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/microk8s/local_microk8s/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/microk8s/local_microk8s/_index.md
deleted file mode 100644
index b96797decd..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/microk8s/local_microk8s/_index.md
+++ /dev/null
@@ -1,253 +0,0 @@
----
-type: docs
-title: "MicroK8s cluster"
-linkTitle: "MicroK8s cluster"
-weight: 1
-description: >
----
-
-## Deploy a local Kubernetes Cluster using MicroK8s and connect it to Azure Arc
-
-The following Jumpstart scenario will guide you on how to use [MicroK8s](https://microk8s.io/) to run a Kubernetes cluster locally and connect it as an Azure Arc-enabled Kubernetes cluster resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install and Set Up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-
-- [Install Helm 3](https://helm.sh/docs/intro/install/)
-
-- Create Azure service principal (SP)
-
-  To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-- Install the Azure Arc for Kubernetes CLI extensions ***connectedk8s*** and ***k8s-configuration***:
-
-  ```shell
-  az extension add --name connectedk8s
-  az extension add --name k8s-configuration
-  ```
-
-  > **NOTE: If you already used this guide before and/or have the extensions installed, use the bellow commands:**
-
-  ```shell
-  az extension update --name connectedk8s
-  az extension update --name k8s-configuration
-  ```
-
-## Deployment
-
-- Install MicroK8s following the [specific install guide](https://microk8s.io/) for your operating system. For convenience, we've added some commands below:
-
-  Windows:
-  
-    Download the [MicroK8s installer for Windows](https://microk8s.io/docs/install-windows) and follow the instructions.
-
-    ![MicroK8s installer for Windows](https://global.discourse-cdn.com/business6/uploads/kubernetes/original/2X/7/748b76ed4495ee1958fd88d701b0b3c391aa8f85.png)
-
-    Once installed, enable MicroK8s with:
-
-    ```shell
-    microk8s status --wait-ready
-    microk8s enable dns
-    ```
-
-  Linux:
-
-    ```shell
-    sudo snap install microk8s --classic
-    sudo usermod -a -G microk8s <username>
-    sudo chown -f -R <username> ~/.kube
-    newgrp microk8s
-    microk8s status --wait-ready
-    microk8s enable dns
-    ```
-
-    ![linux install microk8s](./01.png)
-
-  MacOS:
-
-    ```shell
-    brew install ubuntu/microk8s/microk8s
-    microk8s install
-    microk8s status --wait-ready
-    microk8s enable dns
-    ```
-
-    ![brew install microk8s](https://assets.ubuntu.com/v1/670398bd-mac1.png)
-
-  WSL2:
-
-  [This blog post](https://ubuntu.com/blog/kubernetes-on-windows-with-microk8s-and-wsl-2) walks through an installation of MicroK8s in WSL 2.
-
-- Export MicroK8s cluster kubeconfig file path
-
-  MicroK8s will not update your .kube/config file, and accessing the cluster is done using the microk8s cli, eg: `microk8s kubectl get nodes`. To be able to use this config with the Azure Arc CLI, we need to export it into a file.
-
-  Windows:
-
-    ```shell
-    microk8s config view > %HOMEPATH%\.kube\microk8s
-    ```
-
-  Linux and MacOS:
-
-    ```shell
-    microk8s config view > ~/.kube/microk8s
-    ```
-
-## Connect the cluster to Azure Arc
-
-- Authenticate Azure CLI
-
-  We'll start by authenticating our CLI with Azure, **replacing the values below** with the output from the command we issued to create service principal earlier (`az ad sp create-for-rbac`) in the prerequisite section of this guide.
-
-  ```shell
-  az login --service-principal -u appId -p password --tenant tenant
-  ```
-
-  ![Authenticate Azure CLI](./02.png)
-
-- Create a resource group
-
-  ```shell
-  az group create -n Arc-MicroK8s-Demo -l EastUS
-  ```
-
-  ![Create new Azure resource group](./03.png)
-
-  ![Create new Azure resource group](./04.png)
-
-- Connect the cluster to Azure Arc
-
-  Windows:
-
-  ```shell
-  az connectedk8s connect --name Arc-MicroK8s-Demo --resource-group Arc-MicroK8s-Demo --kube-config %HOMEPATH%\.kube\microk8s --kube-context microk8s --tags 'Project=jumpstart_azure_arc_k8s' --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-  Linux and MacOS:
-
-  ```shell
-  az connectedk8s connect --name Arc-MicroK8s-Demo --resource-group Arc-MicroK8s-Demo  --kube-config ~/.kube/microk8s --kube-context microk8s --tags 'Project=jumpstart_azure_arc_k8s' --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-  ```
-
-  ![New Azure Arc-enabled Kubernetes cluster](./05.png)
-
-- Upon completion, you will have your MicroK8s cluster connected as a new Azure Arc Kubernetes cluster resource in a new resource group.
-
-  ![New Azure Arc-enabled Kubernetes cluster](./06.png)
-
-  ![New Azure Arc-enabled Kubernetes cluster](./07.png)
-
-## Optional - Day 2 Operations
-
-Now that your Kubernetes cluster is connected to Azure Arc, you might want to explore the following Day 2 scenarios:
-
-- [Deploy GitOps configurations and perform Helm-based GitOps flow on MicroK8s as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_gitops_helm/)
-
-## Delete the deployment
-
-- In Azure, the most straightforward way is to delete the cluster or the resource group via the Azure Portal or through the CLI.
-
-  ```shell
-  az group delete --name Arc-MicroK8s-Demo
-  ```
-
-  ![Delete Azure resource group](./08.png)
-
-- To stop the MicroK8s cluster locally, use the following command:
-
-  ```shell
-  microk8s stop
-  ```
-
-- The uninstall process of MicroK8s depends on your operating system.
-
-  Windows
-
-    Stop the MicroK8s VM in Multipass:
-
-    ```shell
-    multipass stop microk8s-vm
-    ```
-
-    Launch `Add or Remove Programs` and uninstall MicroK8s.
-
-    ![Uninstall MicroK8s from Windows](./09.png)
-
-    ```shell
-    multipass delete microk8s-vm
-    multipass purge
-    ```
-
-    If you want to completely uninstall Multipass, launch `Add or Remove Programs` and uninstall Multipass.
-
-    ![Uninstall Multipass from Windows](./10.png)
-
-  Linux:
-
-    ```shell
-    sudo snap remove microk8s
-    ```
-  
-  MacOS:
-
-    ```shell
-    brew uninstall ubuntu/microk8s/microk8s
-    ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/pf9/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/pf9/_index.md
deleted file mode 100644
index b3cf5761f9..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/pf9/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Platform9 Managed Kubernetes"
-linkTitle: "Platform9 Managed Kubernetes"
-weight: 12
-description: >-
-  The scenario in this section will guide on creating a Platform9 Managed Kubernetes (PMK) cluster on-premise or on the cloud and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/pf9/pf9_bareos/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/pf9/pf9_bareos/_index.md
deleted file mode 100644
index d8e8821c54..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/pf9/pf9_bareos/_index.md
+++ /dev/null
@@ -1,181 +0,0 @@
----
-type: docs
-title: "Platform9 Managed BareOS Kubernetes (PMK) cluster"
-linkTitle: "Platform9 Managed BareOS Kubernetes (PMK) cluster"
-weight: 1
-description: >
----
-
-## Deploy a Platform9 Managed Kubernetes cluster and connect it to Azure Arc
-
- > **Disclaimer: This scenario was contributed by the Platform9 team as part of the "Jumpstart Friends" program**
-
-<p align="center"><img src="/img/jumpstart_friends_logo.png" alt="jumpstart-friends-logo" width="250"></p>
-
-The following Jumpstart scenario will guide on how to deploy a Kubernetes cluster with [Platform9 Managed Kubernetes (PMK)](https://platform9.com/managed-kubernetes/) and have it as a connected Azure Arc Kubernetes resource. With PMK, you can have your clusters deployed on-premises, in public clouds, or at the edge. In this document, we'll explain the steps on how to create an **on-premise [BareOS](https://platform9.com/docs/kubernetes/bareos-what-is-bareos) cluster** using **PMK** and connect it to **Microsoft Azure Arc**.
-
-## Prerequisites
-
-- An Ubuntu 20.04 installed physical machine or VM. In this scenario, we would be using single node kubernetes cluster installation. This machine would also act as our management host.
-
-- The [kubectl](https://platform9.com/learn/tutorials/kubectl) executable binary for local cluster management. If you would want to have a separate host for cluster management, follow the below steps to [install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/#install-using-native-package-management) on it.
-
-  ```shell
-  sudo apt-get update
-  sudo apt-get install -y apt-transport-https ca-certificates curl
-  sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
-  echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
-  sudo apt-get update
-  sudo apt-get install -y kubectl
-  ```
-
-  > **NOTE: The *kubectl* package is installed from the Kubernetes repository, hence the Google Cloud public signing key need to be downloaded to enable the repository. Note: All PMK cluster nodes would have kubectl installed once the cluster is deployed.**
-
-- [Install or update Azure CLI (az) to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest).
-
-  Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Helm](https://helm.sh/docs/intro/install/) version 3+ , to install the Azure Arc agents on the cluster.
-
-  ```shell
-  curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | sudo bash
-  ```
-
-- Create Azure service principal (SP)
-
-  To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment
-
-This deployment consists of 3 sections.
-
-  1. Onboarding the node to Platform9 Management Plane.
-  2. Creating a PMK Cluster.
-  3. Connect the cluster to Microsoft Azure Arc.
-
-### Onboarding the node to Platform9 Management Plane
-
-- Login to your Management Plane.
-
-  ![Screenshot of PMK Management Plane Login Page](./01.png)
-
-  > **NOTE: If you do not have a registered Management Plane with Platform9, you can create one easily using [PMK Free Tier deployment](https://platform9.com/managed-kubernetes/)**
-
-- Onboard the Ubuntu host to your Management Plane.
-
-  For a BareOS cluster, you will need to have the nodes registered with the PMK Management Plane on which the cluster is to be deployed. For this first, add the node.
-
-  ![Screenshot of Adding a node](./02.png)
-
-  This should take you to the Node onboarding page. A **pf9ctl** utility is provided to set up the nodes and get connected with Management Plane.
-  Follow the instructions to download and install the utility, which we will use to prepare the node and connect it with your Platform9 Management Plane.
-
-  ![Screenshot of PF9 CLI](./03.png)
-
-  > **NOTE: Preparing the node and connecting it to Management Plane might take approximately 4-5 minutes to complete.**
-
-### Creating a PMK Cluster
-
-- The onboarded node should now be seen on our Management Plane. To create a [PMK cluster](https://platform9.com/learn/learn/get-started-bare-metal) via the PMK Management Plane UI, follow the steps as described below.
-
-  - Click to add a cluster to the Management Plane.
-
-  ![Screenshot of Adding Cluster](./04.png)
-
-  - Create a cluster from the nodes onboarded to the Management Plane.
-
-  ![Screenshot of Creating One Click Cluster](./05.png)
-
-  - Enter the cluster name and k8s version. Submit the page and it will trigger the cluster creation on the node.
-
-  ![Screenshot of Cluster name entry](./06.png)
-
-  - The cluster should get created in a few minutes and the status should be reported as **Healthy** and **Online**.
-
-  ![Screenshot of Cluster Created](./07.png)
-
-### Connect the cluster to Microsoft Azure Arc
-
-- Clone the [Azure Arc Jumpstart repository](https://github.com/microsoft/azure_arc) and change to the pf9 script directory.
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  cd azure_arc/azure_arc_k8s_jumpstart/pf9
-  ```
-
-- Set the variables according to your Azure service principal name and Azure environment in the *pf9_az_connect_k8s.sh* script.
-
-  ![Screenshot of Exporting values](./08.png)
-
-  > **NOTE: The values can be referenced from the service principal output.**
-
-- Set the KUBECONFIG variable for connecting to the K8s cluster. The kubeconfig file for the cluster is available for download from the Management Plane.
-
-  ![Screenshot to Download Kubeconfig](./09.png)
-
-  - An example output is shown below for setting the _KUBECONFIG_ variable;
-
-  ```shell
-  export KUBECONFIG=~/path/to/config/file
-  ```
-
-- Run the _pf9_az_connect_k8s.sh_ script to connect the Platform9 Managed Kubernetes (PMK) cluster to Azure Arc.
-
-  ```shell
-  sh ./pf9_az_connect_k8s.sh
-  ```
-
-  ![Screenshot to Connect to Azure Arc](./10.png)
-
-## Verification
-
-- The cluster should be seen onboarded as a new Azure Arc-enabled Kubernetes resource.
-
-  ![Screenshot of Cluster Verification](./11.png)
-
-- Azure Arc agents are running in the cluster.
-
-  ![Screenshot to List pods azure-arc](./12.png)
-
-## Deleting the Deployment
-
-- The Azure Arc-enabled Kubernetes resource can be deleted via the Azure Portal.
-
-  ![Screenshot of Azure Arc cluster deletion](./13.png)
-
-- For deleting the entire environment, just delete the Azure resource group that was created.
-
-  ![Screenshot of Azure Resource group deletion](./14.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/_index.md
deleted file mode 100644
index 3cd686398b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Rancher K3s"
-linkTitle: "Rancher K3s"
-weight: 10
-description: >-
-  If you do not have a Kubernetes cluster, the scenarios in this section will guide on creating a Rancher K3s Kubernetes cluster on either your VMware vSphere infrastructure or on an Azure VM and onboard it as an Azure Arc-enabled Kubernetes cluster in an automated fashion using either ARM template or Terraform.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/azure_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/azure_arm_template/_index.md
deleted file mode 100644
index 53221660a9..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/azure_arm_template/_index.md
+++ /dev/null
@@ -1,167 +0,0 @@
----
-type: docs
-title: "k3s Azure ARM template"
-linkTitle: "k3s Azure ARM template"
-weight: 1
-description: >
----
-
-## Deploy Rancher k3s on an Azure VM and connect it to Azure Arc using Azure ARM template
-
-The following Jumpstart scenario will guide you on how to use the provided [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview) to deploy a "Ready to Go" Azure virtual machine installed with single-master Rancher K3s Kubernetes cluster and connected it as an Azure Arc cluster resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Enable subscription for two providers for Azure Arc-enabled Kubernetes.
-  
-- [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-- [- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) (or use existing ssh key)
-
-> **NOTE: Default file location for public key: Windows - (C:\Users\WINUSER/.ssh\id_rsa.pub), Linux - (~/.ssh/id_rsa.pub)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User provides the ARM template parameter values, either via the portal or editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-2. User deploys the ARM template that will initiate the deployment of the k3s cluster and that will be onboarded as an Azure Arc-enabled Kubernetes cluster.
-
-3. User configures external access for the cluster.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_k8s_jumpstart%2Francher_k3s%2Fazure%2Farm_template%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./01.png)
-
-  ![Screenshot showing Azure portal deployment completion](./02.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-The deployment is using the template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template/azuredeploy.parameters.json) file to include your public SSH key, the Ubuntu OS username as well as the appId, password and tenant generated from the service principal creation.  
-
-To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template) and run the below command:
-
-```shell
-az group create --name <Name of the Azure resource group> --location <Azure Region>
-az deployment group create \
---resource-group <Name of the Azure resource group> \
---name <The name of this deployment> \
---template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template/azuredeploy.json \
---parameters <The *azuredeploy.parameters.json* parameters file location>
-```
-
-For example:
-
-```shell
-az group create --name Arc-K3s-Demo --location "East US 2"
-az deployment group create \
---resource-group Arc-K3s-Demo \
---name arck3sdemo01 \
---template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_k8s_jumpstart/rancher_k3s/azure/arm_template/azuredeploy.json \
---parameters azuredeploy.parameters.json
-```
-
-> **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-Upon completion, you will have new VM installed as a single-host k3s cluster which is already projected as an Azure Arc-enabled Kubernetes cluster in a new resource group.
-
-![Screenshot showing Azure resource group](./03.png)
-
-## Logging
-
-For ease of troubleshooting and tracking, a deployment log will be created automatically as part of the script runtime. To view the deployment log use the below command:
-
-```shell
-cat /home/<USER>/jumpstart_logs/installK3s.log
-```
-
-![Screenshot showing the installK3s log file](./04.png)
-
-> **NOTE: For enhanced security posture, SSH (22) port are not open by default in this scenario. You will need to create a network security group (NSG) rule to allow network access to port 22, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.**
-
-## Cleanup
-
-To delete environment, simply just delete the Azure resource group.
-
-![Screenshot showing Delete Azure resource group](./05.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/azure_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/azure_terraform/_index.md
deleted file mode 100644
index 450a9eb25c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/azure_terraform/_index.md
+++ /dev/null
@@ -1,142 +0,0 @@
----
-type: docs
-title: "k3s Azure Terraform plan"
-linkTitle: "k3s Azure Terraform plan"
-weight: 2
-description: >
----
-
-## Deploy Rancher k3s on an Azure VM and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a "Ready to Go" Azure virtual machine installed with single-master Rancher K3s Kubernetes cluster and connected it as an Azure Arc cluster resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install Terraform >=1.1.9](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User edits the tfvars script to match the environment.
-2. User runs ```terraform init``` to download the required terraform providers.
-3. User access the bootstrap VM created by the terraform plan and connects the K3s cluster to Azure Arc using the SPN credentials.
-4. User verifies the Arc-enabled Kubernetes cluster.
-
-## Deployment
-
-The only thing you need to do before executing the Terraform plan is to create the tfvars file which will be used by the plan. This is based on the Azure service principal you've just created and your subscription.
-
-- Navigate to the [terraform folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/rancher_k3s/azure/terraform) and fill in the terraform.tfvars file with the values for your environment.
-
-    ![Screenshot showing terraform tfvars](./01.png)
-
-    For example:
-    ![Screenshot showing terraform tfvars example](./02.png)
-
-- Run the ```terraform init``` command which will download the Terraform AzureRM provider.
-
-    ![Screenshot showing terraform init](./03.png)
-
-- Run the ```terraform apply --auto-approve``` command and wait for the plan to finish.
-
-    ![Screenshot showing terraform apply completed](./04.png)
-
-Upon completion, you will have new VM installed as a single-host k3s cluster which is already projected as an Azure Arc-enabled Kubernetes cluster in a new resource group.
-
-![Screenshot showing Azure resource group](./05.png)
-
-## Logging
-
-For ease of troubleshooting and tracking, a deployment log will be created automatically as part of the script runtime. To view the deployment log use the below command:
-
-```shell
-cat /home/<USER>/jumpstart_logs/installK3s.log
-```
-
-![Screenshot showing the installK3s log file](./06.png)
-
-> **NOTE: For enhanced security posture, SSH (22) port are not open by default in this scenario. You will need to create a network security group (NSG) rule to allow network access to port 22, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.**
-
-## Cleanup
-
-To delete environment, simply just delete the Azure resource group.
-
-![Screenshot showing Delete Azure resource group](./07.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/vmware_terraform/_index.md b/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/vmware_terraform/_index.md
deleted file mode 100644
index 51bc6c05ba..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_k8s/rancher_k3s/vmware_terraform/_index.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-type: docs
-title: "k3s on VMware Terraform plan"
-linkTitle: "k3s on VMware Terraform plan"
-weight: 3
-description: >
----
-
-## Deploy Rancher k3s on a VMware vSphere VM and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a "Ready to Go" VMware vSphere Ubuntu Server virtual machine installed with a single-master Rancher K3s Kubernetes cluster and connected it as an Azure Arc cluster resource.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Install Terraform >=0.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-* A VMware vCenter Server user with [permissions to deploy](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-4D0F8E63-2961-4B71-B365-BBFA24673FDB.html) a Virtual Machine from a Template in the vSphere Web Client.
-
-* Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcK8s" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcK8s",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* [Enable subscription with](https://docs.microsoft.com/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider) the two resource providers for Azure Arc-enabled Kubernetes. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.Kubernetes
-  az provider register --namespace Microsoft.KubernetesConfiguration
-  az provider register --namespace Microsoft.ExtendedLocation
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.Kubernetes -o table
-  az provider show -n Microsoft.KubernetesConfiguration -o table
-  az provider show -n Microsoft.ExtendedLocation -o table
-  ```
-
-### Preparing an Ubuntu Server VMware vSphere VM Template
-
-Before using the below guide to deploy an Ubuntu Server VM and connect it to Azure Arc, a VMware vSphere Template is required. [The following README](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/vmware_ubuntu_template/) will instruct you how to easily create such a template using VMware vSphere 6.5 and above.
-
-> **NOTE: If you already have an Ubuntu Server VM template it is still recommended to use the guide as a reference.**
-
-## Deployment
-
-Before executing the Terraform plan, you must set the environment variables which will be used by the plan. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your VMware vSphere credentials.
-
-* Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command.
-
-* The Terraform plan creates resources in both Microsoft Azure and VMware vSphere. It then executes a script on the virtual machine to install the Azure Arc agent and all necessary artifacts. This script requires certain information about your VMware vSphere and Azure environments.
-
-* Edit [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform/scripts/vars.sh) and update each of the variables with the appropriate values.
-
-  * TF_VAR_subscription_id=Your Azure subscription ID
-  * TF_VAR_client_id=Your Azure service principal name
-  * TF_VAR_client_secret=Your Azure service principal password
-  * TF_VAR_tenant_id=Your Azure tenant ID
-  * TF_VAR_resourceGroup=Azure resource group name
-  * TF_VAR_location=Azure Region
-  * TF_VAR_arcClusterName=The name of your k8s cluster as it will be shown in Azure Arc
-  * TF_VAR_vsphere_user=vCenter Admin Username
-  * TF_VAR_vsphere_password=vCenter Admin Password
-  * TF_VAR_vsphere_server=vCenter server FQDN/IP
-  * TF_VAR_admin_user=OS Admin Username
-  * TF_VAR_admin_password=OS Admin Password
-
-* From CLI, navigate to the [*azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform*](https://github.com/microsoft/azure_arc/tree/main/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform) directory of the cloned repo.
-
-* Export the environment variables you edited by running [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform/scripts/vars.sh) with the source command as shown below. Terraform requires these to be set for the plan to execute properly. Note that this script will also be automatically executed remotely on the virtual machine as part of the Terraform deployment.
-
-    ```shell
-    source ./scripts/vars.sh
-    ```
-
-* In addition to the *TF_VAR* environment variables you've just exported, edit the Terraform variables in the [*terraform.tfvars*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform/terraform.tfvars) to match your VMware vSphere environment.
-
-    ![TF_VAR environment variables](./01.png)
-
-* Run the ```terraform init``` command which will download the Terraform AzureRM, Local and vSphere providers.
-
-    ![terraform init](./02.png)
-
-* Run the ```terraform apply --auto-approve``` command and wait for the plan to finish.
-
-    ![terraform apply](./03.png)
-
-* Once the Terraform deployment is completed, a new Ubuntu Server VM will be up & running, installed with a single-master Rancher K3s Kubernetes cluster and will be projected as an Azure Arc Kubernetes cluster in a newly created Azure resource group.
-
-    ![VMware vSphere Ubuntu Server VM](./04.png)
-
-    ![Azure Arc-enabled Kubernetes cluster](./05.png)
-
-    ![Azure Arc-enabled Kubernetes cluster](./06.png)
-
-## Delete the deployment
-
-* The most straightforward way is to delete the cluster is via the Azure Portal, just select cluster and delete it.
-
-    ![Delete Azure Arc-enabled Kubernetes cluster](./07.png)
-
-* If you want to nuke the entire environment, just delete the Azure resource group and the newly generated *az_connect_k3s* shell script in the [*scripts*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_k8s_jumpstart/rancher_k3s/vmware/terraform/scripts) folder.
-
-    ![Delete Azure resource group](./08.png)
-
-* Alternatively, you can use the ```terraform destroy --auto-approve``` command.
-
-    ![terraform destroy](./09.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_lighthouse/_index.md b/docs/azure_arc_jumpstart/azure_arc_lighthouse/_index.md
deleted file mode 100644
index 01014e4fd0..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_lighthouse/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc and Azure Lighthouse"
-linkTitle: "Azure Arc and Azure Lighthouse"
-weight: 9
-description: >-
-  This section describes how to use Azure Arc and Azure Lighthouse for unified operations.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_lighthouse/unified_operations_scale/_index.md b/docs/azure_arc_jumpstart/azure_arc_lighthouse/unified_operations_scale/_index.md
deleted file mode 100644
index 5fed4d7681..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_lighthouse/unified_operations_scale/_index.md
+++ /dev/null
@@ -1,146 +0,0 @@
----
-type: docs
-title: "Unified Operations at Scale with Azure Arc and Azure Lighthouse"
-linkTitle: "Unified Operations at Scale with Azure Arc and Azure Lighthouse"
-weight: 1
-description: >
----
-
-## Unified Operations at Scale with Azure Arc and Azure Lighthouse
-
-## Overview
-
-Modern organizations usually manage diverse and complex IT infrastructures that frequently are distributed across on-premises, edge, and multi-cloud.
-
-In these kinds of environments, it is very important to have a consistent approach to operations and select the proper tools that allow you to have greater visibility and work at scale. Many enterprises have chosen vendor or technology-specific tools which leads to silos, causes a ruptured management experience, and an inconsistent approach to operations. When we add to the mix the speed and the innovation that cloud-native technologies and practices bring to the table, the challenge becomes even greater. The absence of a single view and consistent tooling complicates the management for customers and partners alike.
-
-This guide provides an overview of how managed service providers or any multi-tenant organization can leverage Azure Arc in a scalable way to manage hybrid and multi-cloud environments, with visibility across all managed tenants by using Azure Lighthouse.
-
-### Management across tenants
-
-[Azure Lighthouse](https://docs.microsoft.com/azure/lighthouse/overview) is an Azure service that enables cross and multi-tenant management providing greater visibility and scale into operations. Azure Lighthouse uses an Azure Resource Provider that brings the Azure Delegated Resource Management capability by logically projecting resources from one tenant onto another and unlocking cross-tenant management without the need to do context switching.
-
-This service is very valuable for service providers as they can realize efficiencies in their offerings using Azure’s operations and management tools for multiple customers, however, it is as useful to customers that may have multiple Azure AD tenants (e.g. multiple subsidiaries or geographies in separate tenants).
-
-To get started with Azure Lighthouse you can onboard a managed tenant using the Azure Delegated resource management. The onboarding process can be done in two different ways:
-
-- [Using an ARM template](https://docs.microsoft.com/azure/lighthouse/how-to/onboard-customer#create-an-azure-resource-manager-template)
-- [Publishing a Managed Service offer to the Azure Marketplace](https://docs.microsoft.com/azure/lighthouse/how-to/publish-managed-services-offers)
-
-After you finish the onboarding process you will have a central management tenant, in this scenario Contoso, that will aggregate the information from multiple customers: Microsoft, Fabrikam, and Fourth Coffee.
-
-![Azure Lighthouse Diagram](./01.png)
-
-### Extend Azure management across your environments
-
-Once you have centralized all operations in Azure using Lighthouse and Azure's Operations and Management tools, you can stretch these services to run across on-premises, other clouds, or the edge.
-
-With Azure Arc, your on-premises and other cloud deployments become an Azure Resource Manager entity and as such, servers, Kubernetes clusters, or data services can be treated as first-class citizens of Azure.  As with any other ARM resource, they can be organized into resource groups and subscriptions, use tags, policies, assign Role-based access control (RBAC), and can even leverage Azure Arc to onboard other services such as Azure Monitoring, Azure Security Center, Microsoft Sentinel, or Azure Automation.
-
-![Azure Lighthouse and Azure Arc Diagram](./02.png)
-
-In our scenario, now Arc Contoso can use Azure Arc to not only understand and organize the breadth of operations but also extend and grow services and offerings provided in Azure into every corner of the digital state. Using Azure hybrid management services with Azure Arc allows Contoso to adopt cloud-native practices everywhere and Lighthouse will provide the multitenancy required to have a single view into operations. Now we can explore key cross-tenant management experiences that are enabled by Azure Arc and Azure Lighthouse.
-
-### Governance and Compliance
-
-Azure Policy provides the mechanism to enforce corporate standards and to assess compliance at scale. Through it, you can implement governance for consistency of deployments, compliance, control costs, and improve your security posture; with its compliance dashboard, you will get an aggregated view of the overall state of the Azure environment as well as remediation capabilities. If your resources are distributed across different tenants, Azure Lighthouse will provide the full picture of your compliance status.
-
-![Azure Policy and Azure Lighthouse](./03.png)
-
-With Azure Arc you can even take it a step further as now Azure Policies can be assigned to Azure Arc-enabled servers and Kubernetes, this way you can apply the same set of policies across hybrid and multi-cloud resources to entirely manage governance and guarantee corporate compliance.
-
-![Azure Policy and Azure Arc](./04.png)
-
-Your Azure Arc-enabled resources should be registered on a managed tenant so you can centrally manage compliance from the Azure Lighthouse-powered tenant. To work with Azure Arc and Azure Policies check out these Jumpstart scenarios:
-
-- [Deploy Monitoring Agent Extension to Azure Arc Linux and Windows servers using Azure Policy](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/)
-- [Apply GitOps configurations on AKS as an Azure Arc Connected Cluster using Azure Policy for Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_policy/#apply-gitops-configurations-on-aks-as-an-azure-arc-connected-cluster-using-azure-policy-for-kubernetes)
-- [Apply GitOps configurations on GKE as an Azure Arc Connected Cluster using Azure Policy for Kubernetes](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_policy/#apply-gitops-configurations-on-gke-as-an-azure-arc-connected-cluster-using-azure-policy-for-kubernetes)
-
-### Inventory Management
-
-By using Azure Arc, your on-premises and multi-cloud resources become part of Azure Resource Manager and therefore you can use tools such as Azure Resource Graph as a way to explore your inventory at scale.  Your Azure Resource Graph queries can now include Azure Arc-enabled resources with filtering, using tags, or tracking changes.
-
-For multitenant organizations, this service also supports Azure Lighthouse to allow you to query resources in a managed tenant.
-
-![Azure Resource Graph at scale](./05.png)
-
-To explore this use case, use this Jumpstart scenario to work with tagged Azure Arc-enabled servers in your managed tenants:
-
-- [Azure Arc-enabled servers inventory management using Resource Graph Explorer](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_inventory_management/#apply-resource-tags-to-azure-arc-enabled-servers)
-
-### Monitoring and Alerting
-
-Azure Lighthouse allows Contoso to also get monitoring and security alerts across all of the tenant’s subscriptions, run multitenant queries using Kusto query language (KQL), and set up dashboards that provide valuable insights on the managed environments. There is no need to store logs from different entities into a shared log analytics workspace, Microsoft, Fabrikam and Fourth Coffee can keep their logs on a dedicated workspace in their subscription, while Contoso gets delegated access to them and get insights from all tenants.
-
-![Azure Monitor multitenant](./06.png)
-
-By enabling a resource in Azure Arc it gives you the ability to perform configuration management and monitoring tasks on those services as if they were first-class citizens in Azure. You will be able to monitor your connected machine guest operating system performance or your Kubernetes clusters at the scope of the resource with VM and container Insights.
-
-![Azure Monitor with Azure Arc](./07.png)
-
-Use these Jumpstart scenarios to integrate Azure Monitor and Azure Arc in your managed tenants:
-
-- [Deploy Monitoring Agent Extension on Azure Arc Linux and Windows servers using Extension Management](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_mma_arm/)
-- [Integrate Azure Monitor for Containers with AKS as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks/aks_monitor/)
-- [Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor/)
-- [Integrate Azure Monitor for Containers with MicroK8s as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_monitor/)
-
-### Hybrid Services Onboarding at Scale
-
-In the Contoso scenario, you will centrally manage at scale infrastructure and services that are distributed, for the operations you will usually use services such as Azure Monitoring, Azure Automation, Azure Security Center, or Microsoft Sentinel. To work with these services you will need to deploy an agent on your Arc-enabled resources and there are several ways you can do that:
-
-- Using a configuration management tool of your choice
-- Using Azure Policy and its remediation tasks
-- Azure Arc’s extension management capabilities
-
-The extension management feature for [Azure Arc-enabled servers](https://docs.microsoft.com/azure/azure-arc/servers/manage-vm-extensions) and [Azure Arc-enabled Kubernetes](https://docs.microsoft.com/azure/azure-arc/kubernetes/extensions) provides the same post-deployment configuration and automation tasks that you have for Azure VMs or Azure Kubernetes Service. With this feature, you can deploy small pieces of software to your Arc-enabled resources in an automated fashion, onboarding to Azure Monitor, Azure Defender, DSC, or even deploy a custom script on your VMs.
-
-![Azure Arc extension management](./08.png)
-
-To work with Azure Arc extension management check out these Jumpstart scenarios:
-
-- [Deploy Monitoring Agent Extension on Azure Arc Linux and Windows servers using Extension Management](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_mma_arm/#deploy-monitoring-agent-extension-on-azure-arc-linux-and-windows-servers-using-extension-management)
-- [Deploy Custom Script Extension on Azure Arc Linux and Windows servers using Extension Management](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_customscript_arm/#deploy-custom-script-extension-on-azure-arc-linux-and-windows-servers-using-extension-management)
-- [Deploy Monitoring Agent Extension to Azure Arc Linux and Windows servers using Azure Policy](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/)
-- [Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/)
-
-### Access Management
-
-Another important topic in unified operations is being able to keep track of what the different teams are doing and provide insights into the operations that are performed on resources or subscriptions.
-
-With Azure Lighthouse the managed tenant can view Azure Activity log data to see all of the actions taken, this gives full visibility into operations that are performed through the Azure delegated resource management. Azure Lighthouse also uses supports Azure RBAC so you can give access to your resources following the principle of least privilege so that users only have the permissions needed to complete their job.
-
-![Azure Lighthouse RBAC](./09.png)
-
-If you are centralizing operations in Azure and this includes on-premises and multi-cloud resources with Azure Arc, you will want to also control access to these services. Access to Azure Arc-enabled resources is controlled by standard Azure RBAC, so from Access Control (IAM) in the Azure portal you can verify who has access to your resources and any actions taken from Azure will also be reflected on the Activity log.
-
-![Azure Arc RBAC](./10.png)
-
-The fact that Azure Arc-enabled resources are part of ARM and access is controlled by Azure RBAC means that you can also have delegated management via Lighthouse with full visibility and insights on operations.
-
-### Application and Data Management at Scale
-
-Contoso can use configuration as code and uniformly govern and deploy containerized applications using GitOps-based configurations across on-premises, multi-cloud, and edge. Contoso can link a cluster to a Git repo that becomes the single source of truth for container deployments and applications, Azure Arc-enabled Kubernetes will make sure there is no drift between Git and what is running in the cluster.
-
-![Azure Arc GitOps](./11.png)
-
-Azure Arc-enabled data services to allow Contoso to run Azure data services like Azure SQL Managed Instance and Azure Database for PostgreSQL on any Kubernetes cluster with unified management and familiar tools. With Azure Arc and Azure Lighthouse, Contoso is empowered to create cloud-native management operations with no location boundaries.
-
-All of these data and application deployments can be done across organizations by using Azure Lighthouse delegated management features.
-
-To work with Azure Arc-enabled data services and Azure Arc-enabled Kubernetes check out these Jumpstart scenarios:
-
-- [Deploy GitOps configurations and perform basic GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_basic/)
-- [Deploy GitOps configurations and perform Helm-based GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_helm/)
-- [Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_basic/)
-- [Deploy GitOps configurations and perform Helm-based GitOps flow on GKE as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_helm/)
--[Deploy GitOps configurations and perform Helm-based GitOps flow on kind as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/kind/local_kind_gitops_helm/)
-- [Deploy GitOps configurations and perform Helm-based GitOps flow on MicroK8s as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/microk8s/local_microk8s_gitops_helm/)
-- [Azure Arc-enabled data services](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/)
-
-### Summary
-
-Simplifying your cloud management and operations experience using consistent tools for governance, application deployment, and cloud management at scale is essential when working with distributed, hybrid or multi-cloud assets even more so for multi-tenant organizations.
-
-Using Azure Arc and Azure Lighthouse as central pieces of your operations to extend Azure tooling and services to all your assets, enables organizations to have consistent management and governance to accelerate innovation and agility with cloud-native practices anywhere.
diff --git a/docs/azure_arc_jumpstart/azure_arc_ml/_index.md b/docs/azure_arc_jumpstart/azure_arc_ml/_index.md
deleted file mode 100644
index 186e24998f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_ml/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled machine learning"
-linkTitle: "Azure Arc-enabled machine learning"
-weight: 8
-description: >-
-  The deployment scenarios in this section will guide you through deploying and working with Azure Arc-enabled machine learning on Kubernetes.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_ml/aks/_index.md b/docs/azure_arc_jumpstart/azure_arc_ml/aks/_index.md
deleted file mode 100644
index 6c4ec84aaa..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_ml/aks/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Kubernetes Service"
-linkTitle: "Azure Kubernetes Service"
-weight: 1
-description: >-
-  If you do not yet have a Kubernetes cluster, the scenarios in this section will guide on creating an AKS cluster with Azure Arc-enabled machine learning in an automated fashion using ARM templates. The ML pipeline trains an image classification model on the MNIST dataset from Blob Storage, and deploys the trained model as an inference endpoint on the Kubernetes Cluster. 
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_ml/aks/aks_blob_mnist_arm_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_ml/aks/aks_blob_mnist_arm_template/_index.md
deleted file mode 100644
index eefc3fadaa..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_ml/aks/aks_blob_mnist_arm_template/_index.md
+++ /dev/null
@@ -1,265 +0,0 @@
----
-type: docs
-title: "Image Classification on MNIST dataset from Blob Storage"
-linkTitle: "Image Classification on MNIST dataset from Blob Storage"
-weight: 1
-description: >
----
-
-## Train, Deploy and call inference on an image classification model - MNIST dataset from Azure Blob Storage
-
-The following Jumpstart scenario will guide you on how to deploy an end-to-end Machine Learning pipeline using [Azure Arc-enabled machine learning](https://docs.microsoft.com/azure/machine-learning/how-to-attach-arc-kubernetes) deployed on [Azure Kubernetes Service (AKS)](https://docs.microsoft.com/azure/aks/intro-kubernetes) cluster using [Azure ARM Templates](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview).
-
-By the end of this scenario, you will have:
-
-- An AKS cluster onboarded with Azure Arc
-- A Microsoft Windows Server 2022 (Datacenter) Azure client VM (with optional steps outlined to remote access via [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) for increased Security Posture)
-- Azure Machine Learning with:
-
-  - Attached [Kubernetes (Preview) Compute](https://docs.microsoft.com/azure/machine-learning/how-to-attach-compute-targets#kubernetes) (Azure Arc)
-  - Model Training Run performed on Kubernetes Cluster - using [Azure CLI](https://docs.microsoft.com/cli/azure/ml/job?view=azure-cli-latest#az_ml_job_create)
-  - [Model Registered](https://docs.microsoft.com/azure/machine-learning/concept-model-management-and-deployment#register-and-track-ml-models) on Azure ML Studio (via [`pickle`](https://docs.python.org/3/library/pickle.html) file)
-  - Model Inference endpoint (pod) deployed on Kubernetes Cluster - using [Azure CLI](https://docs.microsoft.com/cli/azure/ml/endpoint?view=azure-cli-latest#az_ml_endpoint_create)
-  - Model Inference endpoint (pod) invoked using:
-
-    1. [Azure CLI](https://docs.microsoft.com/cli/azure/ml/endpoint?view=azure-cli-latest#az_ml_endpoint_invoke) using `az ml endpoint invoke`; and,
-    2. [PowerShell native RESTful methods](https://docs.microsoft.com/powershell/module/microsoft.powershell.utility/invoke-restmethod?view=powershell-7.1).
-
-    The point of the second method is to demonstrate that the inference pod can be called from any downstream business applications against the deployed model's REST API endpoint (i.e. we're simulating this using PowerShell).
-
-![Deployed Architecture](./01.png)
-
-> **NOTE: Currently, Azure Arc-enabled machine learning is in [public preview](https://github.com/Azure/AML-Kubernetes)**.
-
-To demonstrate the various architecture components, the ML pipeline we deploy is an Image Classification model trained using [scikit-learn](https://scikit-learn.org/stable/modules/generated/sklearn.linear_model.LogisticRegression.html) on the common [MNIST database of handwritten digits](https://docs.microsoft.com/azure/open-datasets/dataset-mnist?tabs=azureml-opendatasets) - a Jupyter Notebook representation of the training pipeline can be found [here](https://github.com/Azure/AML-Kubernetes/blob/master/examples/simple-train-sdk/img-classification-training.ipynb), and a visual representation of the model's inference capabilities is summarized as follows:
-
-![MNIST prediction model](./02.png)
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Create Azure service principal (SP)
-
-  To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcML" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcML",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the ARM template parameters file (1-time edit). These parameters values are being used throughout the deployment.
-
-- Main [_azuredeploy_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.json) ARM template will initiate the deployment of the linked ARM templates:
-
-  - [_VNET_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/VNET.json) - Deploys a Virtual Network with a single subnet - used by our clientVM.
-  - [_aks_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/aks.json) - Deploys the AKS cluster where all the Azure Arc ML services will be deployed.
-  - [_clientVm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/clientVm.json) - Deploys the client Windows VM. This is where all user interactions with the environment are made from.
-  - [_logAnalytics_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/logAnalytics.json) - Deploys Azure Log Analytics workspace to support various logs uploads.
-
-User remotes into client Windows VM (using Public IP, or optionally using Bastion), which automatically kicks off the [_AzureMLLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/artifacts/AzureMLLogonScript.ps1) PowerShell script that deploys and configure Azure Arc-enabled machine learning services on the AKS cluster, including the various Azure ML [operators](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/), training pod and the inference pod.
-
-## Deployment
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template that will initiate the entire automation for this scenario.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/artifacts/azuredeploy.parameters.example.json).
-
-  - `sshRSAPublicKey` - Your SSH public key
-  - `spnClientId` - Your Azure service principal id
-  - `spnClientSecret` - Your Azure service principal secret
-  - `spnTenantId` - Your Azure tenant id
-  - `windowsAdminUsername` - Client Windows VM Administrator name
-  - `windowsAdminPassword` - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - `myIpAddress` - Your local public IP address. This is used to allow remote RDP and SSH connections to the client Windows VM and AKS cluster.
-  - `logAnalyticsWorkspaceName` - Unique name for the deployment log analytics workspace.
-  - `kubernetesVersion` - AKS version
-  - `dnsPrefix` - AKS unique DNS prefix
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --name <The name of this deployment> \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.json \
-  --parameters <The *azuredeploy.parameters.json* parameters file location>
-  ```
-
-  > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the _azuredeploy.parameters.json_ file**
-
-  For example:
-
-  ```shell
-  az group create --name Arc-ML-Demo --location "East US"
-  az deployment group create \
-  --resource-group Arc-ML-Demo \
-  --name arcml \
-  --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_ml_jumpstart/aks/arm_template/azuredeploy.json \
-  --parameters azuredeploy.parameters.json
-  --parameters templateBaseUrl="https://raw.githubusercontent.com/your--github--handle/azure_arc/main/azure_arc_ml_jumpstart/aks/arm_template/"
-  ```
-
-  > **NOTE: The deployment time for this scenario can take ~10-15min**
-
-  > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once the above deployment is kicked off - you also have the option to deploy an Azure Bastion to access the Client VM. This is specially useful for enterprise environments where access to Port 3389 is restricted from Public IP's (e.g. using preventative [Azure Policies](https://docs.microsoft.com/azure/virtual-network/policy-reference#azure-virtual-network)).
-
-  > **NOTE: Using Azure Bastion is completely optional for this scenario - if your environment allows RDP from your Public IP, feel free to skip this step**
-
-  To deploy Azure Bastion on the VNET (which should already be deployed via the ARM template above) - run the below commands:
-
-  ```shell
-    az network vnet subnet create -g Arc-ML-Demo --vnet-name "Arc-ML-VNet" -n "AzureBastionSubnet" --address-prefixes 172.16.2.0/27
-    az network public-ip create -g Arc-ML-Demo --name "Bastion-PIP" --sku Standard --location eastus
-    az network bastion create --name "Arc-Client-Bastion" --public-ip-address "Bastion-PIP" -g Arc-ML-Demo --vnet-name "Arc-ML-VNet" --location eastus
-  ```
-
-- Once Azure resources have been provisioned, you will be able to see it in Azure portal. At this point, the resource group should have **8 various Azure resources (+2 with Bastion)** deployed.
-
-  ![ARM template deployment completed](./03.png)
-
-  ![New Azure resource group with all resources](./04.png)
-
-## Windows Login & Post Deployment
-
-- Now that first phase of the automation is completed, it is time to RDP to the client VM - either using it's public IP:
-
-  ![Client VM public IP](./05.png)
-
-  Or by using Bastion:
-  ![Client VM via Bastion](./06.png)
-
-- At first login, as mentioned in the "Automation Flow" section above, the [_AzureMLLogonScript_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_ml_jumpstart/aks/arm_template/artifacts/AzureMLLogonScript.ps1) PowerShell logon script will start it's run.
-
-- Let the script run its course and **do not close** the PowerShell session, this will be done for you once completed. Once the script finishes it's run, the logon script PowerShell session will be closed, the Windows wallpaper will change, the Model Training will be completed, the Inference Pod will be deployed, and ready to call for Model inference.
-
-  The `AzureMLLogonScript.ps1` automation script run is visually annotated (where applicable) to showcase each logical step of the deployment process, depicted as follows:
-
-  ![Automation flow](./07.png)
-
-  > **NOTE: For visualizing the deployment flow, the automation script deploys [Weave Scope](https://www.weave.works/oss/scope/) pods in the K8s cluster and launches edge against the Load Balancer IP. Note that this is not core to the Azure ML or Azure Arc flow - but is included for visualization purposes.**
-
-  **1. Onboard AKS Cluster to Azure Arc**
-
-  ![PowerShell logon script run](./08.png)
-
-  ![PowerShell logon script run](./09.png)
-
-  **2. Enabling Azure Arc-enabled Machine Learning components (k8s-extension with Training, Inference)**
-
-  ![PowerShell logon script run](./10.png)
-
-  ![PowerShell logon script run](./11.png)
-
-  ![PowerShell logon script run](./12.png)
-
-  ![PowerShell logon script run](./13.png)
-
-  **3. Train model using Azure Machine Learning CLI**
-
-  ![PowerShell logon script run](./14.png)
-
-  ![PowerShell logon script run](./15.png)
-
-  ![PowerShell logon script run](./16.png)
-
-  **4. Deploy inference endpoint on Kubernetes Cluster**
-
-  ![PowerShell logon script run](./17.png)
-
-  ![PowerShell logon script run](./18.png)
-
-  ![PowerShell logon script run](./19.png)
-
-  **5. Invoke Inference with sample JSON payload**
-
-  ![PowerShell logon script run](./20.png)
-
-- Since this scenario is deploying the Azure Machine Learning components, you will also notice additional newly deployed Azure resources in the resources group:
-
-![additional Azure resources in the resource group](./21.png)
-
-## Cluster extensions
-
-In this scenario, the Azure Arc-enabled machine learning services cluster extension was deployed and used throughout this scenario in order to deploy the machine learning components.
-
-- In order to view cluster extensions, click on the Azure Arc-enabled Kubernetes resource Extensions settings.
-
-  ![Azure Arc-enabled Kubernetes cluster extensions settings](./22.png)
-
-## Cleanup
-
-- If you want to delete the entire environment, first, go into Azure Machine Learning Studio, and delete the inference endpoint from _within_ the Studio (and **not** from the Resource Group):
-
-  ![Delete Azure ML endpoints](./23.png)
-
-  ![Delete Azure ML endpoints](./24.png)
-
-- Then, delete the remaining resources from the resource group - in the Azure portal:
-
-  ![Delete Azure resource group](./25.png)
-
-## Known Issues
-
-- Deleting the **2** Inference Endpoint resources are not supported from Azure Portal at this time - doing so may return the following error:
-
-  ![Deleting Azure ML inference from resource group](./26.jpg)
-
-  Please follow the steps outlined earlier from within the Azure ML studio to delete the 2 resources.
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/_index.md
deleted file mode 100644
index 309e3568f5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled servers"
-linkTitle: "Azure Arc-enabled servers"
-weight: 1
-description: >-
-  The deployment scenarios in this section will guide you through onboarding various Windows and Linux server distributions as Azure Arc-enabled servers.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/aws/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/aws/_index.md
deleted file mode 100644
index de53796d82..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/aws/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Amazon Web Services"
-linkTitle: "Amazon Web Services"
-weight: 5
-description: >-
-  If you are working in a multi-cloud environment, you can deploy new AWS EC2 instances in an automated fashion using Terraform and onboard it as Azure Arc-enabled servers.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/_index.md
deleted file mode 100644
index f86e8c6be4..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/_index.md
+++ /dev/null
@@ -1,212 +0,0 @@
----
-type: docs
-title: "Amazon Linux 2 EC2 instance"
-linkTitle: "Amazon Linux 2 EC2 instance"
-weight: 2
-description: >
----
-
-## Deploy an AWS Amazon Linux 2 EC2 instance and connect it to Azure Arc using a Terraform plan
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an AWS Amazon Linux 2 EC2 instance and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- [Create free AWS account](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/)
-
-- [Install Terraform >=1.3.5](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP)
-
-    To connect the AWS virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the following commands:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Create an AWS identity
-
-In order for Terraform to create resources in AWS, we will need to create a new AWS IAM role with appropriate permissions and configure Terraform to use it.
-
-- Login to the [AWS management console](https://console.aws.amazon.com)
-
-- After logging in, click the "Services" dropdown in the top left. Under "Security, Identity, and Compliance" select "IAM" to access the [Identity and Access Management page](https://console.aws.amazon.com/iam/home)
-
-    ![Screenshot of AWS cloud console](./01.png)
-
-    ![Screenshot of IAM AWS cloud console](./02.png)
-
-- Click on "Users" from the left menu and then click on "Add user" to create a new IAM user.
-
-    ![Screenshot of new user creation in AWS cloud console](./03.png)
-
-- On the "Add User" screen, name the user "terraform" and select the "Programmatic Access" checkbox then click "Next"
-
-    ![Screenshot of new user creation in AWS cloud console](./04.png)
-
-- On the next "Set Permissions" screen, select "Attach existing policies directly" and then check the box next to AmazonEC2FullAccess as seen in the screenshot then click "Next"
-
-    ![Screenshot showing new user in AWS cloud console](./05.png)
-
-- On the tags screen, assign a tag with a key of "azure-arc-demo" and click "Next" to proceed to the Review screen.
-
-    ![Screenshot showing tags in AWS cloud console](./06.png)
-
-- Double check that everything looks correct and click "Create user" when ready.
-
-    ![Screenshot showing creating a user in AWS cloud console](./07.png)
-
-- After the user is created, you will see the user's Access key ID and Secret access key. Copy these values down before clicking the Close button. In the screen below, you can see an example of what this should look like. Once you have these keys, you will be able to use them with Terraform to create AWS resources.
-
-    ![Screenshot showing created user in AWS cloud console](./08.png)
-
-## Configure Terraform
-
-Before executing the Terraform plan, you must export the environment variables which will be used by the plan. These variables are based on your Azure subscription and tenant, the Azure service principal, and the AWS IAM user and keys you just created.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command.
-
-- The Terraform plan creates resources in both Microsoft Azure and AWS. It then executes a script on an AWS EC2 virtual machine to install the Azure Arc agent and all necessary artifacts. This script requires certain information about your AWS and Azure environments. Edit [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/AL2/terraform/scripts/vars.sh) and update each of the variables with the appropriate values.
-
-  - TF_VAR_subscription_id=Your Azure subscription ID
-  - TF_VAR_client_id=Your Azure service principal app id
-  - TF_VAR_client_secret=Your Azure service principal password
-  - TF_VAR_tenant_id=Your Azure tenant ID
-  - AWS_ACCESS_KEY_ID=AWS access key
-  - AWS_SECRET_ACCESS_KEY=AWS secret key
-
-- From CLI, navigate to the *azure_arc_servers_jumpstart/aws/al2/terraform* directory of the cloned repo.
-
-- Export the environment variables you edited by running [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/AL2/terraform/scripts/vars.sh) with the source command as shown below. Terraform requires these to be set for the plan to execute properly. Note that this script will also be automatically executed remotely on the AWS virtual machine as part of the Terraform deployment.
-
-    ```shell
-    source ./scripts/vars.sh
-    ```
-
-- Make sure your SSH keys are available in *~/.ssh* and named *id_rsa.pub* and *id_rsa*. If you followed the ssh-keygen guide above to create your key then this should already be setup correctly. If not, you may need to modify [*main.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/AL2/terraform/main.tf) to use a key with a different path.
-
-- Run the ```terraform init``` command which will download the Terraform AzureRM provider.
-
-    ![Screenshot showing terraform init being run](./09.png)
-
-## Deployment
-
-- Run the ```terraform apply --auto-approve``` command and wait for the plan to finish. Upon completion, you will have an AWS Amazon Linux 2 EC2 instance deployed and connected as a new Azure Arc-enabled server inside a new resource group.
-
-- Open the Azure portal and navigate to the resource group "Arc-Servers-Demo". The virtual machine created in AWS will be visible as a resource.
-
-    ![Screenshot showing Azure Portal and Azure Arc-enabled server](./10.png)
-
-## Semi-Automated Deployment (Optional)
-
-As you may have noticed, the last step of the run is to register the VM as a new Azure Arc-enabled server resource.
-    ![Screenshot showing azcmagent connect script](./11.png)
-
-If you want to demo/control the actual registration process, do the following:
-
-- In the [*install_arc_agent.sh.tmpl*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/AL2/terraform/scripts/install_arc_agent.sh.tmpl) script template, comment out the "Run connect command" section and save the file.
-
-    ![Screenshot showing azcmagent connect script commented out](./12.png)
-
-- Get the public IP of the AWS VM by running ```terraform output```
-
-    ![Screenshot showing terraform output](./13.png)
-
-- SSH the VM using the ```ssh ec2-user@x.x.x.x``` where x.x.x.x is the host ip.
-
-    ![Screenshot showing SSH into EC2 server](./14.png)
-
-- Export all the environment variables in [*vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/AL2/terraform/scripts/vars.sh)
-
-    ![Screenshot showing export of environment variables in vars.sh](./15.png)
-
-- Run the following command
-
-    ```shell
-    azcmagent connect --service-principal-id $TF_VAR_client_id --service-principal-secret $TF_VAR_client_secret --resource-group "Arc-Servers-Demo" --tenant-id $TF_VAR_tenant_id --location "westus2" --subscription-id $TF_VAR_subscription_id --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-    ```
-
-    ![Screenshot showing azcmagent connect being run](./16.png)
-
-- When complete, your VM will be registered with Azure Arc and visible in the resource group inside Azure Portal.
-
-## Delete the deployment
-
-To delete all the resources you created as part of this demo use the ```terraform destroy --auto-approve``` command as shown below.
-    ![Screenshot showing terraform destroy being run](./17.png)
-
-Alternatively, you can delete the AWS EC2 instance directly by terminating it from the [AWS Console](https://console.aws.amazon.com/ec2/v2/home).
-    ![Screenshot showing AWS Console with terminating instance](./18.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/_index.md
deleted file mode 100644
index d8abf9e967..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/_index.md
+++ /dev/null
@@ -1,216 +0,0 @@
----
-type: docs
-title: "Ubuntu EC2 instance"
-linkTitle: "Ubuntu EC2 instance"
-weight: 1
-description: >
----
-
-## Deploy an AWS Ubuntu EC2 instance and connect it to Azure Arc using a Terraform plan
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an AWS EC2 virtual machine and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- [Create free AWS account](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/)
-
-- [Install Terraform >=1.3.5](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP)
-
-    To connect the AWS virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Create an AWS identity
-
-In order for Terraform to create resources in AWS, we will need to create a new AWS IAM role with appropriate permissions and configure Terraform to use it.
-
-- Login to the [AWS management console](https://console.aws.amazon.com)
-
-- After logging in, click the "Services" dropdown in the top left. Under "Security, Identity, and Compliance" select "IAM" to access the [Identity and Access Management page](https://console.aws.amazon.com/iam/home)
-
-    ![Screenshot of AWS cloud console](./01.png)
-
-    ![Screenshot of IAM AWS cloud console](./02.png)
-
-- Click on "Users" from the left menu and then click on "Add user" to create a new IAM user.
-
-    ![Screenshot of new user creation in AWS cloud console](./03.png)
-
-- On the "Add User" screen, name the user "terraform" and select the "Programmatic Access" checkbox then click "Next"
-
-    ![Screenshot of new user creation in AWS cloud console](./04.png)
-
-- On the next "Set Permissions" screen, select "Attach existing policies directly" and then check the box next to AmazonEC2FullAccess as seen in the screenshot then click "Next"
-
-    ![Screenshot showing new user in AWS cloud console](./05.png)
-
-- On the tags screen, assign a tag with a key of "azure-arc-demo" and click "Next" to proceed to the Review screen.
-
-    ![Screenshot showing tags in AWS cloud console](./06.png)
-
-- Double check that everything looks correct and click "Create user" when ready.
-
-    ![Screenshot showing creating a user in AWS cloud console](./07.png)
-
-- After the user is created, you will see the user's Access key ID and Secret access key. Copy these values down before clicking the Close button. In the screen below, you can see an example of what this should look like. Once you have these keys, you will be able to use them with Terraform to create AWS resources.
-
-    ![Screenshot showing created user in AWS cloud console](./08.png)
-
-## Configure Terraform
-
-Before executing the Terraform plan, you must export the environment variables which will be used by the plan. These variables are based on your Azure subscription and tenant, the Azure service principal, and the AWS IAM user and keys you just created.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command.
-
-- The Terraform plan creates resources in both Microsoft Azure and AWS. It then executes a script on an AWS EC2 virtual machine to install the Azure Arc agent and all necessary artifacts. This script requires certain information about your AWS and Azure environments. Edit [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/ubuntu/terraform/scripts/vars.sh) and update each of the variables with the appropriate values.
-
-  - TF_VAR_subscription_id=Your Azure subscription ID
-  - TF_VAR_client_id=Your Azure service principal app id
-  - TF_VAR_client_secret=Your Azure service principal password
-  - TF_VAR_tenant_id=Your Azure tenant ID
-  - AWS_ACCESS_KEY_ID=AWS access key
-  - AWS_SECRET_ACCESS_KEY=AWS secret key
-
-- From CLI, navigate to the "azure_arc_servers_jumpstart/aws/ubuntu/terraform" directory of the cloned repo.
-
-- Export the environment variables you edited by running [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/ubuntu/terraform/scripts/vars.sh) with the source command as shown below. Terraform requires these to be set for the plan to execute properly. Note that this script will also be automatically executed remotely on the AWS virtual machine as part of the Terraform deployment.
-
-    ```shell
-    source ./scripts/vars.sh
-    ```
-
-- Make sure your SSH keys are available in *~/.ssh* and named *id_rsa.pub* and *id_rsa*. If you followed the ssh-keygen guide above to create your key then this should already be setup correctly. If not, you may need to modify [*main.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/ubuntu/terraform/main.tf) to use a key with a different path.
-
-- Run the ```terraform init``` command which will download the Terraform AzureRM provider.
-
-    ![Screenshot of terraform init being run](./09.png)
-
-## Deployment
-
-- Run the ```terraform apply --auto-approve``` command and wait for the plan to finish. Upon completion, you will have an AWS Amazon Linux 2 EC2 instance deployed and connected as a new Azure Arc-enabled server inside a new resource group.
-
-- Open the Azure portal and navigate to the resource group "Arc-AWS-Demo". The virtual machine created in AWS will be visible as a resource.
-
-    ![Screenshot of Azure portal showing Azure Arc-enabled server](./10.png)
-
-    ![Screenshot of AWS cloud console showing EC2 instance](./19.png)
-
-## Semi-Automated Deployment (Optional)
-
-As you may have noticed, the last step of the run is to register the VM as a new Azure Arc-enabled server resource.
-    ![Screenshot showing azcmagent connect script](./11.png)
-
-If you want to demo/control the actual registration process, do the following:
-
-- In the [*install_arc_agent.sh.tmpl*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/ubuntu/terraform/scripts/install_arc_agent.sh.tmpl) script template, comment out the "Run connect command" section and save the file.
-
-    ![Screenshot showing azcmagent connect script commented out](./12.png)
-
-- Get the public IP of the AWS VM by running ```terraform output```
-
-    ![Screenshot of terraform output being run](./13.png)
-
-- SSH the VM using the ```ssh ubuntu@x.x.x.x``` where x.x.x.x is the host ip.
-
-    ![Screenshot of SSH into EC2 server](./14.png)
-
-- Export all the environment variables in [*vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/ubuntu/terraform/scripts/vars.sh)
-
-    ![Screenshot showing export of environment variables in var.sh](./15.png)
-
-- Run the following command
-
-    ```shell
-    azcmagent connect --service-principal-id $TF_VAR_client_id --service-principal-secret $TF_VAR_client_secret --resource-group "Arc-AWS-Demo" --tenant-id $TF_VAR_tenant_id --location "westus2" --subscription-id $TF_VAR_subscription_id --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-    ```
-
-    ![Screenshot of azcmagent connect being run](./16.png)
-
-- When complete, your VM will be registered with Azure Arc and visible in the resource group inside Azure Portal.
-
-## Delete the deployment
-
-To delete all the resources you created as part of this demo use the ```terraform destroy --auto-approve``` command as shown below.
-    ![Screenshot showing terraform destroy being run](./17.png)
-
-Alternatively, you can delete the AWS EC2 instance directly by terminating it from the [AWS Console](https://console.aws.amazon.com/ec2/v2/home). Note that it will take a few minutes for the instance to actually be removed.
-    ![Screenshot of AWS cloud console showing terminating instance](./18.png)
-
-If you delete the instance manually, then you should also delete *./scripts/install_arc_agent.sh* which is created by the Terraform plan.
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/azure/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/azure/_index.md
deleted file mode 100644
index f5ea22489c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/azure/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-type: docs
-title: "Microsoft Azure"
-linkTitle: "Microsoft Azure"
-weight: 2
-description: >-
-  The scenarios in this section will walk you through how to project an Azure VM as an Azure Arc-enabled server in an automated fashion using either ARM templates or Terraform. These scenarios, using Azure VM as the targeted Azure Arc server are designed **for demo and testing purposes ONLY and are not supported.**
-
-  In each scenario, you will find a detailed, technical explanation of the mechanism and why **it is not expected to project an Azure VM as an Azure Arc-enabled server.**
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/_index.md
deleted file mode 100644
index cf87eb701d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/_index.md
+++ /dev/null
@@ -1,232 +0,0 @@
----
-type: docs
-title: "Linux Virtual Machine"
-linkTitle: "Linux Virtual Machine"
-weight: 1
-description: >
----
-
-## Deploy an Ubuntu Azure Virtual Machine and connect it to Azure Arc using ARM Template
-
-The following Jumpstart scenario will guide you on how to automatically onboard a Azure Ubuntu VM on to Azure Arc using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview). The provided ARM template is responsible of creating the Azure resources as well as executing the Azure Arc onboard script on the VM.
-
-Azure VMs are leveraging the [Azure Instance Metadata Service (IMDS)](https://docs.microsoft.com/azure/virtual-machines/windows/instance-metadata-service) by default. By projecting an Azure VM as an Azure Arc-enabled server, a "conflict" is created which will not allow for the Azure Arc server resources to be represented as one when the IMDS is being used and instead, the Azure Arc server will still "act" as a native Azure VM.
-
-However, **for demo purposes only**, the below guide will allow you to use and onboard Azure VMs to Azure Arc and by doing so, you will be able to simulate a server which is deployed outside of Azure (i.e "on-premises" or in other cloud platforms)
-
-> **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Create Azure service principal (SP).
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are used throughout the deployment.
-
-2. The ARM template includes an Azure VM custom script extension which will deploy the the [*install_arc_agent.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/linux/arm_template/scripts/install_arc_agent.sh) Shell script.
-
-3. In order to allow the Azure VM to successfully be projected as an Azure Arc-enabled server, the script will:
-
-    1. Set local OS environment variables.
-
-    2. Generate a ~/.bash_profile file that will be initialized at user's first login to configure the environment. This script will:
-
-        - Stop and disable the "Linux Azure Guest Agent" service.
-
-        - Create a new OS Firewall rule to block Azure IMDS outbound traffic to the *169.254.169.254- remote address.
-
-        - Install the Azure Arc connected machine agent.
-
-        - Remove the ~/.bash_profile file so it will not run after first login.
-
-4. User SSH to Linux VM which will start the *~/.bash_profile* script execution and will onboard the VM to Azure Arc
-
-    > **NOTE: The [*install_arc_agent.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/linux/arm_template/scripts/install_arc_agent.sh) shell script will enable the OS firewall and set up new rules for incoming and outgoing connections. By default all incoming and outgoing traffic will be allowed, except blocking Azure IMDS outbound traffic to the *169.254.169.254- remote address.**
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fazure%2Flinux%2Farm_template%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./01.png)
-
-  ![Screenshot showing Azure portal deployment](./02.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template, responsible for creating all the Azure resources in a single resource group as well onboarding the created VM to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the ARM template, login to Azure using AZ CLI with the ```az login``` command.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [*azuredeploy.parameters.json*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/linux/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/linux/arm_template/azuredeploy.parameters.example.json).
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/azure/linux/arm_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure region> --tags "Project=jumpstart_azure_arc_servers"
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/azure/linux/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: make sure that you are using the same Azure resource group name as the one you've just used in the *azuredeploy.parameters.json* file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Servers-Linux-Demo --location "westeurope" --tags "Project=jumpstart_azure_arc_servers"
-    az deployment group create \
-    --resource-group Arc-Servers-Linux-Demo \
-    --name arclinuxdemo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/azure/linux/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot output of ARM template](./03.png)
-
-    ![Screenshot resources in resource group](./04.png)
-
-## Linux Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [SSH](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/#connecting-directly-with-ssh) - available after configuring access to port 22 on the _Arc-Linux-Demo-NSG_, or by enabling [Just-in-Time access (JIT)](ttps://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/#connecting-directly-with-ssh#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with SSH
-
-By design, port ssh is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound ssh.
-
-- Open the _Arc-Linux-Demo-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-Linux-Demo-NSG with blocked ssh](./05.png)
-
-  ![Screenshot showing adding a new inbound security rule](./06.png)
-
-- Specify the IP address that you will be connecting from and select SSH as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./07.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./08.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./09.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./10.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing SSH on the client VM](./11.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./12.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the SSH session, this will be done for you once completed.
-
-    ![Screenshot script output](./13.png)
-
-    ![Screenshot script output](./14.png)
-
-    ![Screenshot script output](./15.png)
-
-- Upon successful run, a new Azure Arc-enabled server will be added to the resource group.
-
-    ![Screenshot Azure Arc resource on the Azure portal](./16.png)
-
-    ![Screenshot details of Azure Arc-enabled server on Azure portal](./17.png)
-
-## Cleanup
-
-To delete the entire deployment, simply delete the resource group from the Azure portal.
-
-![Screenshot how to delete resource group](./18.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/_index.md
deleted file mode 100644
index e12539bd10..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/_index.md
+++ /dev/null
@@ -1,236 +0,0 @@
----
-type: docs
-title: "Windows Server Virtual Machine"
-linkTitle: "Windows Server Virtual Machine"
-weight: 2
-description: >
----
-
-## Deploy a Windows Azure Virtual Machine and connect it to Azure Arc using an ARM Template
-
-The following Jumpstart scenario will guide you on how to automatically onboard a Azure Windows VM on to Azure Arc using [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview). The provided ARM template is responsible of creating the Azure resources as well as executing the Azure Arc onboard script on the VM.
-
-Azure VMs are leveraging the [Azure Instance Metadata Service (IMDS)](https://docs.microsoft.com/azure/virtual-machines/windows/instance-metadata-service) by default. By projecting an Azure VM as an Azure Arc-enabled server, a "conflict" is created which will not allow for the Azure Arc server resources to be represented as one when the IMDS is being used and instead, the Azure Arc server will still "act" as a native Azure VM.
-
-However, **for demo purposes only**, the below guide will allow you to use and onboard Azure VMs to Azure Arc and by doing so, you will be able to simulate a server which is deployed outside of Azure (i.e "on-premises" or in other cloud platforms)
-
-> **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are used throughout the deployment.
-
-2. The ARM template incl. an Azure VM custom script extension which will deploy the the [*install_arc_agent.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/windows/arm_template/scripts/install_arc_agent.ps1) PowerShell script.
-
-3. In order to allow the Azure VM to successfully be projected as an Azure Arc-enabled server, the script will:
-
-    1. Set local OS environment variables.
-
-    2. Generate a local OS logon script named *LogonScript.ps1*. This script will:
-
-        - Create the *LogonScript.log* file.
-
-        - Stop and disable the "Windows Azure Guest Agent" service.
-
-        - Create a new Windows Firewall rule to block Azure IMDS outbound traffic to the *169.254.169.254- remote address.
-
-        - Unregister the logon script Windows schedule task so it will not run after first login.
-
-    3. Disable and prevent Windows Server Manager from running on startup.
-
-4. User RDP or connect using Azure Bastion to Windows VM which will start the *LogonScript* script execution and will onboard the VM to Azure Arc.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fazure%2Fwindows%2Farm_template%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./01.png)
-
-  ![Screenshot showing Azure portal deployment](./02.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single template, responsible for creating all the Azure resources in a single resource group as well onboarding the created VM to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the ARM template, login to Azure using Azure CLI with the ```az login``` command.
-
-- The deployment is using the ARM template parameters file. Before initiating the deployment, edit the [*azuredeploy.parameters.json*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/windows/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure/windows/arm_template/azuredeploy.parameters.example.json).
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/azure/windows/arm_template) and run the below command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region> --tags "Project=jumpstart_azure_arc_servers"
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/azure/windows/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you've just used in the *azuredeploy.parameters.json* file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Servers-Win-Demo --location "East US" --tags "Project=jumpstart_azure_arc_servers"
-    az deployment group create \
-    --resource-group Arc-Servers-Win-Demo \
-    --name arcwinsrvdemo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/azure/windows/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal.
-
-    ![Screenshot ARM template output](./03.png)
-
-    ![Screenshot resources in resource group](./04.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-Data-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-Win-Demo-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-Win-Demo-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./05.png)
-
-  ![Screenshot showing adding a new inbound security rule](./06.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./07.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./08.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./09.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./10.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./11.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./12.png)
-
-### Post Deployment
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~1-2min long.**
-
-    ![Screenshot script output](./13.png)
-
-    ![Screenshot script output](./14.png)
-
-    ![Screenshot script output](./15.png)
-
-    ![Screenshot script output](./16.png)
-
-- Upon successful run, a new Azure Arc-enabled server will be added to the resource group.
-
-![Screenshot Azure Arc-enabled server on resource group](./17.png)
-
-![Screenshot Azure Arc-enabled server details](./18.png)
-
-## Cleanup
-
-To delete the entire deployment, simply delete the resource group from the Azure portal.
-
-![Screenshot delete resource group](./19.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/_index.md
deleted file mode 100644
index eb8bfb3995..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-type: docs
-title: "Microsoft Azure Stack HCI"
-linkTitle: "Microsoft Azure Stack HCI"
-weight: 3
-description: >-
-  The scenarios in this section will walk you through how to project an **Azure Stack HCI Virtual Machine** as an Azure Arc-enabled server in an automated fashion. 
-
-  In each scenario, you will find a detailed, technical explanation of the mechanism.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/_index.md
deleted file mode 100644
index fddbf831ca..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/_index.md
+++ /dev/null
@@ -1,225 +0,0 @@
----
-type: docs
-title: "Windows Server Virtual Machine"
-linkTitle: "Windows Server Virtual Machine"
-weight: 1
-description: >
----
-
-## Deploy a Windows Server virtual machine in Azure Stack HCI and connect it to Azure Arc using PowerShell
-
-The following Jumpstart scenario will guide you on how to use the provided PowerShell script to deploy a Windows Server Virtual Machine on an [Azure Stack HCI](https://docs.microsoft.com/azure-stack/hci/overview) cluster and connect it as an Azure Arc-enabled server.
-
-This guide will **not** provide instructions on how to deploy and set up Azure Stack HCI and it assumes you already have it provisioned. If you don't have any Azure Stack HCI cluster created, please have a look at the following [Azure Stack HCI 20H2 Evaluation Guide](https://github.com/Azure/AzureStackHCI-EvalGuide).
-
-The commands below and the Powershell script described in this scenario should be run on the **management computer**.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Enable subscription with the resource provider for Azure Arc-enabled Servers. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```powershell
-  Register-AzResourceProvider -ProviderNamespace Microsoft.HybridCompute
-  Get-AzResourceProvider -ListAvailable | Select-Object ProviderNamespace, RegistrationState | Select-String  -Pattern "Microsoft.HybridCompute"
-
-  Register-AzResourceProvider -ProviderNamespace Microsoft.GuestConfiguration
-  Get-AzResourceProvider -ListAvailable | Select-Object ProviderNamespace, RegistrationState | Select-String  -Pattern "Microsoft.GuestConfiguration"
-
-  Register-AzResourceProvider -ProviderNamespace Microsoft.HybridConnectivity
-  Get-AzResourceProvider -ListAvailable | Select-Object ProviderNamespace, RegistrationState | Select-String  -Pattern "Microsoft.HybridConnectivity"
-  ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, an Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account using PowerShell and run the below command.
-
-    ```powershell
-    Connect-AzAccount
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    For example:
-
-    ```powershell
-    $sp = New-AzADServicePrincipal -DisplayName "AzureStackHCI-VM-Jumpstart" -Role 'Contributor'
-    ```
-
-    This command will create a variable with a secure string as shown below:
-
-    ```shell
-    Secret                : System.Security.SecureString
-    ServicePrincipalNames : {XXXXXXXXXXXXXXXXXXXXXXXXXXXX, http://AzureStackHCI-VM-Jumpstart}
-    ApplicationId         : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    ObjectType            : ServicePrincipal
-    DisplayName           : AzureStackHCI-VM-Jumpstart
-    Id                    : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Type                  :
-    ```
-
-    To expose the generated password use the below code to export the secret:
-
-    ```powershell
-    $BSTR = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($sp.Secret)
-    $UnsecureSecret = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR)
-    ```
-
-    Copy and save the Service Principal ApplicationId and Secret as you will need it for later in the automation.
-
-    > **NOTE: It is optional but highly recommended to scope the SP to a specific [Azure subscription and resource group](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal?view=azps-5.4.0)**
-
-- Enable CredSSP in the Host Server
-
-    The PowerShell script leverages [CredSSP](https://docs.microsoft.com/windows/win32/secauthn/credential-security-support-provider) to delegate credentials from the management server to the target server for remote authentication. It's required to allow the host server to receive credentials from a remote computer.
-
-    ```powershell
-    Enable-WSManCredSSP -Role Server
-    ```
-
-    ![Screenshot Enable-WSManCredSSP Output](./01.png)
-
-    Confirm if CredSSP enabled the host server to receive credentials:
-
-    ```powershell
-    Get-WSManCredSSP
-    ```
-
-    ![Screenshot Enable-WSManCredSSP Output](./02.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User is editing the PowerShell script environment variables (1-time edit). These variables values are being used throughout the deployment and Azure Arc onboarding.
-
-2. User is running the PowerShell script to deploy a basic Windows Server Virtual Machine on Azure Stack HCI and onboard onto Azure Arc. Runtime script will:
-    - Set local OS variables
-    - Download VHDX file with Windows Server 2019 Datacenter installed
-    - Enable CredSSP on the management VM, for allowing the credential delegation to the host server
-    - Create a new Virtual Machine based on the VHDX file
-    - Add Virtual Machine to Server Cluster (optional)
-    - Assign Static IP address to Virtual Machine (optional)
-    - Install Azure Arc agent and onboarding
-
-## Deployment
-
- > **NOTE: Once more, please make sure all the steps mentioned below are done in your management server.**
-
-As mentioned, this deployment will leverage this [PowerShell script](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azure_stack_hci/powershell/azstack_hci_vm_deploy.ps1) to deploy all the needed componenets. Before running the script, it's important to edit the script variables for matching the parameters of your environment. We can split it in three sets of variables:
-
-1. Environment variables for optional configurations
-
-    - **DHCPEnabled:** Select _$true_ if DHCP is enabled on your environment, or _$false_ if a static IP assignment is needed.
-        - If **DHCPEnabled** = _$false_, please provide the networking parameters described below to assign to the VM. If **DHCPEnabled** = _$true_, please attribute _$null_ to all the paramenters below:
-            - **IPAddress:**  Provide the static IP address to assign to the VM.
-            - **Prefix Lenght:** Provide the subnet length to assign to the VM.
-            - **DefaultGateway:** Provide the default gateway to assign to the VM.
-            - **DNSServer:** Provide the DNS Server to assign to the VM.
-    - **ServerClusterEnabled:** Select _$true_ if you have a server cluster created, _$false_ if not.
-        - If **ServerClusterEnabled** = _$true_, please provide the path to the cluster storage in the following format:
-            - **vmdir:** Disk Letter:\ClusterStorage
-        - If **ServerClusterEnabled** = _$false_, please provide the path to the folder where the VM will be created in the following format:
-            - **vmdir:** Disk Letter:\Folder
-
-    ![Screenshot showing first set of variables in the PowerShell script](./03.png)
-
-    As an example:
-    - **DHCPEnabled:** _$false_
-    - **IPAddress:** '192.168.0.11'
-    - **PrefixLenght:** '24'
-    - **DefaultGateway:** '192.168.0.1'
-    - **DNSServer:** '192.168.0.2'
-    - **ServerClusterEnabled:** _$true_
-    - **vmdir:** "C:\ClusterStorage\VMSTORAGE"
-
-2. Environment variables for the VM creation
-
-    - **NodeName:** Provide the name of the node where the VM will be created.
-    - **DomainName:** Provide the name of the domain where the node is added.
-    - **VMName:** Provide the name of the VM.
-    - **VSwitchCreation:** = Select _$true_ if an external VSwitch creation is needed, _$false_ if already created
-    - **VSwitchName:** Provide the name of the Virtual Switch.
-
-    ![Screenshot showing second set of variables in the Powershell script](./04.png)
-
-    As an example:
-    - **NodeName:** 'AZSHCINODE001'
-    - **DomainName:** 'azshci.local'
-    - **VMName:** 'ArcJS-VM1'
-    - **VSwitchCreation:** _$false_
-    - **VSwitchName:** 'Internet-vSwitch'
-
-3. Environment variables to onboard the VM to Azure Arc
-
-    - **subID:** Provide the subscriptionID
-    - **appID:** Provide the Service Principal ApplicationID
-    - **secret:** Provide the Service Principal Secret
-    - **tID:** Provide the tenantID
-    - **rgroup:** Provide the Resource Group Name
-    - **location:** Provide the Region
-
-    ![Screenshot showing third set of variables in the Powershell script](./05.png)
-
-    As an example:
-    - **subID:** "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX"
-    - **appID:** "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX"
-    - **secret:** "XXXXXXXXXX"
-    - **tID:** "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXX"
-    - **rgroup:** "arc-vms-rg"
-    - **location:** "West Europe"
-
-- After editing the variables, to run the script open PowerShell as an administrator, navigate to the [script folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/azure_stack_hci/powershell) and run:
-
-  ```powershell
-  .\azstack_hci_vm_deploy.ps1
-  ```
-
-  > **NOTE: The script takes some minutes to deploy, specially during the .VHDX download**  
-
-    ![Screenshot showing the download of the VHDX file](./06.png)
-
-  > **NOTE: You'll be asked to provide the credentials for accessing your host server. If prompted with any other authorization requests (CredSSP, networking related, etc), please answer _Yes_ to all of them.**
-
-    ![Screenshot showing the credentials prompt](./07.png)
-
-- Once the script run has finished, the output will look like the following:
-
-    ![Screenshot showing the installation completed!](./08.png)
-
-- From the Windows Admin Center, you can see as well the VM created:
-
-    ![Screenshot showing the VM in WAC!](./09.png)
-
-- The Windows Virtual Machine created in Azure Stack HCI will be projected as a new Azure Arc-enabled Server resource.
-
-    ![Screenshot showing Arc-enabled Server](./10.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the Azure Arc-enabled server resource via the Azure Portal, just select the cluster and delete it.
-
-![Screenshot showing how to delete Azure Arc-enabled server resource](./11.png)
-
-To delete the Windows Virtual Machine on Azure Stack HCI run the below command in the management server:
-
-```powershell
-$VMName = 'Provide the VM name'
-$NodeName = 'Provide the node name'
-$DomainName = 'Provide the domain name'
-
-$CustomCred = Get-Credential
-$s = New-PSSession -ComputerName "$NodeName.$DomainName" -Credential $CustomCred -Authentication Credssp 
-
-Invoke-Command -Session $s -ScriptBlock{
-    
-    Stop-VM -Name $using:VMName
-    Get-VMHardDiskDrive -VMName $using:VMName | Remove-VMHardDiskDrive
-    Get-VM -Name $using:VMName -ComputerName $using:NodeName | Remove-VM
-
-}
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/_index.md
deleted file mode 100644
index b78a3d9ca5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Unified Operations Use Cases"
-linkTitle: "Unified Operations Use Cases"
-weight: 8
-description: >-
-  Once you have server resources projected into Azure with Azure Arc, you can start to use native Azure tooling to manage the servers as native Azure resources. The following scenarios show examples of using Azure management tools such as resource tags, Azure Policy, Log Analytics, and more with Azure Arc-enabled servers.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/_index.md
deleted file mode 100644
index 5a21ecc472..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: docs
-title: "Azure Automanage"
-linkTitle: "Azure Automanage"
-weight: 2
-description: >-
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_builtin_profiles/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_builtin_profiles/_index.md
deleted file mode 100644
index 8ee9e5951d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_builtin_profiles/_index.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-type: docs
-title: "Enable Azure Automanage on an Azure Arc-enabled server using built-in profiles"
-linkTitle: "Enable Azure Automanage on an Azure Arc-enabled server using built-in profiles"
-weight: 1
-description: >
----
-
-## Enable Azure Automanage built-in profiles on an Azure Arc-enabled servers using an ARM Template
-
-The following Jumpstart scenario will guide you on how to onboard an Azure Arc-enabled server onto [Azure Automanage](https://docs.microsoft.com/azure/automanage/automanage-virtual-machines#prerequisites), so you can follow best practices in reliability, security, and management for Azure Arc-enabled servers using Azure services such as [Azure Update Management](https://docs.microsoft.com/azure/automation/update-management/overview) and [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/vm/vminsights-overview).
-
-Azure Automanage removes the need to discover virtual machines manually and automatically onboards and configures certain services in Azure following best practices as defined in [Microsoft Cloud Adoption Framework for Azure](https://docs.microsoft.com/azure/cloud-adoption-framework/manage/best-practices). Azure services included in Azure Automanage are:
-
-- [Microsoft Antimalware](https://docs.microsoft.com/azure/security/fundamentals/antimalware)
-- [Change Tracking & Inventory](https://docs.microsoft.com/azure/automation/change-tracking/overview)
-- [Update Management](https://docs.microsoft.com/azure/automation/update-management/overview)
-- [Machines Insights Monitoring](https://docs.microsoft.com/azure/azure-monitor/vm/vminsights-overview)
-- [Azure Guest Configuration](https://docs.microsoft.com/azure/governance/policy/concepts/guest-configuration)
-- [Azure Automation Account](https://docs.microsoft.com/azure/automation/automation-create-standalone-account)
-- [Log Analytics workspace](https://docs.microsoft.com/azure/azure-monitor/logs/log-analytics-overview)
-
-By the end of this scenario, you will have an Azure Arc-enabled server with Azure Automanage enabled and configured following Microsoft Cloud Adoption Framework best practices for Dev/Test or Production environments.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[Azure Stack HCI Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/)**
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario we will be using a Google Cloud Platform (GCP) instance that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server](./01.png)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server detail](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameters values are used throughout the deployment.
-
-- User will run the ARM template at resource group level.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fautomanage_builtin_profile%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- In order to keep your local environment clean and untouched, we will use Azure Cloud Shell to run the ARM template.
-
-  ![Screenshot showing Azure Cloud Shell](./05.png)
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- To run the automation, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/automanage_builtin_profile/) and edit [the parameters file](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/automanage_builtin_profile/azuredeploy.parameters.json)
-  - _`machineName`_: Name of your Azure Arc-enabled server as it is shown in the Azure Portal.
-  - _`configurationProfile`_: refers to the environment of your Azure Arc-enabled server as Azure Automanage has different built-in profiles. Values can be:
-    - _`Production environment`_: "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction"
-    - _`DevTest environments`_"/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesDevTest"
-
-  ![Parameters](./06.png)
-
-- From the deployment folder run the below command:
-
-  ```shell
-    az deployment group create --resource-group <your_resource_group> --template-file azuredeploy.json --parameters azuredeploy.parameters.json
-  ```
-
-  ![Scripts output](./07.png)
-
-  > **NOTE: For the script to work properly you must run this command from the deployment folder. The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-- After the script has finished its run you will have Azure Automanage enabled. You should be able to see the Azure Arc-enabled Server under 'Automanage' with the Status set in 'In progress', after a few minutes it will change to Conformant.
-
-  ![Azure Automanage in progress](./08.png)
-  ![Azure Arc-enabled server in Azure Automanage](./09.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment. To disable Azure Automanage you will use the Azure portal, go to the Automanage page that lists all of your auto-managed VMs. Select the checkbox next to the Azure Arc-enabled Server you want to disable from Automanage, then click on the _Disable_ button.
-
-  ![Disable Azure Automanage](./10.png)
-
-- Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[Azure Stack HCI Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/)**
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_custom_profiles/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_custom_profiles/_index.md
deleted file mode 100644
index 6b28ee305c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_custom_profiles/_index.md
+++ /dev/null
@@ -1,157 +0,0 @@
----
-type: docs
-title: "Enable Azure Automanage on an Azure Arc-enabled server using custom profiles"
-linkTitle: "Enable Azure Automanage on an Azure Arc-enabled server using custom profiles"
-weight: 2
-description: >
----
-
-## Enable Azure Automanage custom profiles on an Azure Arc-enabled servers using an ARM Template
-
-The following Jumpstart scenario will guide you on how to onboard an Azure Arc-enabled server onto [Azure Automanage](https://docs.microsoft.com/azure/automanage/automanage-virtual-machines#prerequisites). Automanage makes it easy to follow best practices in reliability, security, and management for Azure Arc-enabled servers using Azure services such as [Azure Update Management](https://docs.microsoft.com/azure/automation/update-management/overview) and [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/vm/vminsights-overview).
-
-Azure Automanage removes the need to discover virtual machines manually and automatically onboards and configures certain services in Azure following best practices as defined in [Microsoft Cloud Adoption Framework for Azure](https://docs.microsoft.com/azure/cloud-adoption-framework/manage/best-practices). Azure services included in Azure Automanage are:
-
-- [Microsoft Antimalware](https://docs.microsoft.com/azure/security/fundamentals/antimalware)
-- [Change Tracking & Inventory](https://docs.microsoft.com/azure/automation/change-tracking/overview)
-- [Update Management](https://docs.microsoft.com/azure/automation/update-management/overview)
-- [Machines Insights Monitoring](https://docs.microsoft.com/azure/azure-monitor/vm/vminsights-overview)
-- [Azure Guest Configuration](https://docs.microsoft.com/azure/governance/policy/concepts/guest-configuration)
-- [Azure Automation Account](https://docs.microsoft.com/azure/automation/automation-create-standalone-account)
-- [Log Analytics workspace](https://docs.microsoft.com/azure/azure-monitor/logs/log-analytics-overview)
-
-By the end of this scenario, you will have an Azure Arc-enabled server with Azure Automanage enabled and configured following Microsoft Cloud Adoption Framework best practices for Dev/Test or Production environments.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[Azure Stack HCI Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/)**
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- This scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario we will be using a Google Cloud Platform (GCP) instance that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server](./01.png)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server detail](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-Read the explanation below to get familiar with the automation and deployment flow.
-
-- User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameters values are used throughout the deployment.
-
-- User will run the ARM template at resource group level.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fautomanage_custom_profile%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- In order to keep your local environment clean and untouched, we will use Azure Cloud Shell to run the ARM template.
-
-  ![Screenshot showing Azure Cloud Shell](./05.png)
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- To run the automation, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/automanage_custom_profile/) and edit [the parameters file](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/automanage_custom_profile/azuredeploy.parameters.json)
-  - _`machineName`_: Name of your Azure Arc-enabled server as it is shown in the Azure Portal.
-  - _`customProfileName`_: Name of your Azure Arc-enabled Server custom profile.
-  - _`subscriptionId`_: Subscription ID where you want to create your custom profile.
-  - _`azureSecurityBaselineAssignmentType`_: Audit mode for the Azure Security Baseline.
-  - _`logAnalyticsWorkspace`_: Name for your Log Analytics workspace.
-
-  ![Parameters](./06.png)
-
-- From the deployment folder run the below command:
-
-  ```shell
-    az deployment group create --resource-group <your_resource_group> --template-file azuredeploy.json --parameters azuredeploy.parameters.json
-  ```
-
-  ![Scripts output](./07.png)
-
-  > **NOTE: For the script to work properly you must run this command from the deployment folder. The extra dot is due to the shell script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-- After the script has finished its run you will have Azure Automanage enabled. You should be able to see the Azure Arc-enabled Server under 'Automanage' with the Status set in 'In progress', after a few minutes it will change to Conformant.
-
-  ![Azure Automanage in progress](./08.png)
-  ![Azure Arc-enabled server in Azure Automanage](./09.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment. To disable Azure Automanage you will use the Azure portal. Go to the Automanage page that lists all of your auto-managed VMs. Select the checkbox next to the Azure Arc-enabled Server you want to disable from Automanage, then click on the _Disable_ button.
-
-  ![Disable Azure Automanage](./10.png)
-
-- Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[Azure Stack HCI Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/)**
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_linux/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_linux/_index.md
deleted file mode 100644
index da839b39de..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_linux/_index.md
+++ /dev/null
@@ -1,430 +0,0 @@
----
-type: docs
-title: "Create Automanage Machine Configuration custom configurations for Linux"
-linkTitle: "Create Automanage Machine Configuration custom configurations for Linux"
-weight: 4
-description: >
----
-
-## Create Automanage Machine Configuration custom configurations for Linux
-
-The following Jumpstart scenario will guide you on how to create and assign a custom Automanage Machine Configuration to an Azure Arc-enabled Linux server. Automanage makes it easy to follow best practices in reliability, security, and management for Azure Arc-enabled servers using Azure services such as [Azure Update Management](https://docs.microsoft.com/azure/automation/update-management/overview) and [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/vm/vminsights-overview).
-
-While the use of custom configurations in Automanage Machine Configuration feature is based on PowerShell Desired State Configuration (DSC), there are [Changes to behavior in PowerShell DSC for Machine Configuration](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-custom?view=dsc-2.0) to be aware of, the most significant being the use of PowerShell 7.
-
-By the end of this scenario, you will have both Linux and Windows Azure Arc-enabled servers with Automanage Machine Configuration custom configurations assigned.
-
-This scenario starts at the point where you already deployed **[Jumpstart ArcBox for IT Pros](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/)** and have 5 Azure Arc-enabled servers in the resource group is deployed to visible as resources in Azure.
-
-![Screenshot of Azure Portal showing Azure Arc-enabled servers](./01.png)
-
-The custom configurations are written using PowerShell Desired State Configuration (DSC), and needs to be authored from a machine running the target operating system for the configurations (Linux-machine for Linux configurations and Windows-machine for Windows configurations).
-
-After the configurations has been authored and published into your Azure environment, they can be assigned to any Linux-based Azure Arc-enabled server (or Azure VM) in your environment.
-
-This scenario will assign it to the resource group ArcBox is deployed to.
-
-## Base requirements - configuration authoring
-
-Operating system:
-
-- Ubuntu 18 (required by the GuestConfiguration module)
-
-In this scenario, we will be using the ArcBox Client virtual machine for the configuration authoring - and connect to a nested Linux VM.
-
-You can [connect to the ArcBox machine as described in the documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#connecting-to-the-arcbox-client-virtual-machine) and perform the following:
-
-- Open Visual Studio Code from the desktop shortcut.
-- Install the [Remote SSH extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh).
-
-![Screenshot of installing the Remote - SSH extension](./02.png)
-
-Open Hyper-V Manager and determine the IP address of the ArcBox-Ubuntu-01 VM:
-
-![Screenshot of Hyper-V Manager](./03.png)
-
-![Screenshot of adding a new remote SSH target](./04.png)
-
-- Open VS Code and add a new Remote SSH target:
-  - Enter the value ```ssh arcdemo@10.10.1.103 -A``` and press Enter two times
-
-![Screenshot of adding SSH connection command](./05.png)
-
-- Click Connect in the following dialogue box:
-
-![Screenshot of Remote SSH extension info dialogue](./06.png)
-
-- Select Linux in the following dialogue box and press Enter:
-
-![Screenshot of platform selection](./07.png)
-
-- When prompted for password, enter ```ArcDemo123!!```
-
-- As indicated in the lower left corner, VS Code should now be connected to the remote machine:
-
-![Screenshot of SSH connection status](./08.png)
-
-- In the VS Code menu, click Terminal -> New
-- Install [PowerShell 7](https://learn.microsoft.com/powershell/scripting/install/install-ubuntu?view=powershell-7.3#installation-via-direct-download) by running the following in the terminal window:
-
-```bash
-wget https://github.com/PowerShell/PowerShell/releases/download/v7.3.8/powershell_7.3.8-1.deb_amd64.deb
-sudo dpkg -i /home/arcdemo/powershell_7.3.8-1.deb_amd64.deb
-```
-
-- Followed by ```pwsh``` to ensure PowerShell is available.
-
-![Screenshot of PowerShell installation command](./09.png)
-
-- Due to a specific prerequisite (libmi) for packaging Machine Configurations, install the PSWSMan module which contains the required dependencies:
-
-```bash
-sudo pwsh
-Install-Module -Force -PassThru -Name PSWSMan
-Install-WSMan
-```
-
-![Screenshot of PowerShell module installation](./10.png)
-
-- Install the PowerShell extension in VS Code.
-
-![Screenshot of PowerShell extension](./11.png)
-
-- Click *File -> New Text File*, click Ctrl + S and specify ```/home/arcdemo/MachineConfiguration.ps1``` as the path for the new file.
-
-![Screenshot of PowerShell script Save As dialogue](./12.png)
-
-- Paste and run the following commands by pressing F5 in order to install the required PowerShell modules for this scenario:
-
-```powershell
-Install-Module -Name Az.Accounts -Force -RequiredVersion 2.13.1
-Install-Module -Name Az.PolicyInsights -Force -RequiredVersion 1.6.3
-Install-Module -Name Az.Resources -Force -RequiredVersion 6.11.2
-Install-Module -Name Az.Ssh -Force -RequiredVersion 0.1.1
-Install-Module -Name Az.Storage -Force -RequiredVersion 5.10.1
-
-Install-Module -Name GuestConfiguration -Force -RequiredVersion 4.5.0
-
-Install-Module PSDesiredStateConfiguration -AllowPreRelease -Force -RequiredVersion 3.0.0-beta1
-Install-Module nxtools -Force -RequiredVersion 1.3.0
-```
-
-The GuestConfiguration module automates the process of creating custom content including:
-
-- Creating a guest configuration content artifact (.zip)
-- Validating the package meets requirements
-- Installing the guest configuration agent locally for testing
-- Validating the package can be used to audit settings in a machine
-- Validating the package can be used to configure settings in a machine
-
-The Azure PowerShell modules is used for:
-
-- Publishing the package to Azure storage
-- Creating a policy definition
-- Publishing the policy
-- Connecting to the Azure Arc-enabled servers
-
-Desired State Configuration version 3 is currently in beta, but is the only version supported for Linux-based DSC configurations.
-
-The nxtools module contains DSC resources used for the demo configuration.
-
-## Azure resources
-
-> **NOTE: For the remaining code blocks in this article, copy the code into ```/home/arcdemo/MachineConfiguration.ps1``` , mark the lines you want to run and click F8. Alternatively, right click the selected commands and click Run Selection:**
-
-![Screenshot of PowerShell script and Run Selection menu option](./13.png)
-
-Authenticate to Azure
-
-```powershell
-Connect-AzAccount -UseDeviceAuthentication
-
-# Update the values to reflect your ArcBox deployment
-$ResourceGroupName = "arcbox-demo-rg"
-$Location = "northeurope"
-```
-
-Create storage account for storing DSC artifacts
-
-```powershell
-$storageaccountsuffix = -join ((97..122) | Get-Random -Count 5 | % {[char]$_})
-
-New-AzStorageAccount -ResourceGroupName $ResourceGroupName -Name "arcboxmachineconfig$storageaccountsuffix" -SkuName 'Standard_LRS' -Location $Location -OutVariable storageaccount | New-AzStorageContainer -Name machineconfiguration -Permission Blob
-```
-
-> *Make a note of the storage account name, as this will be needed in later steps.*
-
-## Custom configuration for Linux
-
-The following steps needs to be executed from PowerShell 7 on the authoring machine for Linux.
-
-```powershell
-Import-Module PSDesiredStateConfiguration -RequiredVersion 3.0.0
-
-Configuration AzureArcJumpstart_Linux
-{
-    param(
-        $FilePath = "/tmp/arc-nxscript-demo",
-        $FileContent = "Hello Arc!"
-    )
-
-    Import-DscResource -ModuleName nxtools -ModuleVersion 1.3.0
-
-    Node localhost
-    {
-        nxPackage nginx {
-            Name   = "nginx"
-            Ensure = "Present"
-        }
-        nxPackage hello {
-            Name   = "hello"
-            Ensure = "Present"
-        }
-        nxFile demofile1 {
-            DestinationPath = "/tmp/arc-demo"
-            Ensure          = "Present"
-            Mode            = '0777'
-            Contents        = "Hello Arc!"
-            Owner           = 'root'
-            Group           = 'root'
-        }
-        nxGroup arcusers {
-            GroupName = "arcusers"
-            Ensure    = "Present"
-        }
-        nxScript demofile2 {
-            GetScript  = {
-                $Reason = [Reason]::new()
-                $Reason.Code = "Script:Script:FileMissing"
-                $Reason.Phrase = "File does not exist"
-
-                if (Test-Path -Path $using:FilePath) {
-                    $text = $(Get-Content -Path $using:FilePath -Raw).Trim()
-                    if ($text -eq $using:FileContent) {
-                        $Reason.Code = "Script:Script:Success"
-                        $Reason.Phrase = "File exists with correct content"
-                    }
-                    else {
-                        $Reason.Code = "Script:Script:ContentMissing"
-                        $Reason.Phrase = "File exists but has incorrect content"
-                    }
-                }
-
-                return @{
-                    Reasons = @($Reason)
-                }
-            }
-            TestScript = {
-                if (Test-Path -Path $using:FilePath) {
-                    $text = $(Get-Content -Path $using:FilePath -Raw).Trim()
-                    return $text -eq $using:FileContent
-                }
-                else {
-                    return $false
-                }
-            }
-            SetScript  = {
-                $null = Set-Content -Path $using:FilePath -Value $using:FileContent
-            }
-        }
-
-    }
-}
-
-$OutputPath = "$HOME/arc_automanage_machine_configuration_custom_linux"
-New-Item $OutputPath -Force -ItemType Directory
-
-AzureArcJumpstart_Linux -OutputPath $OutputPath
-```
-
-Create a package that will audit and apply the configuration (Set)
-
-```powershell
-New-GuestConfigurationPackage `
--Name 'AzureArcJumpstart_Linux' `
--Configuration "$OutputPath/localhost.mof" `
--Type AuditAndSet `
--Path $OutputPath `
--Force
-```
-
-Optionally, test applying the configuration to the local machine by copying and pasting the following commands into the terminal.
-
-```powershell
-# Need to run with elevated credentials since the configuration is performing system wide operations
-sudo pwsh
-
-Install-Module -Name GuestConfiguration -Force -RequiredVersion 4.4.0
-
-Start-GuestConfigurationPackageRemediation -Path /home/arcdemo/arc_automanage_machine_configuration_custom_linux/AzureArcJumpstart_Linux.zip -Verbose
-
-exit
-```
-
-Upload the configuration package to Azure Storage.
-Insert the correct storage account name on the first line in place of the placeholder value for the -Name parameter based on the output of the storage account created in the step *"Shared resources"*.
-
-```powershell
-$StorageAccount = Get-AzStorageAccount -Name <insert-storage-account-name> -ResourceGroupName $ResourceGroupName
-
-$StorageAccountKey = Get-AzStorageAccountKey -Name $storageaccount.StorageAccountName -ResourceGroupName $storageaccount.ResourceGroupName
-$Context = New-AzStorageContext -StorageAccountName $storageaccount.StorageAccountName -StorageAccountKey $StorageAccountKey[0].Value
-
-Set-AzStorageBlobContent -Container "machineconfiguration" -File  "$OutputPath/AzureArcJumpstart_Linux.zip" -Blob "AzureArcJumpstart_Linux.zip" -Context $Context -Force
-
-$contenturi = New-AzStorageBlobSASToken -Context $Context -FullUri -Container machineconfiguration -Blob "AzureArcJumpstart_Linux.zip" -Permission r
-```
-
-Create an Azure Policy definition
-
-```powershell
-$PolicyId = (New-Guid).Guid
-
-New-GuestConfigurationPolicy `
-  -PolicyId $PolicyId `
-  -ContentUri $ContentUri `
-  -DisplayName '(AzureArcJumpstart) [Linux] Custom configuration' `
-  -Description 'Azure Arc Jumpstart Linux demo configuration' `
-  -Path  $OutputPath `
-  -Platform 'Linux' `
-  -PolicyVersion 1.0.0 `
-  -Mode ApplyAndAutoCorrect `
-  -Verbose -OutVariable Policy
-
-  $PolicyParameterObject = @{'IncludeArcMachines'='true'}
-
-  New-AzPolicyDefinition -Name '(AzureArcJumpstart) [Linux] Custom configuration' -Policy $Policy.Path -OutVariable PolicyDefinition
-```
-
-Assign the Azure Policy definition to the target resource group
-
-```powershell
-$ResourceGroup = Get-AzResourceGroup -Name $ResourceGroupName
-
-New-AzPolicyAssignment -Name '(AzureArcJumpstart) [Linux] Custom configuration' -PolicyDefinition $PolicyDefinition[0] -Scope $ResourceGroup.ResourceId -PolicyParameterObject $PolicyParameterObject -IdentityType SystemAssigned -Location $Location -DisplayName '(AzureArcJumpstart) [Linux] Custom configuration' -OutVariable PolicyAssignment
-```
-
-In order for the newly assigned policy to remediate existing resources, the policy must be assigned a managed identity and a policy remediation must be performed. Hence, the next steps are:
-
-- Grant a managed identity defined roles with PowerShell
-- Create a remediation task through Azure PowerShell
-
-See the [documentation](https://docs.microsoft.com/azure/governance/policy/how-to/remediate-resources) for more information.
-
-```powershell
-$PolicyAssignment = Get-AzPolicyAssignment -PolicyDefinitionId $PolicyDefinition.PolicyDefinitionId | Where-Object Name -eq '(AzureArcJumpstart) [Linux] Custom configuration'
-
-$roleDefinitionIds =  $PolicyDefinition.Properties.policyRule.then.details.roleDefinitionIds
-
-# Wait for eventual consistency
-Start-Sleep 20
-
-if ($roleDefinitionIds.Count -gt 0)
- {
-     $roleDefinitionIds | ForEach-Object {
-         $roleDefId = $_.Split("/") | Select-Object -Last 1
-         New-AzRoleAssignment -Scope $resourceGroup.ResourceId -ObjectId $PolicyAssignment.Identity.PrincipalId -RoleDefinitionId $roleDefId
-     }
- }
-
- $job = Start-AzPolicyRemediation -AsJob -Name ($PolicyAssignment.PolicyAssignmentId -split '/')[-1] -PolicyAssignmentId $PolicyAssignment.PolicyAssignmentId -ResourceGroupName $ResourceGroup.ResourceGroupName -ResourceDiscoveryMode ReEvaluateCompliance
-
- $job | Wait-Job | Receive-Job
-```
-
-Check policy compliance by following these steps:
-
-- In the Azure Portal, navigate to *Policy* -> *Compliance*
-- Set the scope to the resource group your instance of ArcBox is deployed to
-- Filter for *(AzureArcJumpstart) [Linux] Custom configuration*
-
-![Screenshot of Azure Portal showing Azure Policy compliance](./14.png)
-
-It may take 15-20 minutes for the policy remediation to be completed.
-
-Get a Machine Configuration specific view by following these steps:
-
-- In the Azure Portal, navigate to *Azure Arc* -> *Servers*
-- Click on Arcbox-Ubuntu-01 -> Machine Configuration
-- If the status for *Arcbox-Ubuntu-01/AzureArcJumpstart_Linux* is not *Compliant*, wait a few more minutes and click *Refresh*
-
-![Screenshot of Azure Portal showing Azure Machine Configuration compliance](./15.png)
-
-Click on *Arcbox-Ubuntu-01/AzureArcJumpstart_Linux* to get a per-resource view of the compliance state in the assigned configuration
-
-![Screenshot of Azure Portal showing Azure Machine Configuration compliance](./16.png)
-
-### Verify that the operating system level settings are in place
-
-Login to Arcbox-Ubuntu-01 by running the below command
-
-- Enter the password **ArcDemo123!!** when prompted
-
-```powershell
-Enter-AzVM -ResourceGroupName $ResourceGroupName -Name Arcbox-Ubuntu-01 -LocalUser arcdemo
-```
-
-Verify that the packages **hello** and **nginx** are installed by running ```apt list --installed | grep 'hello\|nginx/focal'```
-
-![Screenshot of connection to ArcBox-Ubuntu-01](./17.png)
-
-You can also verify that nginx is running and available by accessing [http://10.10.1.103/](http://10.10.1.103/) from Microsoft Edge on the ArcBox Client virtual machine.
-
-![Screenshot of nginx](./18.png)
-
-If you want to evaluate how remediation works, try to make one of the above configuration settings non-compliant by, for example, removing the package hello: ```sudo apt remove hello```
-
-Trigger a [manual evaluation](https://learn.microsoft.com/powershell/module/az.policyinsights/start-azpolicycompliancescan?view=azps-9.4.0) or wait until the next policy evaluation cycle has completed and observe that the policy is now non-compliant.
-
-Next, perform the steps outlined in [Create a remediation task](https://learn.microsoft.com/azure/governance/policy/how-to/remediate-resources?tabs=azure-portal#create-a-remediation-task) for the ArcBox-policies to bring the machine back into compliance.
-
-To learn more, check out [Remediation options for machine configuration](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-policy-effects) in the documentation.
-
-## Summary
-
-In this scenario you have performed the following tasks:
-
-- [Created a package artifact](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create) for machine configuration.
-- [Tested the package artifact](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create-test) from your development environment.
-- [Published the package artifact](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create-publish) so it is accessible to your machines.
-- Used the GuestConfiguration module to [create an Azure Policy definition](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create-definition) for at-scale management of your environment.
-- [Assigned your custom policy definition](https://learn.microsoft.com/azure/governance/policy/assign-policy-portal) to the ArcBox resource group.
-
-> *NOTE: For ArcBox exploration, it is recommended to perform the assignment at the resource group level where the Azure Arc-enabled servers reside to not accidentally apply the configuration to other machines in your environment*
-
-## Next steps
-
-After going through this scenario you may want to write your own configurations to meet your organization`s needs and requirements.
-
-- [Desired State Configuration overview](https://learn.microsoft.com/powershell/dsc/overview?view=dsc-2.0)
-- [Installing DSC Resources](https://learn.microsoft.com/powershell/dsc/how-tos/installing-dsc-resources?view=dsc-2.0)
-- [Write and compile a DSC Configuration](https://learn.microsoft.com/powershell/dsc/how-tos/configurations/write-and-compile?view=dsc-2.0)
-
-For Linux, the [nxtools module](https://www.powershellgallery.com/packages/nxtools) will help in managing common tasks - such as:
-
-- `nxGroup`: Resource to manage [nxLocalGroup] and group members.
-- `nxUser`: Resource to manage [nxLocalUser] accounts.
-- `nxService`: Manage the state of daemons/services.
-- `nxPackage`: Audit whether a package is installed or not in a system.
-- `nxFile`: Manage a file or a folder to make sure it's present/absent, its content, mode, owner group.
-- `nxFileLine`: Ensure an exact line is present/absent in a file, and remediate by appending, inserting, deleting as needed.
-- `nxFileContentReplace`: Replace the content in a file if a pattern is found.
-
-Should your needs not be covered by an existing DSC resource module, check out [Create a class-based DSC Resource for machine configuration](https://learn.microsoft.com/powershell/dsc/tutorials/create-dsc-resource-machine-config?view=dsc-2.0) in the DSC documentation.
-
-You might also want to have a look at the following resources if you have been using DSC in the past:
-
-- [Azure Automation state configuration to machine configuration migration planning](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-azure-automation-migration)
-- [Planning a change from Desired State Configuration extension for Linux to machine configuration](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-dsc-extension-migration)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment. To disable Azure Automanage you will use the Azure portal. Go to the Automanage page that lists all of your auto-managed VMs. Select the checkbox next to the Azure Arc-enabled Server you want to disable from Automanage, then click on the *Disable* button.
-
-```powershell
-Remove-AzPolicyAssignment -Name '(AzureArcJumpstart) [Linux] Custom configuration'
-
-Remove-AzPolicyDefinition -Name '(AzureArcJumpstart) [Linux] Custom configuration'
-
-Get-AzStorageAccount -Name <insert-storage-account-name> -ResourceGroupName $ResourceGroupName | Remove-AzStorageAccount
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_windows/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_windows/_index.md
deleted file mode 100644
index 6c4009f948..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_windows/_index.md
+++ /dev/null
@@ -1,358 +0,0 @@
----
-type: docs
-title: "Create Automanage Machine Configuration custom configurations for Windows"
-linkTitle: "Create Automanage Machine Configuration custom configurations for Windows"
-weight: 3
-description: >
----
-
-## Create Automanage Machine Configuration custom configurations for Windows
-
-The following Jumpstart scenario will guide you on how to create and assign a custom Automanage Machine Configuration to an Azure Arc-enabled Windows server. Automanage makes it easy to follow best practices in reliability, security, and management for Azure Arc-enabled servers using Azure services such as [Azure Update Management](https://docs.microsoft.com/azure/automation/update-management/overview) and [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/vm/vminsights-overview).
-
-While the use of custom configurations in Automanage Machine Configuration feature is based on PowerShell Desired State Configuration (DSC), there are [Changes to behavior in PowerShell DSC for Machine Configuration](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-custom?view=dsc-2.0) to be aware of, the most significant being the use of PowerShell 7.
-
-By the end of this scenario, you will have Windows Azure Arc-enabled servers with a custom Automanage Machine Configuration assigned.
-
-This scenario starts at the point where you already deployed **[Jumpstart ArcBox for IT Pros](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/)** and have 5 Azure Arc-enabled servers in the resource group is deployed to visible as resources in Azure.
-
-![Screenshot of Azure Portal showing Azure Arc-enabled servers](./01.png)
-
-The custom configurations are written using PowerShell Desired State Configuration (DSC), and needs to be authored from a machine running the target operating system for the configurations (Linux-machine for Linux configurations and Windows-machine for Windows configurations).
-
-After the configurations has been authored and published into your Azure environment, they can be assigned to any Windows-based Azure Arc-enabled server (or Azure VM) in your environment.
-
-This scenario will assign it to the resource group ArcBox is deployed to.
-
-## Base requirements - configuration authoring
-
-Operating system:
-
-- [Any supported version of Windows for PowerShell 7](https://learn.microsoft.com/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.3#supported-versions-of-windows)
-
-In this scenario, we will be using the ArcBox Client virtual machine for the configuration authoring.
-
-You can [connect to the ArcBox machine as described in the documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#connecting-to-the-arcbox-client-virtual-machine) and perform the following:
-
-- Install [PowerShell 7](https://learn.microsoft.com/powershell/scripting/install/installing-powershell?view=powershell-7.3).
-  - Run ```$PSVersionTable``` to check your currently installed version.
-- Open Visual Studio Code from the desktop shortcut.
-- Install the PowerShell extension.
-- Create C:\ArcBox\MachineConfiguration.ps1, then paste and run the following commands to install the required PowerShell modules for this scenario:
-
-```powershell
-Install-Module -Name Az.Accounts -Force -RequiredVersion 2.12.1
-Install-Module -Name Az.PolicyInsights -Force -RequiredVersion 1.5.1
-Install-Module -Name Az.Resources -Force -RequiredVersion 6.5.2
-Install-Module -Name Az.Ssh -Force -RequiredVersion 0.1.1
-Install-Module -Name Az.Storage -Force -RequiredVersion 5.4.0
-
-Install-Module -Name GuestConfiguration -Force -RequiredVersion 4.4.0
-
-Install-Module PSDesiredStateConfiguration -Force -RequiredVersion 2.0.5
-Install-Module PSDscResources -Force -RequiredVersion 2.12.0.0
-```
-
-The Azure PowerShell modules is used for:
-
-- Publishing the package to Azure storage
-- Creating a policy definition
-- Publishing the policy
-- Connecting to the Azure Arc-enabled servers
-
-The GuestConfiguration module automates the process of creating custom content including:
-
-- Creating a machine configuration content artifact (.zip)
-- Validating the package meets requirements
-- Installing the machine configuration agent locally for testing
-- Validating the package can be used to audit settings in a machine
-- Validating the package can be used to configure settings in a machine
-
-Desired State Configuration version 3 is removing the dependency on MOF.
-Initially, there are only support for DSC Resources written as PowerShell classes.
-Due to using MOF-based DSC resources for the Windows demo-configuration, we are using version 2.0.5.
-
-## Azure resources
-
-> **NOTE: For the remaining code blocks in this article, copy the code into ```C:\ArcBox\MachineConfiguration.ps1```, mark the lines you want to run and click F8.**
-
-Authenticate to Azure
-
-```powershell
-Connect-AzAccount
-
-# Update the values to reflect your ArcBox deployment
-$ResourceGroupName = "arcbox-demo-rg"
-$Location = "northeurope"
-```
-
-Create storage account for storing DSC artifacts
-
-```powershell
-$storageaccountsuffix = -join ((97..122) | Get-Random -Count 5 | % {[char]$_})
-
-New-AzStorageAccount -ResourceGroupName $ResourceGroupName -Name "arcboxmachineconfig$storageaccountsuffix" -SkuName 'Standard_LRS' -Location $Location -OutVariable storageaccount | New-AzStorageContainer -Name machineconfiguration -Permission Blob
-```
-
-> *Make a note of the storage account name, as this will be needed in later steps.*
-
-## Custom configuration for Windows
-
-The following steps needs to be executed from PowerShell 7 on the authoring machine for Windows.
-
-```powershell
-Import-Module PSDesiredStateConfiguration -RequiredVersion 2.0.5
-
-Configuration AzureArcJumpstart_Windows
-{
-    param (
-        [Parameter(Mandatory)]
-        [System.Management.Automation.PSCredential]
-        [System.Management.Automation.Credential()]
-        $PasswordCredential
-    )
-
-    Import-DscResource -ModuleName 'PSDscResources' -ModuleVersion 2.12.0.0
-
-    Node localhost
-    {
-        MsiPackage PS7
-        {
-            ProductId = '{323AD147-6FC4-40CB-A810-2AADF26D868A}'
-            Path = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.2/PowerShell-7.3.2-win-x64.msi'
-            Ensure = 'Present'
-        }
-        User ArcBoxUser
-        {
-            UserName = 'arcboxuser1'
-            FullName = 'ArcBox User 1'
-            Password = $PasswordCredential
-            Ensure = 'Present'
-        }
-        WindowsFeature SMB1 {
-            Name = 'FS-SMB1'
-            Ensure = 'Absent'
-        }
-    }
-}
-
-Write-Host "Creating credentials for arcbox user 1"
-$nestedWindowsUsername = "arcboxuser1"
-$nestedWindowsPassword = "ArcDemo123!!"  # In real-world scenarios this could be retrieved from an Azure Key Vault
-
-# Create Windows credential object
-$secWindowsPassword = ConvertTo-SecureString $nestedWindowsPassword -AsPlainText -Force
-$winCreds = New-Object System.Management.Automation.PSCredential ($nestedWindowsUsername, $secWindowsPassword)
-
-$ConfigurationData = @{
-    AllNodes = @(
-        @{
-            NodeName = 'localhost'
-            PSDscAllowPlainTextPassword = $true
-        }
-    )
-}
-
-$OutputPath = "$HOME/arc_automanage_machine_configuration_custom_windows"
-New-Item $OutputPath -Force -ItemType Directory
-
-AzureArcJumpstart_Windows -PasswordCredential $winCreds -ConfigurationData $ConfigurationData -OutputPath $OutputPath
-
-```
-
-Create a package that will audit and apply the configuration (Set)
-
-```powershell
-New-GuestConfigurationPackage `
--Name 'AzureArcJumpstart_Windows' `
--Configuration "$OutputPath/localhost.mof" `
--Type AuditAndSet `
--Path $OutputPath `
--Force
-```
-
-Test applying the configuration to the local machine
-
-```powershell
-Start-GuestConfigurationPackageRemediation -Path "$OutputPath/AzureArcJumpstart_Windows.zip"
-```
-
-Upload the configuration package to Azure Storage.
-Insert the correct storage account name on the first line in place of the placeholder value for the -Name parameter based on the output of the storage account created in the step *"Shared resources"*.
-
-```powershell
-$StorageAccount = Get-AzStorageAccount -Name <insert-storage-account-name> -ResourceGroupName $ResourceGroupName
-
-$StorageAccountKey = Get-AzStorageAccountKey -Name $storageaccount.StorageAccountName -ResourceGroupName $storageaccount.ResourceGroupName
-$Context = New-AzStorageContext -StorageAccountName $storageaccount.StorageAccountName -StorageAccountKey $StorageAccountKey[0].Value
-
-Set-AzStorageBlobContent -Container "machineconfiguration" -File  "$OutputPath/AzureArcJumpstart_Windows.zip" -Blob "AzureArcJumpstart_Windows.zip" -Context $Context -Force
-
-$contenturi = New-AzStorageBlobSASToken -Context $Context -FullUri -Container machineconfiguration -Blob "AzureArcJumpstart_Windows.zip" -Permission r
-```
-
-Create an Azure Policy definition
-
-```powershell
-$PolicyId = (New-Guid).Guid
-
-New-GuestConfigurationPolicy `
-  -PolicyId $PolicyId `
-  -ContentUri $ContentUri `
-  -DisplayName '(AzureArcJumpstart) [Windows] Custom configuration' `
-  -Description 'Azure Arc Jumpstart Windows demo configuration' `
-  -Path  $OutputPath `
-  -Platform 'Windows' `
-  -PolicyVersion 1.0.0 `
-  -Mode ApplyAndAutoCorrect `
-  -Verbose -OutVariable Policy
-
-  $PolicyParameterObject = @{'IncludeArcMachines'='true'}
-
-  New-AzPolicyDefinition -Name '(AzureArcJumpstart) [Windows] Custom configuration' -Policy $Policy.Path -OutVariable PolicyDefinition
-```
-
-Assign the Azure Policy definition to the target resource group
-
-```powershell
-$ResourceGroup = Get-AzResourceGroup -Name $ResourceGroupName
-
-New-AzPolicyAssignment -Name '(AzureArcJumpstart) [Windows] Custom configuration' -PolicyDefinition $PolicyDefinition[0] -Scope $ResourceGroup.ResourceId -PolicyParameterObject $PolicyParameterObject -IdentityType SystemAssigned -Location $Location -DisplayName '(AzureArcJumpstart) [Windows] Custom configuration' -OutVariable PolicyAssignment
-```
-
-In order for the newly assigned policy to remediate existing resources, the policy must be assigned a managed identity and a policy remediation must be performed. Hence, the next steps are:
-
-- Grant a managed identity defined roles with PowerShell
-- Create a remediation task through Azure PowerShell
-
-See the [documentation](https://docs.microsoft.com/azure/governance/policy/how-to/remediate-resources) for more information.
-
-```powershell
-$PolicyAssignment = Get-AzPolicyAssignment -PolicyDefinitionId $PolicyDefinition.PolicyDefinitionId | Where-Object Name -eq '(AzureArcJumpstart) [Windows] Custom configuration'
-
-$roleDefinitionIds =  $PolicyDefinition.Properties.policyRule.then.details.roleDefinitionIds
-
-# Wait for eventual consistency
-Start-Sleep 20
-
-if ($roleDefinitionIds.Count -gt 0)
- {
-     $roleDefinitionIds | ForEach-Object {
-         $roleDefId = $_.Split("/") | Select-Object -Last 1
-         New-AzRoleAssignment -Scope $resourceGroup.ResourceId -ObjectId $PolicyAssignment.Identity.PrincipalId -RoleDefinitionId $roleDefId
-     }
- }
-
- $job = Start-AzPolicyRemediation -AsJob -Name ($PolicyAssignment.PolicyAssignmentId -split '/')[-1] -PolicyAssignmentId $PolicyAssignment.PolicyAssignmentId -ResourceGroupName $ResourceGroup.ResourceGroupName -ResourceDiscoveryMode ReEvaluateCompliance
-
- $job | Wait-Job | Receive-Job
-```
-
-Check policy compliance by following these steps:
-
-- In the Azure Portal, navigate to *Policy* -> *Compliance*
-- Set the scope to the resource group your instance of ArcBox is deployed to
-- Filter for *(AzureArcJumpstart) [Windows] Custom configuration*
-
-![Screenshot of Azure Portal showing Azure Policy compliance](./02.png)
-
-It may take 15-20 minutes for the policy remediation to be completed.
-
-Get a Machine Configuration specific view by following these steps:
-
-- In the Azure Portal, navigate to *Azure Arc* -> *Servers*
-- Click on ArcBox-Win2K22 -> Machine Configuration
-- If the status for *ArcBox-Win2K22/AzureArcJumpstart_Windows* is not *Compliant*, wait a few more minutes and click *Refresh*
-
-![Screenshot of Azure Portal showing Azure Machine Configuration compliance](./03.png)
-
-Click on *ArcBox-Win2K22/AzureArcJumpstart_Windows* to get a per-resource view of the compliance state in the assigned configuration
-
-![Screenshot of Azure Portal showing Azure Machine Configuration compliance detailed view](./04.png)
-
-### Verify that the operating system level settings are in place
-
-Login to ArcBox-Win2K22 by running the below command
-
-- Enter the password **ArcDemo123!!** when prompted
-
-```powershell
-Enter-AzVM -ResourceGroupName $ResourceGroupName -Name ArcBox-Win2K22 -LocalUser Administrator
-```
-
-Verify that the local group **arcusers** exists by first running ```powershell``` followed by ```Get-LocalUser -Name arcboxuser1```.
-
-![Screenshot of local user present on ArcBox-Win2K22](./05.png)
-
-Verify that the SMB1 feature is not installed by running ```Get-WindowsFeature -Name FS-SMB1```.
-
-- The output should show that the feature is *Available*, not *Installed*
-
-![Screenshot of SMB1 feature installation status on ArcBox-Win2K22](./06.png)
-
-Verify that PowerShell 7 is installed by running ```pwsh```.
-
-![Screenshot of PowerShell 7 presence on ArcBox-Win2K22](./07.png)
-
-> *NOTE: If you prefer to log on interactively to a Remote Desktop session in order to verify the configuration settings, add -Rdp to the Enter-AzVM command:
-
-```powershell
-Enter-AzVM -ResourceGroupName $ResourceGroupName -Name ArcBox-Win2K22 -LocalUser Administrator -Rdp
-```
-
-![Screenshot of connecting to ArcBox-Win2K22 via Azure PowerShell](./08.png)
-
-If you want to evaluate how remediation works, try to make one of the above configuration settings non-compliant by, for example, removing the user arcboxuser1: ```Get-LocalUser -Name arcboxuser1 | Remove-LocalUser```
-
-Trigger a [manual evaluation](https://learn.microsoft.com/powershell/module/az.policyinsights/start-azpolicycompliancescan?view=azps-9.4.0) or wait until the next policy evaluation cycle has completed and observe that the policy is now non-compliant.
-
-Next, perform the steps outlined in [Create a remediation task](https://learn.microsoft.com/azure/governance/policy/how-to/remediate-resources?tabs=azure-portal#create-a-remediation-task) for the ArcBox-policies to bring the machine back into compliance.
-
-To learn more, check out [Remediation options for machine configuration](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-policy-effects) in the documentation.
-
-## Summary
-
-In this scenario you have performed the following tasks:
-
-- [Created a package artifact](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create) for machine configuration.
-- [Tested the package artifact](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create-test) from your development environment.
-- [Published the package artifact](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create-publish) so it is accessible to your machines.
-- Used the GuestConfiguration module to [create an Azure Policy definition](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-create-definition) for at-scale management of your environment.
-- [Assigned your custom policy definition](https://learn.microsoft.com/azure/governance/policy/assign-policy-portal) to the ArcBox resource group.
-
-> *NOTE: For ArcBox exploration, it is recommended to perform the assignment at the resource group level where the Azure Arc-enabled servers reside to not accidentally apply the configuration to other machines in your environment*
-
-## Next steps
-
-After going through this scenario you may want to write your own configurations to meet your organization`s needs and requirements.
-
-- [Desired State Configuration overview](https://learn.microsoft.com/powershell/dsc/overview?view=dsc-2.0)
-- [Installing DSC Resources](https://learn.microsoft.com/powershell/dsc/how-tos/installing-dsc-resources?view=dsc-2.0)
-- [Write and compile a DSC Configuration](https://learn.microsoft.com/powershell/dsc/how-tos/configurations/write-and-compile?view=dsc-2.0)
-
-For Windows, there are many Resource Modules provided by the [DSC Community](https://dsccommunity.org/) - such as:
-
-- `ActiveDirectoryDsc`: Contains DSC resources for deployment and configuration of Active Directory. These DSC resources allow you to configure new domains, child domains, and high availability domain controllers, establish cross-domain trusts and manage users, groups and OUs.
-- `ComputerManagementDsc`: Allow you to perform computer management tasks, such as renaming the computer, joining a domain and scheduling tasks as well as configuring items such as virtual memory, event logs, time zones and power settings.
-- `SqlServerDsc`: Deployment and configuration of Microsoft SQL Server.
-
-Should your needs not be covered by an existing DSC resource module, check out [Create a class-based DSC Resource for machine configuration](https://learn.microsoft.com/powershell/dsc/tutorials/create-dsc-resource-machine-config?view=dsc-2.0) in the DSC documentation.
-
-You might also want to have a look at the following resources if you have been using DSC in the past:
-
-- [Azure Automation state configuration to machine configuration migration planning](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-azure-automation-migration)
-- [Planning a change from Desired State Configuration extension for Linux to machine configuration](https://learn.microsoft.com/azure/governance/machine-configuration/machine-configuration-dsc-extension-migration)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment. To disable Azure Automanage you will use the Azure portal. Go to the Automanage page that lists all of your auto-managed VMs. Select the checkbox next to the Azure Arc-enabled Server you want to disable from Automanage, then click on the *Disable* button.
-
-```powershell
-$PolicyDefinition = Get-AzPolicyDefinition -Name '(AzureArcJumpstart) [Windows] Custom configuration'
-
-Get-AzPolicyAssignment -PolicyDefinitionId $PolicyDefinition.PolicyDefinitionId | Remove-AzPolicyAssignment
-
-$PolicyDefinition  | Remove-AzPolicyDefinition
-
-Get-AzStorageAccount -Name <insert-storage-account-name> -ResourceGroupName $ResourceGroupName | Remove-AzStorageAccount
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_azuremonitoragent/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_azuremonitoragent/_index.md
deleted file mode 100644
index 549732d0d5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_azuremonitoragent/_index.md
+++ /dev/null
@@ -1,185 +0,0 @@
----
-type: docs
-title: "Azure Monitor Agent (AMA)"
-linkTitle: "Azure Monitor Agent (AMA)"
-weight: 16
-description: >
----
-
-## Deploy the Azure Monitor Agent (AMA) on Azure Arc-enabled servers
-
-The following Jumpstart scenario will guide you on how to deploy the [Azure Monitor Agent (AMA)](https://docs.microsoft.com/azure/azure-monitor/agents/azure-monitor-agent-overview) as an extension on your Azure Arc-enabled servers, both Linux and Windows systems.
-
-The Azure Monitor agent (AMA) collects monitoring data from the guest operating system of supported infrastructure and delivers it to Azure Monitor.
-
-> **NOTE: This scenario assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Please review the [Azure Monitor Agent (AMA) supported OS documentation](https://docs.microsoft.com/azure/azure-monitor/agents/agents-overview#supported-operating-systems) and ensure that the VMs you will use for this exercise are supported. For Linux VMs, check both the Linux distribution and kernel to ensure you are using a supported configuration.
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshots below, you can see a Windows and a Linux server that have been connected with Azure Arc and are visible as resources in Azure.
-
-    ![Screenshot Azure Arc-enabled servers on resource group](./01.png)
-
-    ![Screenshot Linux Azure Arc-enabled server connected status](./02.png)
-
-    ![Screenshot Windows Azure Arc-enabled server connected status](./03.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- To complete this scenario, the user or service principal running the automation need these minimum Role-based access control (RBAC) permissions: *Azure Connected Machine Resource Administrator* on your Azure Arc-enabled servers. *Monitoring Contributor* and *Microsoft.Resources/deployments/** on the resource group where you will deploy this scenario.
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User is verifying the successful extension deployment and data collection rules creation.
-
-## Deployment Option 1: Azure portal
-
-- For Windows VMs, click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fazuremonitoragent%2Fama-windows-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-  ![Screenshot showing Azure portal deployment](./05.png)
-
-- For Linux VMs, click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fazuremonitoragent%2Fama-linux-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters:
-
-  ![Screenshot showing Azure portal deployment](./06.png)
-
-  ![Screenshot showing Azure portal deployment](./07.png)
-
-- To match your configuration you will need to provide:
-
-  - The **subscription**, **resource group**, **Computer name** and **location** where you registered the Azure Arc-enabled server:
-
-    ![Screenshot Azure Arc-enabled server location](./08.png)
-
-  - The **Log Analytics workspace name** that will be created.
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [*parameters file*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azuremonitoragent/ama-template.parameters.json) providing the values that match your configuration as described above.
-
-    ![Screenshot ARM template parameters file](./09.png)
-
-- Choose the ARM template that matches your operating system, for [*Windows*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azuremonitoragent/ama-windows-template.json) and [*Linux*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azuremonitoragent/ama-linux-template.json), deploy the template by running the following command:
-
-    ```shell
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-file <The ama-**template.json template file location> \
-    --parameters <The ama-template.parameters.json template file location>
-    ```
-
-- Once the template has completed its run, you should see an output as follows:
-
-    ![Screenshot ARM template execution output](./10.png)
-
-- You will have the Azure Monitor Agent (AMA) deployed on your Windows or Linux system and reporting to the Log Analytics workspace that has been created. You can verify by going back to your Azure Arc-enabled server, **Extensions** section:
-
-    ![Screenshot AMA extension on Windows](./11.png)
-
-    ![Screenshot AMA extension on Linux](./12.png)
-
-- Moreover, a **Data Collection Rule (DCR)** is created to send logs from the Azure Arc-enabled servers to the new **Log Analytics workspace**.
-
-    ![Screenshot Data Collection Rules and Log Analytics workspace](./13.png)
-
-- If you click on any of the **Data Collection Rules (DCR)**, you will see the **Resources** attached to it and the collected **Data Sources**.
-
-  - For **Windows**, the following **Data Collection Rule (DCR)** is created. On the **Resources** blade, you will see your Windows Azure Arc-enabled server:
-
-    ![Screenshot Windows Data Collection Rules - Resources](./14.png)
-
-  - On the **Data Sources** blade, you will see two Data Sources, *Performance Counters* and *Windows event logs*:
-
-    ![Screenshot Windows Data Collection Rules - Perf Counters](./15.png)
-
-  - If you click on any of them, you will see the **Data source** that is collected and the **Destination**, which is the Log Analytics workspace created as part of this scenario:
-
-    ![Screenshot Windows Data Collection Rules - Perf Counters - Data Source](./16.png)
-
-    ![Screenshot Windows Data Collection Rules - Perf Counters - Destination](./17.png)
-
-    ![Screenshot Windows Data Collection Rules - Windows Event Logs](./18.png)
-
-    ![Screenshot Windows Data Collection Rules - Windows Event Logs - Data Source](./19.png)
-
-    ![Screenshot Windows Data Collection Rules - Windows Event Logs - Destination](./20.png)
-
-  - For **Linux**, this is the **Data Collection Rule (DCR)** created as part of this scenario. On the **Resources** blade, you will see your Linux Azure Arc-enabled server:
-
-    ![Screenshot Linux Data Collection Rules - Resources](./21.png)
-
-  - On the **Data Sources** blade, you will see two Data Sources, *Performance Counters* and *Linux syslog*:
-
-    ![Screenshot Linux Data Collection Rules - Perf Counters](./22.png)
-
-  - If you click on any of them, you will see the **Data source** that is collected and the **Destination**, which is the Log Analytics workspace created as part of this scenario:
-
-    ![Screenshot Linux Data Collection Rules - Perf Counters - Data Source](./23.png)
-
-    ![Screenshot Linux Data Collection Rules - Perf Counters - Destination](./24.png)
-
-    ![Screenshot Linux Data Collection Rules - Syslog - Destination](./25.png)
-
-    ![Screenshot Linux Data Collection Rules - Syslog - Data Source](./26.png)
-
-    ![Screenshot Linux Data Collection Rules - Syslog - Destination](./27.png)
-
-- Go back to your **resource group** and click on the **Log Analytics Workspace**:
-
-  ![Screenshot Log Analytics workspace](./28.png)
-
-- Click on **Logs**:
-
-  ![Screenshot Log Analytics workspace - Logs](./29.png)
-
-- **Run** the following **query**. It will show you the **data types collected** by the **Azure Monitor Agent (AMA)** on each machine by using the **Data Collection Rules (DCR)**:
-
-  ```shell
-  search * 
-  | distinct Computer, Type
-  | where Type != "Heartbeat" and Type != "Usage"
-  | sort by Computer asc
-  ```
-
-  ![Screenshot Log Analytics workspace - Query](./30.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment:
-
-- [Remove Data Collection Rule Association](https://docs.microsoft.com/powershell/module/az.monitor/remove-azdatacollectionruleassociation?view=azps-8.1.0)
-- [Remove Data Collection Rule](https://docs.microsoft.com/powershell/module/az.monitor/remove-azdatacollectionrule?view=azps-8.1.0)
-- [Uninstall Azure Monitor Agent (AMA)](https://docs.microsoft.com/azure/azure-monitor/agents/azure-monitor-agent-manage?tabs=ARMAgentPowerShell%2CPowerShellWindows%2CPowerShellWindowsArc%2CCLIWindows%2CCLIWindowsArc#uninstall-on-azure-arc-enabled-servers)
-- [Delete the Log Analytics workspace](https://docs.microsoft.com/azure/azure-monitor/logs/delete-workspace#powershell)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_azuresentinel/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_azuresentinel/_index.md
deleted file mode 100644
index aafa621e2a..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_azuresentinel/_index.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-type: docs
-title: "Microsoft Sentinel"
-linkTitle: "Microsoft Sentinel"
-weight: 9
-description: >
----
-
-## Connect Azure Arc-enabled servers to Microsoft Sentinel
-
-The following Jumpstart scenario will guide you on how to onboard Azure Arc-enabled servers on to [Microsoft Sentinel](https://docs.microsoft.com/es-es/azure/sentinel/), so you can start collecting security-related events and start correlating them with other data sources.
-in this scenario, you will enable and configure Microsoft Sentinel on your Azure subscription. To complete this process you will:
-
-- Setup a Log Analytics Workspace where logs and events will be aggregated for analysis and correlation.
-
-- Enable Microsoft Sentinel on the workspace.
-
-- Onboard Azure Arc-enabled servers on Sentinel by using the extension management feature and Azure Policies.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario, as can be seen in the screenshots below, we will be using a Google Cloud Platform (GCP) instance that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled server](./01.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled server detail](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP).
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-- User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameters values are used throughout the deployment.
-
-- User will run the ARM template at resource group level.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fazuresentinel%2Farm%2Fsentinel-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-Microsoft Sentinel uses the Log Analytics agent to collect Windows and Linux server's log files and forwards them to Microsoft Sentinel, the data collected is stored in a Log Analytics workspace. Since you cannot use the default workspace created by Microsoft Defender for Cloud, a custom one is required and you could have raw events and alerts for Defender within the same custom workspace as Sentinel.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- You will need to create a dedicated Log Analytics workspace and enable the Microsoft Sentinel solution on the top of it. For that you can use this [ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azuresentinel/arm/sentinel-template.json) that will create a new Log Analytics Workspace and define the Microsoft Sentinel solution and enable it for the workspace. To automate the deployment edit the ARM template [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/azuresentinel/arm/sentinel-template.parameters.json), provide a name and location for your workspace:
-
-    ![Screenshot showing Azure ARM template](./05.png)
-
-- To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/azuresentinel/arm) and run the below command:
-
-  ```shell
-  az deployment group create --resource-group <Name of the Azure resource group> \
-  --template-file <The *sentinel-template.json* template file location> \
-  --parameters <The *sentinel-template.parameters.json* template file location>
-  ```
-
-For example:
-
-   ![Screenshot showing az deployment group create command](./06.png)
-
-## Azure Arc-enabled VMs onboarding on Microsoft Sentinel
-
-Once you have deployed Microsoft Sentinel on your Log Analytics workspace, you will need to connect data sources to it.
-
-There are connectors for Microsoft services, third party solutions from the Security products ecosystem. You can also use Common Event Format (CEF), Syslog, or REST-API to connect your data sources with Microsoft Sentinel.
-
-For servers and VMs, you can install the Microsoft Monitoring Agent (MMA) agent or the Sentinel agent which collects the logs and forwards them to Microsoft Sentinel. You can deploy the agent in multiple ways by leveraging Azure Arc:
-
-- Using **[Extension Management](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_mma_arm/)**
-
-This feature in Azure Arc-enabled servers allows you to deploy the MMA agent VM extensions to a non-Azure Windows and/or Linux VMs. You can use the Azure Portal, Azure CLI, an ARM template as well as PowerShell script to manage extension deployment to Azure Arc-enabled servers.
-
-- Setting up **[Azure Policies](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/)**
-
-Using this approach, you will assign an Azure Policy to audit if the Azure Arc-enabled Server has the MMA agent installed. If the agent is not installed, you will use the Extensions feature to automatically deploy it to the VM using a Remediation task, an enrollment experience that compares to Azure VMs.
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-- Remove the Log Analytics workspace by executing the following script in AZ CLI. Provide the workspace name you used when creating the Log Analytics Workspace.
-
-    ```shell
-    az monitor log-analytics workspace delete --resource-group <Name of the Azure resource group> --workspace-name <Log Analytics Workspace Name> --yes
-    ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_datadog/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_datadog/_index.md
deleted file mode 100644
index 2676f15bbe..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_datadog/_index.md
+++ /dev/null
@@ -1,139 +0,0 @@
----
-type: docs
-title: "Monitoring Azure Arc-enabled servers with Datadog"
-linkTitle: "Monitoring Azure Arc-enabled servers with Datadog"
-weight: 19
-description: >
----
-
-## Monitoring Azure Arc-enabled servers with Datadog
-
-The following Jumpstart scenario will guide you on how to onboard an Azure Arc-enabled server on to [Datadog](https://www.datadoghq.com/), so you can get insights into Arc environments with Datadog, visualize host status and identify any disconnected hosts across your hybrid infrastructure, set up Datadog monitors to alert you immediately when this connection status is no longer healthy, simplifying hybrid and multi-cloud management.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario, as can be seen in the screenshots below, we will be using an Azure VM that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server](./01.png)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server detail](./02.png)
-
-- Note that there is no Datadog extension on the Arc-enabled server
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server extensions](./03.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.42.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Get a Datadog account. You can either use a preexisting one or create a [Datadog free trial](https://www.datadoghq.com/free-datadog-trial/) for 14 days.
-
-    ![Screenshot create Datadog Free Trial](./04.png)
-
-    ![Screenshot create Datadog Free Trial](./05.png)
-
-## Automation Flow
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-- User gets information from their Datadog account and provides it in the variables of the script. These variables values are used throughout the deployment.
-
-- User will run PowerShell script.
-
-## Datadog VM extension deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the variables section on the script to match your environment. You will need to provide:
-
-  - resourceGroup: name of the resource group of your Azure Arc-enabled server.
-  - machineName: name of the Azure Arc-enabled server.
-  - location: Azure region where your Azure Arc-enabled server is connected to.
-  - osType: operating system of your Azure Arc-enabled server. You can choose between "Windows" or "Linux", be mindful this is case sensitive.
-  - datadog_site: location of your Datadog site. You can identify which site you are on by matching your Datadog website URL to the site URL in the [table](https://docs.datadoghq.com/getting_started/site/).
-  - datadog_api_key: provide your organization's unique API key, this is required by the Datadog Agent to submit metrics and events to Datadog. You can add a Datadog key following [these steps](https://docs.datadoghq.com/account_management/api-app-keys/#add-an-api-key-or-client-token).
-  - app_Id: your service principal ID.
-  - app_secret: your service principal secret.
-  - subscription_id: your Azure subscription ID.
-  - tenantId: your Azure AD tenant.
-
-- To run the PowerShell script, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/datadog/) and run the below command:
-
-  ```powershell
-    .\datadog.ps1
-  ```
-
-- Once the script finishes its run, check the extension section of your Azure Arc-enabled server, you should see the Datadog extension deployed
-
-    ![Screenshot create Datadog Free Trial](./06.png)
-
-- Now that you have successfully onboarded the Arc-enabled server, go back to your Datadog dashboard and you should see one more agent reporting metrics:
-
-    ![Screenshot create Datadog agent](./07.png)
-
-    ![Screenshot create Datadog agent](./08.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_defender/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_defender/_index.md
deleted file mode 100644
index 914408c924..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_defender/_index.md
+++ /dev/null
@@ -1,199 +0,0 @@
----
-type: docs
-title: "Microsoft Defender for Cloud"
-linkTitle: "Microsoft Defender for Cloud"
-weight: 8
-description: >
----
-
-## Connect Azure Arc-enabled servers to Microsoft Defender for Cloud
-
-The following Jumpstart scenario will guide you on how to onboard an Azure Arc-enabled server on to [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/), so you can start collecting security-related configurations as well as event logs to recommend actions and improve your overall Azure security posture.
-
-Microsoft Defender for Cloud is Microsoft's integrated cloud workload protection platform, it provides advance thread protection for Azure and hybrid resources. To access Microsoft Defender for Cloud you need to enable the plan on Microsoft Defender for Cloud.
-
-in this scenario, you will enable and configure Microsoft Defender for Cloud on your Azure subscription, which will provide you with advanced threat protection (ATP) and detection capabilities for your hybrid resources. To complete this process you will:
-
-- Setup a Log Analytics Workspace where logs and events will be aggregated for analysis.
-
-- Enable Microsoft Defender for Cloud.
-
-- Assign Microsoft Defender for Cloud’s default security policies.
-
-- Review Microsoft Defender for Cloud recommendations.
-
-- Apply recommended configurations on Azure Arc-enabled servers using the ***Quick Fix*** remediations.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario, as can be seen in the screenshots below, we will be using a Google Cloud Platform (GCP) instance that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server](./01.png)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server detail](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-- User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameters values are used throughout the deployment.
-
-- User will run the ARM template at resource group level.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fdefender%2Farm%2Flog_analytics-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Data collected by Microsoft Defender for Cloud is stored in a Log Analytics workspace. You can either use the default one created by Defender or a custom one created by you. If you want to create a dedicated workspace, you can automate the deployment by editing the ARM template [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/defender/arm/log_analytics-template.parameters.json), provide a name and location for your workspace:
-
-    ![Screenshot showing Azure ARM template](./05.png)
-
-- To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/defender/arm) and run the below command:
-
-  ```shell
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-file <The *log_analytics-template.json* template file location> \
-    --parameters <The *log_analytics-template.parameters.json* template file location>
-  ```
-
-- If you are going for an user-defined workspace, you should instruct Microsoft Defender for Cloud to use it instead of the default one, use the below command:
-
-  ```shell
-    az security workspace-setting create --name default \
-    --target-workspace '/subscriptions/<Your subscription ID>/resourceGroups/<Name of the Azure resource group>/providers/Microsoft.OperationalInsights/workspaces/<Name of the Log Analytics Workspace>'
-  ```
-
-- Microsoft Defender for Cloud is enabled on all your Azure subscriptions by default and will provide continuous security assessment and actionable security recommendations. In this scenario, you will use Microsoft Defender for Cloud for Virtual Machines that extends these capabilities providing unified security management and threat protection across your hybrid cloud workloads. To enable Microsoft Defender for Cloud for VMs run the command below:
-
-    ```shell
-    az security pricing create -n VirtualMachines --tier 'standard'
-    ```
-
-- Now you need to assign the default Microsoft Defender for Cloud policy initiative. Defender makes its security recommendations based on policies. There is an specific initiative that groups Microsoft Defender for Cloud policies with the definition ID '1f3afdf9-d0c9-4c3d-847f-89da613e70a8'. The command below will assign the Defender initiative to your subscription:
-
-    ```shell
-    az policy assignment create --name 'ASC Default <Your subscription ID>' \
-    --scope '/subscriptions/<Your subscription ID>' \
-    --policy-set-definition '1f3afdf9-d0c9-4c3d-847f-89da613e70a8'
-    ```
-
-## Azure Arc and Microsoft Defender for Cloud Integration
-
-Now that you have successfully onboarded Microsoft Defender for Cloud, you will get recommendations to help you protect your resources, including your Azure Arc-enabled servers. Microsoft Defender for Cloud will then periodically analyze the security state of your Azure resources to identify potential security vulnerabilities.
-
-Microsoft Defender for Cloud will collect data from your Arc-enabled servers to monitor for security vulnerabilities and threats. The data collection will allow greater visibility into missing updates, non-secure OS settings, endpoint protection status, health and threat protection. You will get recommendations even if you do not provision an agent, however to fully benefit it is recommended to install the Log Analytics agent. The agent will read security-related configurations and event logs from the Arc-enabled server and send the data to the corresponding Log Analytics workspace where you enabled Microsoft Defender for Cloud. To install the agent on your Arc-enabled server you can use the extension management feature as it is described [here](https://github.com/microsoft/azure_arc/blob/main/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_mma_arm/_index.md) or by configuring policies as shown [here](https://github.com/microsoft/azure_arc/blob/main/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/_index.md)
-
->**NOTE: it may take upto 30 minutes for your Azure Arc-enabled server to be shown in Microsoft Defender for Cloud Dashboard**
-
-- Once you have configured your workspace and deployed the MMA agent, using the [Azure Portal](https://portal.azure.com/) navigate to Microsoft Defender for Cloud. In the "Inventory" section under "VM and Servers", Defender will provide you with an overview of all the discovered security recommendations for your VMs and computers, including Azure VMs, Azure Classic VMs, servers and **Azure Arc Machines**.
-
-    ![Screenshot showing Microsoft Defender for Cloud Inventory](./06.png)
-
-- Select your Azure Arc-enabled server, Microsoft Defender for Cloud will provide security recommendation. Each of them will include:
-  - A short description of what is being recommended.
-  - A secure score impact.
-  - The remediation steps to carry out in order to implement the recommendation. For specific recommendations, you may also get a ***Quick Fix*** that enables you to quickly remediate a recommendation on multiple resources.
-
-    ![Screenshot showing Defender recommendation on Azure Arc-enabled server](./07.png)
-
-- For this Azure Arc-enabled server the recommendation "A vulnerability assessment solution should be enabled on your virtual machine" provides a ***Quick Fix***. It is using an ARM template to deploy the an extention to enable a vulnerability assessment solution on the Azure Arc machine.
-
-    ![Screenshot showing Defender Quick Fix ARM template](./08.png)
-
-- You can trigger the remediation and selecting: "Deploy the integrated vulnerability scanner powered by Qualys (included with Microsoft Defender for servers)" and clicking on "Proceed", select the Azure Arc-enabled server and click on "Fix 1 resource".
-
-    ![Screenshot showing triggering of remediation step of Defender](./08.png)
-
-- After you apply the recommendation it will be now marked as healthy.
-
-    ![Screenshot showing healthy Azure Arc-enabled server](./10.png)
-
-> **NOTE:It can take several minutes after remediation completes to see the resources in the 'healthy resources' tab**
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-- Remove the Log Analytics workspace by executing the following script in AZ CLI. Provide the workspace name you used when creating the Log Analytics Workspace.
-
-    ```shell
-    az monitor log-analytics workspace delete --resource-group <Name of the Azure resource group> --workspace-name <Log Analytics Workspace Name> --yes
-    ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_extended_security_updates/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_extended_security_updates/_index.md
deleted file mode 100644
index c350856380..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_extended_security_updates/_index.md
+++ /dev/null
@@ -1,194 +0,0 @@
----
-type: docs
-title: "Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server 2012 and SQL Server 2012"
-linkTitle: "Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server and SQL Server 2012"
-weight: 1
-description: >
----
-
-## Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server and SQL Server 2012
-
-The following Jumpstart scenario will guide you on how to use Azure Arc to enroll Windows Server 2012/2012 R2 and SQL Server (Standard 2012) machines in [Extented Security Updates (ESUs)](https://learn.microsoft.com/windows-server/get-started/extended-security-updates-overview). This scenario creates an Azure VM with Hyper-V installed where the Windows Server and/or SQL Server VMs will run and will be onboard as Azure Arc-enabled server and/or Azure Arc-enabled SQL Server respectively. Once these VMs are registered in Azure you will have visibility into their ESU coverage and can enroll them through the Azure portal one month before Windows Server 2012 end of support.
-
-In this scenario, you can choose between working with Windows Server 2012 R2, SQL Server 2012 Standard Edition, or both. For a detailed deployment of Extended Security Updates for SQL Server 2012 make sure to use the [SQL Server ESU scenario](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/day2/esu/).
-
-**NOTE: In this scenario, ESU licenses are not provided or created, and will require you to provision them separately. The scenario will however create Windows Server 2012 R2 and/or SQL Server 2012 (Standard) machines that are connected to Azure Arc that you will be able to enroll on Extended Security Updates via the Azure portal and get billed monthly via your Azure subscription.**
-
-## Prerequisites
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User provides the Bicep template parameter values, either via the portal or editing the parameters file. These parameters values are used throughout the deployment.
-
-- User will run the Bicep template at resource group level.
-
-- User logs in to the Azure VM using Azure Bastion or RDP to trigger the Logon script. The script will:
-  - Install Hyper-V
-  - Create Windows and/or SQL VMs in Hyper-V
-  - Onboard the Hyper-V VMs as Arc-enabled resources
-
-## Bicep template deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the parameter file to match your environment. You will need to provide:
-  - _`spnClientId`_: the AppId of the service principal you created before.
-  - _`spnClientSecret`_: the password of the service principal you created before.
-  - _`spnTenantId`_: your Azure AD's tenant ID.
-  - _`windowsAdminUsername`_: Windows admin username for your Azure VM.
-  - _`windowsAdminPassword`_: password for the Windows admin username.
-  - _`deployBastion`_: whether or not you'd like to deploy Azure Bastion to access the Azure VM. Values can be "true" or "false"
-  - _`esu`_: this parameter will allow you to control what VMs will be deployed. It can be either:
-    - _`ws`_: to only deploy a Windows Server 2012 R2 VM that will be registered as an Arc-enabled server.
-    - _`sql`_: to only deploy a SQL Server 2012 Standard Edition VM that will be registered as an Arc-enabled SQL Server.
-    - _`both`_: to deploy both a Windows Server 2012 R2 VM and a SQL Server 2012 Standard Edition VM that will be Arc-enabled.
-
-    > **NOTE: Make sure to set the _esu_ parameter to _ws_ or _both_ to have an Arc-enabled server deployed.**
-
-  ![Screenshot of Parameters file](./01.png)
-
-- To run the automation, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/esu/bicep). From the deployment folder run the below command:
-
-  ```shell
-    az group create --name "<resource-group-name>"  --location "<preferred-location>"
-    az deployment group create -g "<resource-group-name>" \
-    -f "main.bicep" -p "main.parameters.json"
-  ```
-
-    For example:
-
-  ```shell
-    az group create --name Arc-ESU-Demo --location "westeurope"
-    az deployment group create --resource-group Arc-ESU-Demo \
-    --name Arc-ESU-Demo --template-file main.bicep \
-    --parameters main.parameters.json
-  ```
-
-- Once the automation finishes its run, you should see an output as follows:
-
-  ![Screenshot of automation output](./02.png)
-
-- After the script has finished its run verify the resources are created on the Azure Portal:
-
-    ![Screenshot of resources created on resource group](./03.png)
-
-    ![Screenshot of resources created on resource group](./04.png)
-
-## Windows Login & Post Deployment
-
-- Now that the Azure Windows Server VM is created, it is time to connect to it using either RDP or Azure Bastion.
-
-    ![Screenshot of Azure Bastion session 01](./05.png)
-
-    ![Screenshot of Azure Bastion session 02](./06.png)
-
-    ![Screenshot of Azure Bastion session 03](./07.png)
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-    ![Screenshot of script's output](./08.png)
-
-    ![Screenshot of script's output](./09.png)
-
-    ![Screenshot of script's output](./10.png)
-
-    ![Screenshot of script's output](./11.png)
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~10-15 min long.**
-
-- Upon successful run, a new Azure Arc-enabled server and/or Azure Arc-enabled SQL Server will be added to the resource group.
-
-  ![Screenshot Azure Arc-enabled resources on resource group](./12.png)
-
-- Now that you have successfully onboarded the Arc-enabled resources, you will be able to manage the Extended Security Updates (ESU) from the Azure Portal:
-
-## Extended Security Updates (ESU)
-
-Now that you have Windows Server 2012 R2 and/or SQL Server 2012 Arc-enabled, you are able to manage ESU licenses for these servers.
-
-- Navigate to the Azure Arc page
-
-  ![Screenshot Azure Arc navigate](./13.png)
-
-- Select Extended Security Updates in the left pane.
-
-  ![Screenshot Azure Arc Extended](./14.png)
-
-- Provision Windows Server 2012 and 2012 R2 Extended Security Update licenses from Azure Arc.
-
-  ![Screenshot ESU Licenses](./15.png)
-
-  ![Screenshot ESU Licenses](./16.png)
-
-- Select one or more Arc-enabled servers to link to an Extended Security Update license.
-
-  ![Screenshot Enable ESU Licenses](./17.png)
-
-**NOTE: If you chose to deploy Azure Arc-enabled SQL Server exclusively or together with Windows Server, verify that the databases are being discovered. If the databases are not shown in the Azure Portal, follow these steps to fix it.**
-
-- Select the Azure Arc-enabled SQL Server.
-
- ![Screenshot Azure Arc-enabled SQL Server resource](./18.png)
-
-- Select "Databases" under "Data Management". Click on "Change License Type".
-
- ![Screenshot Azure Arc-enabled SQL Server resource](./19.png)
-
- ![Screenshot Change License Type](./20.png)
-
-- Choose "License with Software Assurance".
-
- ![Screenshot software assurance](./21.png)
-
-- The databases will be discovered and shown in the Azure Portal after a few seconds.
-
- ![Screenshot Databases in Portal](./22.png)
-
-## Clean up environment
-
-To clean up your deployment, simply delete the resource group from the portal.
-
-![Screenshot of Azure Resource Group delete](./23.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_grafana/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_grafana/_index.md
deleted file mode 100644
index c2c9103b65..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_grafana/_index.md
+++ /dev/null
@@ -1,172 +0,0 @@
----
-type: docs
-title: "Grafana and Azure Monitor Agent (AMA)"
-linkTitle: "Grafana and Azure Monitor Agent (AMA)"
-weight: 18
-description: >
----
-
-## Dashboard visualization on Azure Arc-enabled servers with Azure Managed Grafana and Azure Monitor Agent
-
-The following scenario will guide you on how to deploy the [Azure Monitor Agent (AMA)](https://docs.microsoft.com/azure/azure-monitor/agents/azure-monitor-agent-overview) as an extension on your Windows Azure Arc-enabled servers, as well as deploying Azure Managed Grafana for dashboard visualization to extend monitoring capabilities across hybrid multi-cloud and on-premises environments. [Azure Managed Grafana](https://azure.microsoft.com/services/managed-grafana/#overview) is a fully managed service for analytics and monitoring solutions.
-
-  > **NOTE: This scenario assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Please review the [Azure Monitor Agent (AMA) supported OS documentation](https://docs.microsoft.com/azure/azure-monitor/agents/agents-overview#supported-operating-systems) and ensure that the VMs you will use for this exercise are supported.
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshots below, you can see a Windows server that have been connected with Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot of Azure Arc-enabled servers on resource group](./01.png)
-
-    ![Screenshot of Windows Azure Arc-enabled server connected status](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-1. User provides the ARM template parameter values, either via the portal or by editing the parameters file. These parameter values are used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User is verifying the successful deployment of Log Analytics workspace, Azure Managed Grafana, AMA extension, and data collection rules creation.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fgrafana%2Fgrafana-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  > **NOTE:** Use the following command to get the AAD id of the current signed in user and copy it to the Grafana Adminprincipal Id parameter:
-
-  ```shell
-  az ad signed-in-user show --query id -o tsv
-  ```
-
-  ![Screenshot showing Azure portal deployment with required parameters](./03.png)
-
-  ![Screenshot showing successful Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [_parameters file_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/grafana/grafana-template.parameters.json) providing the values that match your configuration as described above.
-
-    ![Screenshot of ARM template parameters file](./05.png)
-
-- Locate the [_ARM template_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/grafana/grafana-template.json) and deploy it by running the following command:
-
-    ```shell
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-uri "https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/grafana/grafana-template.json" \
-    --parameters <grafana-template.parameters.json parameter file location>
-    ```
-
-- Once the template has completed its run, you should see an output as follows:
-
-    ![Screenshot of ARM template execution output](./06.png)
-
-- You will have the Azure Monitor Agent (AMA) deployed on your Windows or Linux system and reporting to the Log Analytics workspace that has been created. You can verify by going back to your Azure Arc-enabled server, **Extensions** section:
-
-    ![Screenshot of AMA extension on Windows](./07.png)
-
-- Moreover, a **Data Collection Rule (DCR)** is created to send logs from the Azure Arc-enabled servers to the new **Log Analytics workspace**. In addition, the **Azure Managed Grafana** service is deployed which we will explore later in this scenario.
-
-    ![Screenshot of Data Collection Rules and Log Analytics workspace](./08.png)
-
-- Note that the template deployment has also created a required role assignment at the resource group level. It will be used by **Azure Managed Grafana** to be able to access your monitoring data from its **Managed Identity**:
-
-    ![Screenshot showing Access control (IAM) blade](./09.png)
-
-- If you click on the **Data Collection Rule (DCR)**, you will see the **Resources** attached to it and the collected **Data Sources**.
-
-  - On the **Resources** blade, you will see your Windows Azure Arc-enabled server:
-
-    ![Screenshot of Windows Data Collection Rules - Resources](./10.png)
-
-  - On the **Data Sources** blade, you will see _Performance Counters_
-
-    ![Screenshot of Windows Data Collection Rules - Perf Counters](./11.png)
-
-  - If you click on _Performance Counters_, you will see the **Data source** that is collected and the **Destination**, which is the Log Analytics workspace created as part of this scenario:
-
-    ![Screenshot of Windows Data Collection Rules - Perf Counters - Data Source](./12.png)
-
-    ![Screenshot of Windows Data Collection Rules - Perf Counters - Destination](./13.png)
-
-- Go back to your **resource group** and click on the **Log Analytics Workspace**:
-
-  ![Screenshot of Log Analytics workspace](./14.png)
-
-- Click on **Logs** and close the **Queries** pop-up window:
-
-  ![Screenshot of Log Analytics workspace - Logs section](./15.png)
-
-- **Run** the following **query**. It will show you the **data types collected** by the **Azure Monitor Agent (AMA)** on each machine by using the **Data Collection Rules (DCR)**:
-
-  ```shell
-  search * 
-  | distinct Computer, Type
-  | where Type != "Heartbeat" and Type != "Usage"
-  | sort by Computer asc
-  ```
-
-  ![Screenshot of Log Analytics workspace - Query](./16.png)
-
-- It is time to explore **Azure Managed Grafana** and the included sample dashboard. Go back to your **resource group** and click on **Azure Managed Grafana**:
-
-  ![Screenshot of Azure Managed Grafana resource group](./17.png)
-
-- In the **Azure Managed Grafana** overview click on the **Endpoint** url to open the Grafana web interface.
-
-    > **NOTE: Authenticate to Grafana with the user account name you provided in the template deployment (_grafanaAdminprincipalId_) or add your current user account name to one of the Azure Role-based access control (RBAC) roles: _Grafana Admin_, _Grafana Editor_, _Grafana Viewer_**.
-
-  ![Screenshot showing Azure Managed Grafana endpoint location](./18.png)
-
-- Click on **Dashboards** and expand **Azure Monitor** to explore the included sample dashboards. Click on **Azure / Insights / Virtual Machines by Workspace**.
-
-  ![Screenshot of Azure Managed Grafana Dashboards navigation area](./19.png)
-
-- Finally, explore the included panels with monitoring data from your **Log Analytics workspace** and Azure Arc-enabled server.
-
-  ![Screenshot of Azure Managed Grafana Virtual Machine by Workspace sample dashboard](./20.png)
-
-- As an added bonus, you also have the flexibility to use Azure Monitor and Virtual Machine Insights to visualize the monitoring data collected by **Azure Monitor Agent (AMA)**.
-
-  ![Screenshot of Azure Monitor Virtual Machines Insights](./21.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment:
-
-- [Remove Data Collection Rule Association](https://docs.microsoft.com/powershell/module/az.monitor/remove-azdatacollectionruleassociation?view=azps-8.1.0)
-- [Remove Data Collection Rule](https://docs.microsoft.com/powershell/module/az.monitor/remove-azdatacollectionrule?view=azps-8.1.0)
-- [Uninstall Azure Monitor Agent (AMA)](https://docs.microsoft.com/azure/azure-monitor/agents/azure-monitor-agent-manage?tabs=ARMAgentPowerShell%2CPowerShellWindows%2CPowerShellWindowsArc%2CCLIWindows%2CCLIWindowsArc#uninstall-on-azure-arc-enabled-servers)
-- [Delete the Log Analytics workspace](https://docs.microsoft.com/azure/azure-monitor/logs/delete-workspace#powershell)
-- [Delete Azure Managed Grafana instance](https://learn.microsoft.com/cli/azure/grafana?view=azure-cli-latest#az-grafana-delete)
-
-As an alternative you can use this [_clean-up script_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/grafana/grafana-cleanup-script.sh). Edit the variables in the script to fit your environment.
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_inventory_management/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_inventory_management/_index.md
deleted file mode 100644
index 0355797e77..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_inventory_management/_index.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-type: docs
-title: "Inventory Management"
-linkTitle: "Inventory Management"
-weight: 3
-description: >
----
-
-## Azure Arc-enabled servers inventory management using Resource Graph Explorer
-
-This scenario will guide you on how to use Azure Arc-enabled servers to provide server inventory management capabilities across hybrid multi-cloud and on-premises environments.
-
-Azure Arc-enabled servers allows you to manage your Windows and Linux machines hosted outside of Azure on your corporate network or other cloud provider, similarly to how you manage native Azure virtual machines. When a hybrid machine is connected to Azure, it becomes a connected machine and is treated as a resource in Azure. Each connected machine has a Resource ID, it is managed as part of a resource group inside a subscription, and benefits from standard Azure constructs such as Azure Policy and applying tags. The ability to easily organize and manage server inventory using Azure as a management engine greatly reduces administrative complexity and provides a consistent strategy for hybrid and multi-cloud environments.
-
-In this scenario, we will use [Resource Graph Explorer](https://docs.microsoft.com/azure/governance/resource-graph/overview) to demonstrate querying server inventory across multiple clouds from a single pane of glass in Azure.
-
-> **NOTE: This scenario assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned before, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc.
-
-## Apply resource tags to Azure Arc-enabled servers
-
-In this first step, we will assign Azure resource tags to some of your Azure Arc-enabled servers. This gives you the ability to easily organize and manage server inventory.
-
-- Enter **Servers - Azure Arc** in the top search bar in the Azure portal and select it.
-
-  ![Screenshot showing All Services Azure Arc-enabled servers in the portal](./1.png)
-
-- Click on any of your Azure Arc-enabled servers:
-
-  ![Screenshot showing all Azure Arc-enabled servers](./2.png)
-
-- Click on **Tags**. Add a new tag with **Name="Scenario"** and **Value="jumpstart_azure_arc_servers_inventory"**. Click **Apply** when ready.
-
-  ![Screenshot showing how to apply a tag to an Azure Arc-enabled server](./3.png)
-
-- Repeat the same process in other Azure Arc-enabled servers. This new tag will be used later when working with Resource Graph Explorer queries.
-
-## Using Resource Graph Explorer to Review Server Inventory
-
-We will use Resource Graph Explorer to query our hybrid server inventory.
-
-- Enter **Resource Graph Explorer** in the top search bar in the Azure portal and select it.
-
-  ![Screenshot showing Resource Graph Explorer in Azure Portal](./4.png)
-
-  ![Screenshot showing Resource Graph Explorer main page](./5.png)
-
-- Scope Azure Resource Graph Explorer to the Directory, Management Group or Subscription where you have your Azure Arc-enabled servers. In this case, we will work at Directory level. Click **Apply** when finished.
-
-  ![Screenshot showing Resource Graph Explorer scope](./6.png)
-
-- In the query window, run the following query that will show you all Azure Arc-enabled servers in your subscription. Enter the query and then click **Run Query**:
-
-  ```shell
-  Resources
-  | where type =~ 'Microsoft.HybridCompute/machines'
-  ```
-
-  ![Screenshot showing Resource Graph Explorer first query](./7.png)
-
-- You should see your Azure Arc-enabled servers in the results pane. Toggle the **Formatted Results** switch for a cleaner table:
-
-  ![Screenshot showing Resource Graph Explorer query results for Azure Arc-enabled servers](./8.png)
-
-- Still on the results pane, go to the right and click on the **See details** link of any of the results:
-
-  ![Screenshot showing Resource Graph Explorer query results See details link](./9.png)
-
-- Here you can see all the Azure Arc-enabled server metadata that you can query using Resource Graph explorer:
-
-  ![Screenshot showing Resource Graph Explorer Azure Arc-enabled servers metadata](./10.png)
-
-- For example, by leveraging that metadata, you could run the following query to get the number of Azure Arc-enabled servers hosted in _Amazon Web Services (AWS)_ or in _Google Cloud Platform (GCP)_:
-
-  ```shell
-  Resources
-  | where type =~ 'Microsoft.HybridCompute/machines'
-  | extend cloudProvider = tostring(properties.detectedProperties.cloudprovider)
-  | where  cloudProvider in ("AWS", "GCP")
-  | summarize serversCount = count() by cloudProvider
-  ```
-
-  ![Screenshot showing Resource Graph Explorer cloud providers query](./11.png)
-
-- Moreover, you could render those results using the available **Charts**:
-
-  ![Screenshot showing Resource Graph Explorer cloud providers query chart](./12.png)
-
-- Let's now build a query that uses the tag we assigned before to some of our Azure Arc-enabled servers. Use the following query that includes a check for resources that have a value for the **Scenario** tag:
-
-  ```shell
-  Resources
-  | where type =~ 'Microsoft.HybridCompute/machines' and isnotempty(tags['Scenario'])
-  | extend Scenario = tags['Scenario']
-  | project name, tags
-  ```
-
-  ![Screenshot showing Resource Graph Explorer query results for tags](./13.png)
-
-- We can also use Resource Graph Explorer to list extensions installed on our Azure Arc-enabled servers:
-
-  ```shell
-  Resources
-  | where type == 'microsoft.hybridcompute/machines'
-  | project id, JoinID = toupper(id), ComputerName = tostring(properties.osProfile.computerName), OSName = tostring(properties.osName)
-  | join kind=leftouter(
-      Resources
-      | where type == 'microsoft.hybridcompute/machines/extensions'
-      | project MachineId = toupper(substring(id, 0, indexof(id, '/extensions'))), ExtensionName = name
-  ) on $left.JoinID == $right.MachineId
-  | summarize Extensions = make_list(ExtensionName) by id, ComputerName, OSName
-  | order by tolower(OSName) desc
-  ```
-
-  ![Screenshot showing Resource Graph Explorer query results for extensions](./14.png)
-
-- As mentioned before, Azure Arc provides additional properties on the Azure Arc-enabled server resource that we can query with Resource Graph Explorer. In the following example, we list some of these key properties, like the Azure Arc Agent version installed on your Azure Arc-enabled servers:
-
-  ```shell
-  Resources
-  | where type =~ 'Microsoft.HybridCompute/machines'
-  | extend arcAgentVersion = tostring(properties.['agentVersion']), osName = tostring(properties.['osName']), osVersion = tostring(properties.['osVersion']), osSku = tostring(properties.['osSku']),
-  lastStatusChange = tostring(properties.['lastStatusChange'])
-  | project name, arcAgentVersion, osName, osVersion, osSku, lastStatusChange
-  ```
-
-  ![Screenshot showing Resource Graph Explorer query results for additional properties](./15.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- Remove the virtual machines from each environment by following the teardown instructions from each scenario.
-
-  - **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-  - **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-  - **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-  - **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-  - **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-  - **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-  - **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-  - **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-  - **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-  - **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_keyvault/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_keyvault/_index.md
deleted file mode 100644
index 1d206e1291..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_keyvault/_index.md
+++ /dev/null
@@ -1,188 +0,0 @@
----
-type: docs
-title: "Key Vault Integration"
-linkTitle: "Key Vault Integration"
-weight: 7
-description: >
----
-
-## Deploy Azure Key Vault Extension to Azure Arc-enabled Ubuntu server and use a Key Vault managed certificate with Nginx
-
-The scenario will show you how to onboard the [Azure Key Vault](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) extension on an Azure Arc-enabled server, and then use a certificate managed by Azure Key Vault to secure web traffic with TLS on a web server.
-
-in this scenario, we will focus on securing an Ubuntu web server. The only prerequisite you need to complete for this scenario is an existing Azure Arc-enabled server running Ubuntu 18.04 (other Ubuntu releases may also work but have not been tested).
-
-> **NOTE: This guide assumes you already deployed an Ubuntu server that is running on-premises or in other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. For this scenario, as can be seen in the screenshots below, we will be using an Amazon Web Services (AWS) EC2 instance that has been already connected to Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot showing EC2 instance in AWS console](./01.png)
-
-    ![Screenshot showing Azure Arc-enabled server](./02.png)
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-## Create an Azure Key Vault and a new self-signed certificate
-
-First, we will create a new Azure resource group, Azure Key Vault and a self-signed certificate from an Az CLI.
-
-- Create a new resource group to hold the key vault resource.
-
-    ```shell
-    az group create --name <name for your resource group> --location <location for your resource group>
-    ```
-
-    ![Screenshot of creating a resource group from Az CLI](./03.png)
-
-- Create a new key vault resource. Note that key vault names must be globally unique.
-
-    ```shell
-    az keyvault create --name <name for your keyvault> --location <location> --resource-group <name of your resource group>
-    ```
-
-    ![Screenshot of creating a keyvault from Az CLI](./04.png)
-
-- Create a new self-signed certificate with keyvault.
-
-    ```shell
-    az keyvault certificate create --vault-name arckeyvault1 -n cert1 -p "$(az keyvault certificate get-default-policy)"
-    ```
-
-    ![Screenshot of creating a self-signed certificate from Az CLI](./05.png)
-
-## Install and configure Nginx on your Azure Arc-enabled Ubuntu server
-
-We will use the Azure Custom Script extension on your Azure Arc-enabled server to install and configure an Nginx web server. Before installing Nginx, we must open the right inbound ports on our AWS EC2 instance's security group. Then we will deploy an ARM template that will use the custom script extension to install Nginx.
-
-- Navigate to your EC2 instance on the AWS cloud console and open the "allow-all-sg" security group.
-
-    ![Screenshot of an EC2 instance in AWS cloud console](./06.png)
-
-- Click on the "Inbound" tab of the security group and then click "Edit".
-
-    ![Screenshot of a security group in AWS cloud console](./07.png)
-
-    ![Screenshot of a security group in AWS cloud console](./08.png)
-
-- Click "Add Rule" and add HTTP and HTTPS rules, keeping all the default seeings as seen in the screenshot. Click Save.
-
-    ![Screenshot of adding a security group rule in AWS cloud console](./09.png)
-
-    ![Screenshot of added a security group rule in AWS cloud console](./10.png)
-
-- Configure Key Vault to allow Azure Arc-enabled server to access secrets
-
-  - Navigate to your Key Vault and open the "Access Policies" blade
-
-    ![Screenshot of the Access Policies blade in a Key Vault](./11.png)
-
-  - Click "Add access policy" and in the dropdown for "Secret Permissions" check Get and List.
-
-    ![Screenshot showing "Add access policy" for Key Vault](./12.png)
-
-  - Next to "Select principal" Click "None selected" and search for your Azure Arc-enabled server machine name and select it.
-
-    ![Screenshot showing "Add access policy" for Key Vault](./13.png)
-  
-  - Click "Save" to commit the changes.
-
-    ![Screenshot showing "Add access policy" for Key Vault](./14.png)
-
-- Use Custom Script extension to install Nginx and configure Key Vault extension
-
-  - Modify the values of nginx-keyvault.parameters.json for the following parameters with values for your environment:
-
-    ![Screenshot showing example parameters for nginx-keyvault.parameters.json](./15.png)
-
-  - Run the deployment with the following Az CLI command.
-
-    ```shell
-    az deployment group create --resource-group <name of your resource group> --template-file nginx-keyvault.json --parameters nginx-keyvault.parameters.json
-    ```
-
-    ![Screenshot showing ARM deployment completing](./16.png)
-
-- SSH into your Azure Arc-enabled server to update the Nginx configuration to use the certificate.
-
-  ![Screenshot showing SSH into Azure Arc-enabled server](./17.png)
-
-  - Open */etc/nginx/conf.d/ssl.conf*  using nano or your preferred text editor.
-
-    ```shell
-    nano /etc/nginx/conf.d/ssl.conf
-    ```
-
-    ![Screenshot showing nano editing /etc/nginx/conf.d/ssl.conf](./18.png)
-
-  - Edit the file updating the following lines with the correct path to your certificate.
-
-    ```shell
-    ssl_certificate /etc/ssl/certs/<your cert filename>;
-    ssl_certificate_key /etc/ssl/certs/<your cert filename>;
-    ```
-  
-    Your filename will be of the format 'keyvault_name'.'certificate_name' (all lowercase). For example, if your Key Vault is named "myKeyVault" and your certificate is named "cert1" then your filename will be "mykeyvault.cert1". See the screens below for a before and after example.
-
-    ![Screenshot showing unedited /etc/nginx/conf.d/ssl.conf](./19.png)
-
-    ![Screenshot showing edited /etc/nginx/conf.d/ssl.conf](./20.png)
-
-  - Restart the nginx service by running the following command.
-
-    ```shell
-    sudo service nginx restart
-    ```
-
-    ![Screenshot showing restart of nginx service](./21.png)
-
-- Test everything by accessing your Nginx webserver over HTTPS. Open a browser and enter "https://XX.XX.XX.XX" into the address bar, replacing the placeholder with the public IP address of your server.
-
-  - You should see a warning describing that your connection is not private or secure. The message will vary depending on which web browser you use.
-
-    ![Screenshot showing accessing web server in browser](./22.png)
-
-  - If you are using Microsoft Edge, you can validate that your certificate is being used by comparing the certificate thumbprint reported in the browser with your certificate thumbprint in Key Vault, as seen in the screenshots below. Click the "Not secure" box to the left of the address bar, then click "Certificate (not valid)" and open the "Details" tab to view the thumbprint.
-
-    ![Screenshot showing browser certificate thumbprint](./23.png)
-
-    ![Screenshot showing browser certificate thumbprint](./24.png)
-
-    ![Screenshot showing Key Vault certificate thumbprint](./25.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-- Delete the key vault resource by running the following command in Az CLI.
-
-  ```shell
-  az keyvault delete --name <name of your keyvault>
-  ```
-
-  ![Screenshot showing Key Vault being deleted from Az CLI](./26.png)
-
-- Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-  - **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-  - **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-  - **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-  - **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-  - **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/_index.md
deleted file mode 100644
index dedd0ae69b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/_index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-type: docs
-title: "Managed Identity"
-linkTitle: "Managed Identity"
-weight: 13
-description: >-
----
-
-## Using Managed Identity on Azure Arc-enabled servers
-
-The scenarios in this section will walk you through how to work with the Hybrid Instance Metadata Service on an Azure Arc-enabled server, and authenticate the system assigned Managed Identity against Azure APIs.
-
-Using the managed identity opens up custom hybrid integration opportunities beyond the standard integrations such as monitoring, management, backup, and virtual machine extensions.
-
-The workloads running on your on-premises, hosted, and multi-cloud compute can be onboarded to Azure using an Azure Arc-enabled server and you can then authenticate the managed identity to access Azure services.
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/linux/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/linux/_index.md
deleted file mode 100644
index ca1fec024f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/linux/_index.md
+++ /dev/null
@@ -1,385 +0,0 @@
----
-type: docs
-title: "Managed Identity with Ubuntu server"
-linkTitle: "Managed Identity with Ubuntu server"
-weight: 1
-description: >
----
-
-## Using Managed Identity on an Ubuntu Azure Arc-enabled server
-
-The following Jumpstart scenario will guide you on how to work with the Hybrid Instance Metadata Service on an Azure Arc-enabled server, and authenticate the system assigned Managed Identity against Azure APIs.
-
-in this scenario you will use Bash commands and REST API calls to:
-
-- Query the Hybrid Instance Metadata Service (HIMDS)
-- Get challenge tokens and resource tokens
-- Use the main Azure Resource Manager REST API
-- Read a secret from an Azure Key Vault
-- Upload a blob to an Azure Storage Account
-
-## Prerequisites
-
-- An onboarded Ubuntu server running on-premises or other clouds connected to Azure Arc
-
-    If you haven't, this repository offers you a way to do so in an automated fashion:
-
-  - **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-  - **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-  - **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-  - **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-  - **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-
-- Tagging
-
-    Add a tag to your Azure Arc-enabled server.
-
-  - Tag: **scenario**
-  - Value: **Managed Identity**
-
-    The tag will be seen later in the guide when accessing the Hybrid Instance Metadata Service.
-
-    ![Screenshot showing the tagged Azure Arc-enabled server](./01.png)
-
-- *jq* and *curl*
-
-    SSH on to the Ubuntu server and install the _jq_ and _curl_ packages.
-
-    ```shell
-    sudo apt-get update && sudo apt-get install -y jq curl
-    ```
-
-## Azure Key Vault and Azure Storage account
-
-This scenario will demonstrate how to integrate with Azure services by accessing a secret in an Azure Key Vault and uploading a blob to an Azure Storage account.
-
-Login to your Azure account to run the commands. (This can also be done in [Azure Cloud Shell](https://shell.azure.com/bash).)
-
-- Set variables
-
-    ```shell
-    rg=arc_managed_identity_scenario
-    loc=westeurope
-    ```
-
-- Create an Azure resource group
-
-    ```shell
-    az group create --name $rg --location $loc
-    rgid=$(az group show --name $rg --query id --output tsv)
-    ```
-
-    ![Screenshot showing resource group being created](./02.png)
-
-- Create a unique name for the FQDNs
-
-  The fully qualified domain names must be globally unique.
-
-    ```shell
-    name=arcmi$(az account show --query id --output tsv | cut -f1 -d-)
-    echo "Name: $name"
-    ```
-
-    The command uses the first eight characters from your subscription ID and suffixes to the string `arcmi` to create a name for the FQDNs.
-
-    ![Screenshot showing an example unique name for the FQDNs](./03.png)
-
-    > **Note that your value for `$name` will be different to the one in the screenshot above.**
-
-- Create an Azure Storage account
-
-    ```shell
-    az storage account create --name $name --sku Standard_LRS --resource-group $rg --location $loc
-    ```
-
-    ![Screenshot showing the storage account creation](./04.png)
-
-- Create an Azure Key Vault
-
-    ```shell
-    az keyvault create --name $name --retention-days 7 --resource-group $rg --location $loc
-    ```
-
-    ![Screenshot showing the Azure Key Vault creation](./05.png)
-
-- Create an example secret.
-
-    ```shell
-    az keyvault secret set --vault-name $name --name scenario --value "Managed Identity"
-    ```
-
-    The below image represents a secret example. In your environment, secrets are more likely to be passwords, database connection strings, etc.
-
-    ![Screenshot showing the created secret](./06.png)
-
-## Add Role-based access control (RBAC) role assignments for the managed identity
-
-By default, the managed identity on an Azure Arc-enabled server will have no access to Azure resources. The steps below will show how to use standard RBAC assignments to give the required access.
-
-- Get the Managed Identity's object ID. Use the below command to output the object ID to a parameter by changing the `--name` and `--resource-group` values to the correct values for your onboarded Ubuntu Azure Arc-enabled server.
-
-    ```shell
-    objectId=$(az connectedmachine show --name my_ubuntu_vm --resource-group my_resource_group --query identity.principalId --output tsv)
-    ```
-
-- Add the Reader role to the subscription scope
-
-    ```shell
-    subscriptionScope=/subscriptions/$(az account show --query id --output tsv)
-    az role assignment create --assignee $objectId --role Reader --scope $subscriptionScope
-    ```
-
-  ![Screenshot showing the assigned Reader role](./07.png)
-
-- Add an access policy to the Azure Key Vault
-
-    ```shell
-    az keyvault set-policy --name $name --object-id $objectId --secret-permissions get list
-    ```
-
-  ![Screenshot showing the access policy](./08.png)
-
-- Get the storage account's resource ID
-
-    ```shell
-    saId=$(az storage account show --name $name --resource-group $rg --query id --output tsv)
-    ```
-
-- Add the Storage Blob Data Contributor role to the storage account
-
-    ```shell
-    az role assignment create --assignee $objectId --role "Storage Blob Data Contributor" --scope $saId
-    ```
-
-  ![Screenshot showing the Azure Storage account role assignments](./09.png)
-
-  The onboarded Ubuntu Azure Arc-enabled server managed identity now has sufficient access to complete the lab.
-
-## Hybrid Instance Metadata Service
-
-The Hybrid Instance Metadata Service (HIMDS) is the hybrid counterpart to the [IMDS](https://docs.microsoft.com/azure/virtual-machines/linux/instance-metadata-service?tabs=linux) endpoint.
-
-Below are the endpoints for comparison:
-
-- Instance Metadata Service (IMDS)
-  - Availability: Azure virtual machines, Azure containers (AKS/ACI)
-  - IMDS_ENDPOINT:  `http://169.254.169.254`
-  - IDENTITY_ENDPOINT: `http://169.254.169.254/metadata/identity/oauth2/token`
-- Hybrid Instance Metadata Service (IMDS)
-  - Availability: Azure Arc-enabled servers
-  - IMDS_ENDPOINT:  `http://localhost:40342`
-  - IDENTITY_ENDPOINT: `http://localhost:40342/metadata/identity/oauth2/token`
-
-The HIMDS endpoint provides information about the onboarded server (e.g. subscription, resource group, tags, etc.) as well as an endpoint to acquire the Managed Identity's authentication tokens.
-
-- SSH on to your Ubuntu server
-
-   From this point onwards the scenario will be working purely on the Ubuntu server that you have onboarded.
-
-- Access the HIMDS endpoint
-
-    ```shell
-    curl -sSL -H Metadata:true http://localhost:40342/metadata/instance?api-version=2020-06-01 | jq .
-    ```
-
-    Example output:
-
-    ```json
-    {
-      "compute": {
-        "azEnvironment": "AzurePublicCloud",
-        "isHostCompatibilityLayerVm": "",
-        "location": "westeurope",
-        "name": "<name>",
-        "offer": "",
-        "osType": "linux",
-        "placementGroupId": "",
-        "plan": {
-          "name": "",
-          "product": "",
-          "publisher": ""
-        },
-        "platformFaultDomain": "",
-        "platformUpdateDomain": "",
-        "provider": "",
-        "publicKeys": null,
-        "publisher": "",
-        "resourceGroupName": "<resource_group_name>",
-        "customData": "",
-        "resourceId": "/subscriptions/<subscription_id>/resourceGroups/<resource_group_name>/providers/Microsoft.HybridCompute/machines/<name>",
-        "securityProfile": {
-          "secureBootEnabled": "",
-          "virtualTpmEnabled": ""
-        },
-        "sku": "Ubuntu 18.04.6 LTS",
-        "storageProfile": {},
-        "subscriptionId": "<subscription_id>",
-        "tags": "scenario:Managed Identity",
-        "tagsList": [
-          {
-            "name": "scenario",
-            "value": "Managed Identity"
-          }
-        ],
-        "version": "<version>",
-        "vmId": "<vmId>",
-        "vmScaleSetName": "",
-        "vmSize": "",
-        "zone": ""
-      },
-      "network": {}
-    }
-    ```
-
-- Use values from the HIMDS. Below is an example commands to set variables:
-
-    ```shell
-    imds=$(curl -sSL -H Metadata:true http://localhost:40342/metadata/instance?api-version=2020-06-01)
-    subscriptionId=$(jq -r .compute.subscriptionId <<< $imds)
-    resourceGroupName=$(jq -r .compute.resourceGroupName <<< $imds)
-    echo "Subscription ID: $subscriptionId; Resource Group name: $resourceGroupName"
-    ```
-
-  ![Screenshot showing the command output](./10.png)
-
-- Working with tags and _jq_
-
-    The example commands below display the tags and then set a variable using a tag's value.
-
-    ```shell
-    jq .compute.tags <<< $imds
-    jq -r '.compute.tagsList[] | select(.name == "scenario")' <<< $imds
-    scenario=$(jq -r '.compute.tagsList[] | select(.name == "scenario") | .value' <<< $imds)
-    echo "Scenario: $scenario"
-    ```
-
-  ![Screenshot showing the command output](./11.png)
-
-## Challenge token and resource token
-
-The token process for an onboarded Azure Arc-enabled server is multi-step.
-
-- Access the identity endpoint to create a challenge token
-
-    ```shell
-    challengeTokenPath=$(curl -s -D - -H Metadata:true "http://127.0.0.1:40342/metadata/identity/oauth2/token?api-version=2019-11-01&resource=https%3A%2F%2Fmanagement.azure.com" | grep Www-Authenticate | cut -d "=" -f 2 | tr -d "[:cntrl:]")
-    ```
-
-    The file path is included in the headers returned by the REST API call.
-
-    ![Screenshot showing the command output](./12.png)
-
-    The file is created in a path that only the root and HIMDS IDs can access.
-
-- Read the content of the file into a variable. The challenge token files may only be used once and are automatically removed.
-
-    ```shell
-    challengeToken=$(sudo cat $challengeTokenPath)
-    ```
-
-    ![Screenshot showing the command output](./13.png)
-
-- Access the identity endpoint to acquire the resource token
-
-    ```shell
-    token=$(curl -s -H Metadata:true -H "Authorization: Basic $challengeToken" "http://127.0.0.1:40342/metadata/identity/oauth2/token?api-version=2019-11-01&resource=https%3A%2F%2Fmanagement.azure.com" | jq -r .access_token)
-    ```
-
-    Note the resource value in the query and the challenge token in the header and that the resulting token is valid for 24 hours.
-
-    ![Screenshot showing the command output](./14.png)
-
-## JWT Token
-
-- The resulting token may be pasted into <https://jwt.ms> to decode it and view the claims.
-
-  ![https://jwt.ms](./15.png)
-
-## Accessing the ARM REST API
-
-- List out the tags used in the subscription. The below command demonstrates that the Azure Resource Manager API can be accessed by a trusted computer.
-
-    ```shell
-    curl -sSL -X GET -H "Authorization: Bearer $token" -H "Content-Type: application/json" https://management.azure.com/subscriptions/$subscriptionId/tagNames?api-version=2021-04-01 | jq .value[].tagName
-    ```
-
-    ![Screenshot showing the command output](./16.png)
-
-    The above REST API call will fail if you have not assigned the _Reader_ role to the subscription scope for the managed identity.
-
-## Accessing Key Vault secrets
-
-You will access other endpoints when using PaaS services such as Azure Key Vault, Azure Storage Account, Azure PaaS databases, etc. The token acquisition process is the same except you have to change the resource (or audience) in the query of the call.
-
-- Acquire a token for the Key Vault service with resource set to `https://vault.azure.net` in the query
-
-    ```shell
-    challengeTokenPath=$(curl -s -D - -H Metadata:true "http://127.0.0.1:40342/metadata/identity/oauth2/token?api-version=2019-11-01&resource=https%3A%2F%2Fvault.azure.net" | grep Www-Authenticate | cut -d "=" -f 2 | tr -d "[:cntrl:]")
-    challengeToken=$(sudo cat $challengeTokenPath)
-    vaultToken=$(curl -s -H Metadata:true -H "Authorization: Basic $challengeToken" "http://127.0.0.1:40342/metadata/identity/oauth2/token?api-version=2019-11-01&resource=https%3A%2F%2Fvault.azure.net" | jq -r .access_token)
-    ```
-
-    ![Screenshot showing the command output](./17.png)
-
-- Query the secret's value
-
-    ```shell
-    curl -sSL -X GET -H "Authorization: Bearer $vaultToken" -H "Content-Type: application/json" https://$name.vault.azure.net/secrets/scenario/?api-version=7.2 | jq .
-    ```
-
-    ![Screenshot showing the command output](./18.png)
-
-- Set a variable to the secret's value
-
-    ```shell
-    secret=$(curl -sSL -X GET -H "Authorization: Bearer $vaultToken" -H "Content-Type: application/json" https://$name.vault.azure.net/secrets/scenario/?api-version=7.2 | jq -r .value)
-    echo "$secret"
-    ```
-
-    ![Screenshot showing the command output](./19.png)
-
-## Uploading a file to Azure Storage Account blob service
-
-- Acquire the token with resource set to `https://storage.azure.com`
-
-    ```shell
-    challengeTokenPath=$(curl -s -D - -H Metadata:true "http://127.0.0.1:40342/metadata/identity/oauth2/token?api-version=2019-11-01&resource=https%3A%2F%2Fstorage.azure.com" | grep Www-Authenticate | cut -d "=" -f 2 | tr -d "[:cntrl:]")
-    challengeToken=$(sudo cat $challengeTokenPath)
-    storageToken=$(curl -s -H Metadata:true -H "Authorization: Basic $challengeToken" "http://127.0.0.1:40342/metadata/identity/oauth2/token?api-version=2019-11-01&resource=https%3A%2F%2Fstorage.azure.com" | jq -r .access_token)
-    ```
-
-    ![Screenshot showing the command output](./20.png)
-
-- Create a container named `uploads`
-
-    ```shell
-    curl -X PUT -d "" -H "Authorization: Bearer $storageToken" -H "x-ms-version: 2020-10-02" https://$name.blob.core.windows.net/uploads?restype=container
-    ```
-
-- Upload a file
-
-    ```shell
-    curl -i -X PUT -H "Authorization: Bearer $storageToken" -H "x-ms-blob-type: BlockBlob" -H "x-ms-version: 2020-10-02" --data-binary @/etc/hosts https://$name.blob.core.windows.net/uploads/hosts.txt
-    ```
-
-    The `-i` (or `--include`) displays the headers in the response including the md5sum.
-
-    ![Screenshot showing the command output](./21.png)
-
-- Check the blob in the Azure portal. Notice how the managed identity on the Azure Arc-enabled server has successfully uploaded a file to an Azure Storage account.
-
-  ![Successful upload](./22.png)
-
-## Clean up environment
-
-- Delete the _arc_managed_identity_scenario_ resource group in the portal.
-
-  ![Successful upload](./23.png)
-
-- To remove the Ubuntu virtual machines from each environment by following the teardown instructions from each guide.
-
-  - **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-  - **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-  - **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-  - **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-  - **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_monitoring/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_monitoring/_index.md
deleted file mode 100644
index 962c6b93f8..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_monitoring/_index.md
+++ /dev/null
@@ -1,254 +0,0 @@
----
-type: docs
-title: "Monitoring, Alerting, and Visualization"
-linkTitle: "Monitoring, Alerting, and Visualization"
-weight: 4
-description: >
----
-
-## Monitoring, Alerting, and Visualization on Azure Arc-enabled servers
-
-The scenario will show you how to onboard Azure Arc-enabled servers to [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/overview), so you can monitor your Linux and Windows servers running on-premises or at other cloud providers.
-
-in this scenario, you will create the following Azure resources that support this Azure Monitor scenario:
-
-- Log Analytics workspace.
-
-- Log data sources: performance counters and events for Windows & Linux.
-
-- VM Insights solution.
-
-- Azure Monitor OS sample alerts.
-
-- Azure Workbooks: AlertsConsole, OSPerformanceAndCapacity and WindowsEvents.
-
-- Azure Dashboard: monitoring overview for Azure Arc-enabled servers.
-
-- Azure Policies to automate agents deployment:
-
-  - Configure Log Analytics extension on Azure Arc-enabled Windows servers.
-
-  - Configure Log Analytics extension on Azure Arc-enabled Linux servers.
-
-  - Configure Dependency agent on Azure Arc-enabled Windows servers.
-
-  - Configure Dependency agent on Azure Arc-enabled Linux server.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or bare-metal servers to Azure Arc. **The resource group of these Azure Arc-enabled servers must be the same as the one that will be used for this scenario deployment.** This is required since the Azure Policies that deploy the Log Analytics agent and the Dependency agent are assigned at this resource group level. In this scenario, we will use the following instances that have been already connected to Azure Arc and are visible as a resources in Azure:
-
-    ![Screenshot showing AWS cloud console with EC2 instance](./01.png)
-
-    > **NOTE: Ensure that the servers you will use for this scenario are running an [OS supported by the Log Analytics Agent and the Dependency Agent](https://docs.microsoft.com/azure/azure-monitor/agents/agents-overview#supported-operating-systems) and meets the [firewall requirements](https://docs.microsoft.com/azure/azure-monitor/agents/log-analytics-agent#firewall-requirements).**
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-- User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-- User will run the ARM template at resource group level.
-
-- User is reviewing the alerts, workbooks and agents deployment.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fmonitoring%2Fmonitoring-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./02.png)
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- (Optional) If you already have a resource group with Azure Arc-enabled servers, please, proceed to the next step. Otherwise, create a new resource group for the scenario deployment and then, onboard your Azure Arc-enabled servers to that resource group. To create a new resource group, please, run the below command, replacing the values in brackets with your own:
-
-    ```shell
-    az group create --name <Name for your resource group> \
-    --location <Location for your resources> \
-    --tags "Project=jumpstart_azure_arc_servers"
-    ```
-
-    ![Screenshot showing az group create being run](./04.png)
-
-- Next, edit the ARM template [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/monitoring/monitoring-template.json), providing a name for your Log Analytics workspace and a single email account, which will be used for Azure Monitor alerts notifications. Please, see the [example](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/monitoring/monitoring-template.example.parameters.json) below:
-
-    ![Screenshot showing Azure ARM template](./05.png)
-
-- To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/monitoring) and run the below command:
-
-    ```shell
-    az deployment group create --resource-group <Name of the resource group where to deploy this scenario> \
-        --template-file monitoring-template.json \
-        --parameters monitoring-template.parameters.json
-    ```
-
-   ![Screenshot showing az deployment group create being run](./06.png)
-
-- When the deployment is complete, you should be able to see the resource group with your Log Analytics workspace, Azure dashboard, VMInsights solution and three Workbooks:
-
-    ![Screenshot showing Azure Portal with resources deployed](./07.png)
-
-- Please, note that most of the deployed resources are hidden:
-
-    ![Screenshot showing Azure Portal hidden resources](./08.png)
-
-## Review that all the Azure Monitor deployed resources are configured
-
-- Click on the **Policies** blade of the **resource group** where you deployed this scenario. Review that the following **four policies** are assigned:
-
-    ![Screenshot showing Azure Policies assigned at resource group](./09.png)
-
-- Click on the **Agents Configuration** blade of the **Log Analytics workspace**. Review that the following **data sources** are already enabled as shown in the screenshots:
-
-    ![Screenshot showing Windows Events of Log Analytics workspace](./10.png)
-
-    ![Screenshot showing Windows Performance Counters of Log Analytics workspace](./11.png)
-
-    ![Screenshot showing Linux Performance Counters of Log Analytics workspace](./12.png)
-
-    ![Screenshot showing Syslog of Log Analytics workspace](./13.png)
-
-- Click on the **Solutions** blade of the **Log Analytics workspace**. Review that  **VMInsights** solution is enabled:
-
-    ![Screenshot showing VMInsights solution of Log Analytics workspace](./14.png)
-
-- Go to **Monitor**, **Alerts** and click on **Action Groups**:
-
-    ![Screenshot showing steps to list action groups](./15.png)
-
-- Filter by **Subscription** and **Resource Group**. Review that the following **action group** is created:
-
-    ![Screenshot showing action group created](./16.png)
-
-- Click on the **action group name**, then on the **edit** button. Review that the **email account** is the one you provided in the **parameters file**:
-
-    ![Screenshot showing how to click on action group name](./17.png)
-
-    ![Screenshot showing action group email action](./18.png)
-
-- Go to **Monitor**, **Alerts** and click on **Alert rules**:
-
-    ![Screenshot showing steps to list alerts](./19.png)
-
-- Filter by **Subscription** and **Resource Group**. Review that the following **alerts** are enabled:
-
-    ![Screenshot showing created alerts](./20.png)
-
-    > **NOTE: This is just a small example of Azure Monitor alerts, which are based on log queries and log analytics workspace metrics. You may need to adjust alerts thresholds to your environment expected behaviour.**
-
-## Deploying the Log Analytics Agent and the Dependency Agent
-
-This scenario is mainly based on the data collected from the Azure Arc-enabled servers into the Log Analytics workspace. Therefore, it is required to deploy on these servers the [Log Analytics Agent](https://docs.microsoft.com/azure/azure-monitor/agents/agents-overview#log-analytics-agent) and the [Dependency Agent](https://docs.microsoft.com/azure/azure-monitor/agents/agents-overview#dependency-agent). There are multiple [methods](https://docs.microsoft.com/azure/azure-monitor/agents/log-analytics-agent#installation-options) to deploy these agents. In this scenario, Azure Policies are used to deploy both agents in Windows and Linux.
-
-For **new** Azure Arc-enabled servers connected within the scope of the policies assignments, the policies will deploy the agents automatically.
-
-For **existing** Azure Arc-enabled servers connected within the scope of the policies assignments, you will need to manually create a remediation task for each policy. These are steps to create a remediation task:
-
-- When the Azure Policies are assigned, it takes around 30 minutes for the assignment to be applied to the defined scope. After those 30 minutes, Azure Policy will start the evaluation cycle against the Azure Arc-enabled servers and recognize them as "Non-compliant" if they don't have the Log Analytics Agent or the Dependency Agent installed. To check this, go to the **resource group** where you deployed this scenario, and click on the **Policies** blade:
-
-    ![Screenshot showing Azure Policies blade at resource group](./21.png)
-
-- Click on the **Remediation** tab. Check if any of the policies that deploy the agents have resources to remediate. If so, click on the **Remediate** button:
-
-    > **NOTE: The following steps must be followed for each policy with resources pending to be remediated. Please, start with the remediation of the Log Analytics agent policies followed by the remediation of the Dependency Agent policies.**
-
-    ![Screenshot showing how to start Azure policy remediation](./22.png)
-
-- Review the following settings and click on the **Remediate** button:
-
-    ![Screenshot showing how to remediate an Azure Policy](./23.png)
-
-- Once you have assigned remediation task, the policy will be evaluated again and show that the Azure Arc-enabled server is compliant:
-
-   ![Screenshot showing Azure Policy compliant results](./24.png)
-
-- The agents will be installed as **extensions** in the Azure Arc-enabled server:
-
-   ![Screenshot showing agent extensions on Azure Arc-enabled server](./25.png)
-
-## Azure Dashboard, Workbooks and VMInsights
-
-Once the data starts arriving into the Log Analytics workspace, we can leverage Azure Monitor insights services like Azure Dashboard, Workbooks and VMInsights. It may take some hours for these services to have enough data to show.
-
-### VMInsights
-
-- Click on the **Insights** blade of one of the **Azure Arc-enabled servers** connected to the Log Analytics workspace:
-
-   ![Screenshot showing Insights blade on Azure Arc-enabled server](./26.png)
-
-- Click on the **Performance tab**, which includes a set of charts that target several key performance indicators (KPIs) to help you determine how well a machine is performing:
-
-   ![Screenshot showing Performance Insights on Azure Arc-enabled server](./27.png)
-
-- Click on the **Map tab**, which visualizes the VM dependencies by discovering running processes that have active network connections between servers; inbound and outbound connection latency; ports across any TCP-connected architecture over a specified time range. Feel free to use the built-in workbooks available in the upper right corner:
-
-   ![Screenshot showing Map Insights on Azure Arc-enabled server](./28.png)
-
-### Azure Dashboard and Workbooks
-
-- Locate the **Shared Dashboard** that was deployed in your resource group. Click on its **name** and then on the **Go to dashboard** link:
-
-   ![Screenshot showing shared dashboard in resource group](./29.png)
-
-   ![Screenshot showing Go to dashboard button](./30.png)
-
-- The goal of this dashboard is to provide a quick overview of the current status of the monitored Azure Arc-enabled servers. You can play with the dashboards controls **Auto refresh** and **UTC Time**. Note that this dashboard is made up of three tiles, each of them being a quick access button and a summary of the deployed Azure workbooks:
-  - **OSPerformanceAndCapacity:** provides a quick performance overview of the Azure Arc-enabled servers. In addition, it contains several charts with more insights of some key OS performance counters.
-  - **AlertsConsole:** console that shows the alerts that have been fired within a time range.
-  - **WindowsEvents:** Windows Events central visualizer.
-
-   ![Screenshot showing Azure Dashboard summary](./31.png)
-
-- To get into one of the pinned workbooks, like for example the **OSPerformanceAndCapacity** workbook, just click on the **Top servers** tile:
-
-   ![Screenshot showing how to get into the OSPerformanceAndCapacity workbook](./32.png)
-
-- This workbook, apart from the **Top servers** summary table available at the top of the **shared dashboard**, shows two charts for each of some of the key OS performance counters:
-
-   ![Screenshot showing performance charts of the OSPerformanceAndCapacity workbook](./33.png)
-
-- In addition, at the bottom of this workbook, there are **two additional charts**. One of them shows which are the **processes that use more CPU for Windows machines**. The second one shows the **network usage by process per each Azure Arc-enabled server**:
-
-   ![Screenshot showing cpuusage and networkusage by processes charts of the OSPerformanceAndCapacity workbook](./34.png)
-
-- On the other hand, the **WindowsEvents workbook**, accessible from the **Shared Dashboard**, provides additional insights of the Windows Events collected. It shows the number of events by EventLog and Severity, along with its hourly distribution:
-
-   ![Screenshot showing top charts of the WindowsEvents workbook](./35.png)
-
-- At the bottom of the **WindowsEvents workbook**, click on one of the computers and its severity to load the table below, where all details per event are provided:
-
-   ![Screenshot showing top charts of the WindowsEvents workbook](./36.png)
-
-## Clean up environment
-
-To delete the entire deployment, simply delete the resource group from the Azure portal.
-
-![Screenshot showing how to delete resource group](./37.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/_index.md
deleted file mode 100644
index 8dfc22b60b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_policies_mma/_index.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-type: docs
-title: "Azure Policy"
-linkTitle: "Azure Policy"
-weight: 7
-description: >
----
-
-## Deploy Monitoring Agent Extension to Azure Arc Linux and Windows servers using Azure Policy
-
-The following Jumpstart scenario will guide you on how to use Azure Arc-enabled servers to assign Azure Policies to VMs outside of Azure, whether they are on-premises or other clouds. With this feature you can now use Azure Policy to audit settings in the operating system of an Azure Arc-enabled server, if a setting is not compliant you can also trigger a remediation task.
-
-In this case, you will assign a policy to audit if the Azure Arc connected machine has the (Microsoft Monitoring Agent) MMA agent installed, if not, you will use the extensions feature to automatically deploy it to the VM, an enrollment experience that levels to Azure VMs. This approach can be used to make sure all your servers are onboard to services such as Azure Monitor, Azure Security Center, Microsoft Sentinel, etc.
-
-You can use the Azure Portal, an ARM template or PowerShell script to assign policies to Azure subscriptions or resource groups. In this scenario, you will use an ARM template to assign built-in policies.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Please review the [Azure Monitor supported OS documentation](https://docs.microsoft.com/azure/azure-monitor/insights/vminsights-enable-overview#supported-operating-systems) and ensure that the VMs you will use for this guide are supported. For Linux VMs, check both the Linux distribution and kernel to ensure you are using a supported configuration.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshots below we can see a GCP server has been connected with Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot Azure Arc-enabled server on resource group](./01.png)
-
-    ![Screenshot Azure Arc-enabled server connected status](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- You will also need to have a Log Analytics workspace deployed. You can automate the deployment by editing the ARM template [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/policies/arm/log_analytics-template.parameters.json), provide a name and location for your workspace.
-
-    ![Screenshot ARM template parameters file](./03.png)
-
-  To deploy the ARM template, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/policies/arm) and run the below command:
-
-  ```shell
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-file <The *log_analytics-template.json* template file location> \
-    --parameters <The *log_analytics-template.parameters.json* template file location>
-  ```
-
-## Azure Policies on Azure Arc connected machines
-
-- Now that you have all the prerequisites set, you can assign policies to our Arc connected machines. Edit the [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/policies/arm/policy.json) to provide your subscription ID as well as the Log Analytics workspace.
-
-    ![Screenshot ARM template parameter file](./04.png)
-
-  To start the deployment, use the below command:
-
-  ```shell
-  az policy assignment create --name 'Enable Azure Monitor for VMs' \
-  --scope '/subscriptions/<Your subscription ID>/resourceGroups/<Name of the Azure resource group>' \
-  --policy-set-definition '55f3eceb-5573-4f18-9695-226972c6d74a' \
-  -p <The *policy.json* template file location> \
-  --assign-identity --location <Azure Region>
-  ```
-
-  The flag *policy-set-definition* points to the initiative "Enable Azure Monitor" definition ID.
-
-- Once the initiative is assigned, it takes around 30 minutes for the assignment to be applied to the defined scope. After those 30 minutes, Azure Policy will start the evaluation cycle against the Azure Arc connected machine and recognize it as "Non-compliant" (since it still does not have the Log Analytics Agent configuration deployed). To check this, go to the Azure Arc connected Machine under the Policies section.
-
-  ![Screenshot Azure Policy non-compliant](./05.png)
-
-- Now, you will assign a remediation task to the non-compliant resource to put into a compliant state.
-
-  ![Screenshot Azure Policy remediation task](./06.png)
-
-- Under 'Policy to remediate' choose '[Preview] Deploy Log Analytics Agent to Linux Azure Arc machines' and select 'Remediate'. This remediation task is instructing Azure Policy to run the deployIfNotExists effect and use the Azure Arc extension management capabilities to deploy the Log Analytics agent on the VM
-
-  ![Screenshot Azure Policy remediation task](./07.png)
-
-- Once you have assigned remediation task, the policy will be evaluated again and show that the server on GCP is compliant and that the Microsoft Monitoring Agent extension is installed on the Azure Arc machine.
-
-  ![Screenshot remediation task configuration](./08.png)
-
-  ![Screenshot Azure Policy compliant status](./09.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Remove the Azure Policy assignment by executing the following script in Azure CLI.
-
-  ```shell
-  az policy assignment delete --name 'Enable Azure Monitor for VMs' --resource-group <resource_group>
-  ```
-
-Remove the Log Analytics workspace by executing the following script in Azure CLI. Provide the workspace name you used when creating the Log Analytics workspace.
-
-  ```shell
-  az monitor log-analytics workspace delete --resource-group <Name of the Azure resource group> --workspace-name <Log Analytics workspace Name> --yes
-  ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_privatelink/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_privatelink/_index.md
deleted file mode 100644
index fbb12d3650..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_privatelink/_index.md
+++ /dev/null
@@ -1,231 +0,0 @@
----
-type: docs
-title: "Azure Private Link"
-linkTitle: "Azure Private Link"
-weight: 11
-description: >
----
-
-## Use Azure Private Link to securely connect networks to Azure Arc-enabled servers
-
-The following Jumpstart scenario will guide you on how to use [Azure Private Link](https://docs.microsoft.com/azure/private-link/private-link-overview) to securely connect from an Azure Arc-enabled server to Azure using a VPN. [This feature](https://docs.microsoft.com/azure/azure-arc/servers/private-link-security) allows you to connect privately to Azure Arc without opening up public network access but rather using private endpoints over a VPN or ExpressRoute connection, ensuring that all traffic is being sent to Azure privately.
-
-In this scenario, you will emulate a hybrid environment connected to Azure over a VPN with hybrid resources that will be Azure Arc-enabled, and Azure Private Link Scope will be used to connect over a private connection. To complete this process you deploy a single ARM template that will:
-
-- Create two separate resource groups:
-
-  - "On-premises" resource group will contain resources that simulate a private on-premises environment with a Windows virtual machine. This VM will not have a public IP address assigned to it so [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) is deployed to have administrative access to the operating system. The Windows virtual machine is an Azure Arc-enabled server by installing the Azure Arc connected machine agent using Azure Private Link.
-  - "Azure" resource group will contain the Azure Arc-enabled server and its Private Link Scope.
-
-- Both resource groups have their own virtual networks and address spaces, and they are connected via Azure VPN gateways to set up a hybrid private connection.
-
-  ![Deployment Overview](./01.png)
-
-  > **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-  > **NOTE: The below scenario assumes the on-premises VM has outbound internet connectivity for the deployment of the Azure Arc connected machine agent. For internet disconnected environments you will need to adjust the automation to retrieve the agent's software from locally accessible storage**
-
-## Prerequisites
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- Create Azure service principal (SP). To deploy this scenario, an Azure service principal assigned with the _Contributor_ Role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-  
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install Azure PowerShell modules.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Contributor" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "JumpstartArcSPN" -Role "Contributor" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    Output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./02.png)
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at subscription level. The ARM template will create two resources groups with:
-
-    - Azure resource group, automated by the template [**cloudDeploy.json**](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/privatelink/ARM/cloudDeploy.json):
-        - Azure Arc Private Link Scope
-        - Azure Arc-enabled server
-        - Azure Private Link Endpoint for the Azure Arc-enabled Server
-        - Three Azure Private DNS zones, to overwrite Azure Arc's public endpoints DNS configuration to connect using a private endpoint
-        - Azure VPN Gateway and its public IP address
-        - Azure VNET
-
-    - On-premises resource group, automated by the template [**onPremisesDeploy.json**](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/privatelink/ARM/onPremisesDeploy.json):
-        - Azure VNET
-        - Azure Bastion
-        - Azure VPN Gateway and its public IP address
-        - Azure Windows Virtual Machine with a custom script extension that runs the [**Bootstrap.ps1**](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/privatelink/artifacts/Bootstrap.ps1) script
-
-        > **NOTE: The [_installArcAgent.ps1_](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/privatelink/artifacts/installArcAgent.ps1) script will enable the OS firewall and set up new rules for incoming and outgoing connections. By default all incoming and outgoing traffic will be allowed, except blocking Azure IMDS outbound traffic to the _169.254.169.254_ remote address.**
-
-3. User logs in to the on-premises VM using Azure Bastion to trigger the Azure Arc onboarding script.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fprivatelink%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates. You will deploy a single ARM template at subscription scope that will deploy resources to the Azure's resource group as well as the "On-premises" resources that will be onboarded to Azure Arc.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the ARM template, login to Azure using AZ CLI with the ```az login``` command.
-
-- The deployment will use an ARM template parameters file to customize your environment. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/privatelink/azuredeploy.parameters.json) file located in your local cloned repository folder. Example parameters files is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/privatelink/azuredeploy.example.parameters.json).
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/privatelink) and run the below command, start deploying resources:
-
-    ```shell
-    az deployment sub create \
-    --location <Azure Region Location> \
-    --template-file <The *azuredeploy.json* template file location> \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    For example:
-
-    ```shell
-    az deployment sub create \
-    --location eastus \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/privatelink/azuredeploy.json \
-    --parameters azuredeploy.example.parameters.json
-    ```
-
-     > **NOTE: The deployment may take around 45 minutes to complete.**
-
-- Verify the resources are created on the Azure Portal for both resource groups:
-
-    ![Resources created on Onpremises's resource group](./05.png)
-
-    ![Resources created on Azure's resource group](./06.png)
-
-## Windows Login & Post Deployment
-
-- Now that the Windows Server VM is created and the VPN connections are established, it is time to RDP to it using Azure Bastion.
-
-  - On the "on-premises" resource group select the Windows VM:
-
-    ![Azure Bastion session 01](./07.png)
-
-  - Under "Connect" choose Bastion:
-
-    ![Azure Bastion session 02](./08.png)
-
-  - Provide the VM credentials and click on "Connect":
-
-    ![Azure Bastion session 03](./09.png)
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~1-2min long.**
-
-    ![Screenshot script output](./10.png)
-
-- Upon successful run, a new Azure Arc-enabled server will be added to the resource group.
-
-  ![Screenshot Azure Arc-enabled server on resource group](./11.png)
-
-## Azure Arc-enabled server Private Link connectivity
-
-To make sure that your Azure Arc-enabled server is using Private Link for its connection. Use your Azure Bastion session to run the command below:
-
-  ```powershell
-    azcmagent check --location <your Azure Region> --enable-pls-check --verbose
-  ```
-
-It should show private reachable connections for the agent's endpoints.
-
-  ![Connected Machine agent using PL](./12.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete both resource groups:
-
-  ![Delete Resource Group On-premises](./13.png)
-  
-  ![Delete Resource Group Azure](./14.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_proxy/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_proxy/_index.md
deleted file mode 100644
index ed635563e5..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_proxy/_index.md
+++ /dev/null
@@ -1,165 +0,0 @@
----
-type: docs
-title: "Connectivity behind a proxy server"
-linkTitle: "Connectivity behind a proxy server"
-weight: 12
-description: >
----
-
-## Azure Arc-enabled servers connectivity behind a proxy server
-
-The following Jumpstart scenario will guide you on how to configure your [Azure Arc-enabled server if the machine uses a proxy server](https://docs.microsoft.com/azure/cloud-adoption-framework/scenarios/hybrid/arc-enabled-servers/eslz-arc-servers-connectivity) to communicate over the internet.
-
-In this scenario, you will emulate a full proxy-client configuration. The scenario will deploy both the proxy server and a client that will be Arc-enabled automatically with the agent configured to use the proxy. The automation for the proxy server deployment makes sure that the Azure Arc network service tags and IP addresses range are not blocked. To complete this process you deploy a single ARM template that will:
-
-- Deploy two Azure Linux VMs:
-  - Proxy Server.
-  - Client VM.
-- Two network security groups:
-  - Proxy Server NSG: allows inbound connections to port 22 and 3128 (proxy's port).
-  - Client VM NSG: denies all outbound connections and only allows inbound for SSH.
-- Each VM will have a custom script extension deployed:
-  - Proxy Server: will have a script to deploy and configure [Squid proxy](https://ubuntu.com/server/docs/proxy-servers-squid).
-  - Client VM: will use the custom script extension to install and configure the Connected Machine agent using the proxy connection.
-
-    > **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-## Prerequisites
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User provides the ARM template parameters values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User logs in to the Client's VM using SSH or Azure Bastion to trigger the Azure Arc onboarding script.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fproxy%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment](./01.png)
-
-  ![Screenshot showing Azure portal deployment](./02.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Before deploying the ARM template, login to Azure using AZ CLI with the ```az login``` command.
-
-- The deployment will use an ARM template parameters file to customize your environment. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/proxy/azuredeploy.parameters.json) file located in your local cloned repository folder. Example parameters files are located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/proxy/azuredeploy.example.parameters.json). Fill out the parameters according to your environment:
-
-  - _`vmSize`_: Client and proxy server Azure VM size.
-  - _`vmName`_: Client Azure VM name.
-  - _`ProxyvmName`_: Proxy server Azure VM name.
-  - _`adminUsername`_: Azure VMs admin username.
-  - _`adminPassword`_: A password for Client and Server.
-  - _`dnsLabelPrefix`_: DNS label for the Public IP address of the client.
-  - _`proxydnsLabelPrefix`_: DNS label for the Public IP address of the server.
-  - _`ProxysubnetName`_: Proxy subnet name.
-  - _`subnetName`_: Client subnet name.
-  - _`proxyNSG`_: Proxy NSG name.
-  - _`vmNSG`_: Client NSG name.
-  - _`subscriptionID`_: your Subscription ID.
-  - _`servicePrincipalClient`_: Service Principal AppId.
-  - _`servicePrincipalClientSecret`_: Service Principal password.
-  - _`tenantID`_: your tenant ID.
-  - _`resourceGroup`_: your resource group.
-  - _`deployBastion`_: boolean, true or false if you want to deploy bastion to connect to the VMs.
-  - _`bastionHostName`_: Azure Bastion Host name.
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/proxy) and run the below command.
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --tags "Project=jumpstart_azure_arc_servers"
-    az deployment group create \
-    --resource-group <Resource Group Name> \
-    --name <Deployment Name> \
-    --template-file <The *azuredeploy.json* template file location> \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: make sure that you are using the same Azure resource group name as the one you’ve just used in the azuredeploy.parameters.json file**
-
-    For example:
-
-    ```shell
-    az group create --name Arc-Proxy-Demo --tags "Project=jumpstart_azure_arc_servers" 
-    az deployment group create \
-    --resource-group Arc-Proxy-Demo \
-    --name proxy \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/proxy/azuredeploy.json \
-    --parameters azuredeploy.example.parameters.json
-    ```
-
-- Verify the resources are created on the Azure portal on the resource group:
-
-    ![Resources created on resource group](./03.png)
-
-## Linux Login & Post Deployment
-
-- Now that the resources are created, it is time to connect to the client's VM.
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-- Let the script to run its course and **do not close** the shell session.
-
-    > **NOTE: The script run time is ~1-2min long.**
-
-    ![Screenshot script output](./04.png)
-
-- Upon successful run, a new Azure Arc-enabled server will be added to the resource group.
-
-  ![Screenshot Azure Arc-enabled server on resource group](./05.png)
-
-## Azure Arc-enabled server Proxy connectivity
-
-To make sure that your Azure Arc-enabled server is using the proxy for its connection. Connect to the server and run the command below:
-
-  ```powershell
-    sudo azcmagent.exe show
-  ```
-
-  ![Screenshot Azure Arc-enabled server on resource group](./06.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the resource groups:
-
-  ![Delete Resource Group](./07.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_security_baseline/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_security_baseline/_index.md
deleted file mode 100644
index 8ceba5d90e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_security_baseline/_index.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-type: docs
-title: "Azure Security Baseline"
-linkTitle: "Azure Security Baseline"
-weight: 14
-description: >
----
-
-## Use Azure Policy to audit if Azure Arc-enabled servers meet security baseline requirements
-
-The following Jumpstart scenario will guide you on how to use Azure Policy to push Azure Security Baseline to Azure Arc-enabled Windows and Linux servers. With this feature, you can now use the Azure portal to view the compliance status of Azure Arc-enabled servers and whether they meet security baseline requirements, and if not, why.
-
-You can use the Azure portal, an ARM template, or PowerShell script to assign policies to Azure subscriptions or resource groups. In this scenario, you will use the PowerShell script to assign Azure security baseline policies.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshots below we can see two Windows servers and one Linux server have been connected with Azure Arc and are visible as resources in Azure.
-
-    ![Screenshot of Azure Arc-enabled servers in a resource group](./01.png)
-
-    ![Screenshot of Azure Arc-enabled server connectivity status](./02.png)
-
-## Azure Security Baseline on Azure Arc connected machines
-
-- Now you can assign Azure security baseline policies to your Arc-connected machines. Note that there are different policies for Windows and Linux machines.
-
-  To start the deployment on your Arc connected Windows machines, use the below command:
-
-  ```powershell
-  $policy=Get-AzPolicyDefinition -Name '72650e9f-97bc-4b2a-ab5f-9781a9fcecbc'
-  $ResourceGroup = Get-AzResourceGroup -Name '<Name of the Azure resource group>'
-  $Parameter= @{'IncludeArcMachines'=('true')}
-
-  New-AzPolicyAssignment -Name 'Windows machines should meet requirements of the Azure compute security baseline' -PolicyDefinition $Policy -Scope $ResourceGroup.ResourceId -Location '<Azure Region>' -IdentityType 'SystemAssigned' -PolicyParameterObject $Parameter
-  ```
-
-  To start the deployment on your Arc-connected Linux machines, use the below command:
-
-  ```powershell
-  $policy=Get-AzPolicyDefinition -Name 'fc9b3da7-8347-4380-8e70-0a0361d8dedd'
-  $ResourceGroup = Get-AzResourceGroup -Name '<Name of the Azure resource group>'
-  $Parameter= @{'IncludeArcMachines'=('true')}
-
-  New-AzPolicyAssignment -Name 'Linux machines should meet requirements for the Azure compute security baseline' -PolicyDefinition $Policy -Scope $ResourceGroup.ResourceId -Location '<Azure Region>' -IdentityType 'SystemAssigned' -PolicyParameterObject $Parameter
-  ```
-
-- Once the policy is assigned, it takes around 30 minutes for the assignment to be applied to the defined scope. After those 30 minutes, Azure Policy will start the evaluation cycle against the Azure Arc connected machines and recognize them as "Compliant" or "Non-compliant" to the Azure security baseline. To check this, go to the Compliance section under Policy.
-
-  ![Screenshot of Azure policy compliance](./03.png)
-
-- Now, you can view the evaluated details of why an Azure Arc-enabled server is not compliant with security baselines.
-
-  ![Screenshot of Azure security baseline compliance](./04.png)
-  
-  ![Screenshot of Azure security baseline evaluated details](./05.png)
-
-## Cleanup
-
-Complete the following steps to clean up your environment.
-
-Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Remove the Azure security baseline policy assignments by executing the following PowerShell script,
-
-```powershell
-$ResourceGroup = Get-AzResourceGroup -Name '<Name of the Azure resource group>'
-
-Remove-AzPolicyAssignment -Name 'Windows machines should meet requirements of the Azure compute security baseline' -Scope $ResourceGroup.ResourceId -Confirm
-
-Remove-AzPolicyAssignment -Name 'Linux machines should meet requirements for the Azure compute security baseline' -Scope $ResourceGroup.ResourceId -Confirm
-```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_ssh/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_ssh/_index.md
deleted file mode 100644
index 4cba6604bb..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_ssh/_index.md
+++ /dev/null
@@ -1,159 +0,0 @@
----
-type: docs
-title: "Server SSH Access"
-linkTitle: "Server SSH Access"
-weight: 15
-description: >
----
-
-## Enable SSH access to Azure Arc-enabled servers
-
-The following Jumpstart scenario will guide you on how to enable [SSH access to Azure Arc-enabled servers](https://docs.microsoft.com/azure/azure-arc/servers/ssh-arc-overview), this feature allows you to connect over SSH to your Arc-enabled servers both Linux and Windows without requiring a public IP address or additional open ports.
-
-> **NOTE: SSH for Arc-enabled servers is currently in Preview**
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but if you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers SSH feature depends on the following Azure resource provider in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-  
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User is editing the shell script (1-time edit) environment variables section. These environment values are being used throughout the deployment.
-
-2. User runs the shell script. The script will:
-
-    - Add the required CLI extensions
-    - Create the default connectivity endpoint
-
-3. User connects to the Arc-enabled server and enables connections on the hybrid agent.
-
-4. User tests SSH connection.
-
-## Deployment
-
-- To run the automation, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/ssh) and edit the environment section of the [shell script](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/ssh/enable_ssh.sh)
-
-  - _`subscription`_: your Azure subscription ID.
-  - _`resourceGroup`_: Resource Group where your Azure Arc-enabled server is registered to.
-  - _`arcServer`_: Name of your Azure Arc-enabled server as it is shown in the Azure Portal.
-
-    ![Parameters](./01.png)
-
-- From the deployment folder run the below command:
-
-  ```shell
-    . ./enable_ssh.sh
-  ```
-
-  > **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the other commands.**
-
-    ![Script's output](./02.png)
-
-- It is required to connect to the Azure Arc-enabled server for allowing connectivity to the Connected Machine agent. To do that, connect to the server and open an administrative session and run the below command.
-
-  ```shell
-    azcmagent config set incomingconnections.ports 22
-  ```
-
-    ![Set Agents incomming connections](./03.png)
-
-## SSH connection test
-
-- Once the script has finished its run, you should be able to connect via SSH to the Azure Arc-enabled server by running the below command.
-
-  ```shell
-    az ssh arc --resource-group <resource_group> --name <arc_enabled_server> --local-user <username>
-  ```
-
-    ![Test SSH connection](./04.png)
-
-  > **NOTE: if your Arc-enabled server uses other authentication methods make sure to review the [_az ssh arc_ documentation](https://docs.microsoft.com/cli/azure/ssh?view=azure-cli-latest#az-ssh-arc).**
-
-## Cleanup
-
-To disable SSH access to an Azure Arc-enabled server, run the below command.
-
-  ```shell
-  az rest --method delete --uri https://management.azure.com/subscriptions/<subscription>/resourceGroups/<resourcegroup>/providers/Microsoft.HybridCompute/machines/<arc enabled server name>/providers/Microsoft.HybridConnectivity/endpoints/default?api-version=2021-10-06-preview
-  ```
-
-On the Azure Arc-enabled-server's operating system, remove the configured port by running the below command on the server:
-
-  ```shell
-  azcmagent config set incomingconnections.ports ""
-  ```
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_updateManagementCenter/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_updateManagementCenter/_index.md
deleted file mode 100644
index 6dba2a3abe..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_updateManagementCenter/_index.md
+++ /dev/null
@@ -1,239 +0,0 @@
----
-type: docs
-title: "Update Management Center"
-linkTitle: "Update Management Center"
-weight: 17
-description: >
----
-
-## Onboard Azure Arc-enabled servers to Update Management Center
-
-The following Jumpstart scenario will guide you on how to onboard Azure Arc-enabled servers to [Update Management Center](https://learn.microsoft.com/azure/update-center/overview).
-
-> **NOTE: Currently, Update Management Center is in public preview.**
-
-Update Management Center is a unified service to help manage and govern updates for all your machines. You can monitor Windows and Linux update compliance across your deployments in Azure, on-premises, and on the other cloud platforms from a single dashboard. Using Update Management Center, you can make updates in real-time or schedule them within a defined maintenance window.
-
-> **NOTE: This scenario assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc. If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-Please review the [Update Management Center supported OS documentation](https://learn.microsoft.com/azure/update-center/support-matrix?tabs=azurevm%2Cazurearc-os#supported-operating-systems) and ensure that the VMs you will use for this exercise are supported.
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshot below, you can see a Windows and a Linux server that have been connected with Azure Arc and are visible as resources in Azure:
-
-    ![Screenshot of Azure Arc-enabled servers](./01.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- To complete this scenario, the user or service principal running the automation need these minimum Role-based access control (RBAC) permissions: _Resource Policy Contributor_ and _Microsoft.Resources/deployments/_ on the resource group where you have your Azure Arc-enabled servers.
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow:
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User is verifying the successful template deployment.
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2FupdateManagementCenter%2Fupdate-management-center-template.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for just the ARM template parameters highlighted below. For more information about these parameters, see their description provided in the [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/updateManagementCenter/update-management-center.parameters.json).
-
-  ![Screenshot of Azure portal deployment](./02.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [parameters file](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/updateManagementCenter/update-management-center.parameters.json) providing the values that match your configuration as described below:
-
-    ![Screenshot of ARM template parameters file](./03.png)
-
-  > **NOTE: For the _maintenanceTimeZone_ parameter, the list of time zones can be obtained by executing _[System.TimeZoneInfo]::GetSystemTimeZones()_ in PowerShell. Example: Pacific Standard Time, Romance Standard Time, Middle East Standard Time.**
-
-- Deploy the [ARM template](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/updateManagementCenter/update-management-center-template.json) by running the following command, specifying the resource group where you have your Azure Arc-enabled servers:
-
-    ```shell
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-file <The update-management-center-template.json template file location> \
-    --parameters <The update-management-center.parameters.json template file location>
-    ```
-
-- Once the template has completed its run, you should see an output as follows:
-
-    ![Screenshot of ARM template execution output](./04.png)
-
-## Update Assessment
-
-In the resource group that you specified as a parameter, there will be a new policy assignment named "_(jumpstart) Configure periodic checking for missing system updates on azure Arc-enabled servers_". This policy, once it's remediated, enables Periodic Assessment.
-
-Periodic Assessment is a setting on your machine that enables you to see the latest updates available for your machines and removes the hassle of performing assessment manually every time you need to check the update status. Once you enable this setting, Update Management Center fetches updates on your machine once every 24 hours.
-
-- Go to your **resource group** and click on **Policies**:
-
-    ![Screenshot of Resource Group - Policies](./05.png)
-
-- You will see the _(jumpstart) Configure periodic checking for missing system updates on azure Arc-enabled servers_ policy assigned. Then, click on **Remediation**:
-
-    ![Screenshot of Policy for checking missing updates](./06.png)
-
-- Right click on the policy _(jumpstart) Configure periodic checking for missing system updates on azure Arc-enabled servers_ policy assigned. Then, click on **Remediate**:
-
-    ![Screenshot of Policy for checking missing updates - Remediation](./07.png)
-
-- You will see your Azure Arc-enabled server as a resource to be remediated. Click on the **Remediate** button:
-
-    ![Screenshot of Policy for checking missing updates - trigger remediation](./08.png)
-
-- You can see the status of the **Remediation task** and the number of resources remediated:
-
-    ![Screenshot of Policy for checking missing updates - remediation completed](./09.png)
-
-  > **NOTE: You will need to wait some time until the first update assessment is run.**
-
-- On the update assessment task is run, go back to your **Azure Arc-enabled server** and click on **Extensions**, you will see that a new extension has been installed. Update Management Center relies on this Azure extension designed to provide all the functionality required to interact with the operating system to manage the assessment and application of updates.
-
-    ![Screenshot of Update Management Center extension](./10.png)
-
-- Click on **Updates**. Under **Recommended updates**, you will see which are the missing updates on this machine:
-
-    ![Screenshot of Missing updates](./11.png)
-
-- If you click on the **History** tab, you will see the details related to the updates assessment and operations:
-
-    ![Screenshot of Update assessment history](./12.png)
-
-## Update Deployment
-
-As part of this scenario, a new **Maintenance Configuration** resource is created. It allows you to schedule recurring updates deployments on your Azure Arc-enabled servers.
-
-- Go to your **resource group** and click on the new **Maintenance Configuration** resource:
-
-    ![Screenshot of new maintenance configuration resource](./13.png)
-
-- Review the following **Maintenance Configuration** settings: **Machines**, which includes the Azure Arc-enabled server; **Schedule** of the maintenance configuration resource (it will start one day after you deploy this scenario), and **Updates** settings:
-
-    ![Screenshot of Maintenance configuration resource - machines](./14.png)
-
-    ![Screenshot of Maintenance configuration resource - schedule](./15.png)
-
-    ![Screenshot of Maintenance configuration resource - updates](./16.png)
-
-- Once the **Schedule** triggers the **Maintenance Configuration**, you will be able to see the results. Go back to your **Azure Arc-enabled server**, click on **Updates**, and then on **History**:
-
-    ![Screenshot of Update deployment history](./17.png)
-
-    ![Screenshot of Update deployment history details](./18.png)
-
-## Update Management Center
-
-From the **Update Management Center**, you can oversee the update compliance for your entire fleet of machines in Azure, on-premises, and other cloud environments.
-You can also instantly deploy critical updates to help secure your machines.
-
-- On the top bar search, type **Update Management Center** and click on it:
-
-    ![Screenshot of Update Management Center](./19.png)
-
-- The **Overview** blade shows you the current updates status of your hybrid environment:
-
-    ![Screenshot of Update Management Center - Overview](./20.png)
-
-- If you click on **Machines**, you will get more details per each individual machine:
-
-    ![Screenshot of Update Management Center - Machines](./21.png)
-
-- Moreover, **History** shows you all the updates activities on your hybrid environment:
-
-    ![Screenshot of Update Management Center - History](./22.png)
-
-- Lastly, under the **Workbooks** section, there is a built-in workbook that provides an unified view for your current updates status:
-
-    ![Screenshot of Update Management Center - Workbooks](./23.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment:
-
-- [Delete the Azure Policy Assignment](https://learn.microsoft.com/cli/azure/policy/assignment?view=azure-cli-latest#az-policy-assignment-delete)
-
-  - First, get the Policy assignment name from its Assignment ID:
-  
-    ![Screenshot of Policy Assignment ID](./24.png)
-
-  - Run the following command:
-
-    ```shell
-    az policy assignment delete \
-    --name <Policy Assignment ID> \
-    --scope <Resource Group ID>
-    ```
-
-- [Delete the maintenance configuration](https://learn.microsoft.com/azure/virtual-machines/maintenance-configurations-cli#delete-a-maintenance-configuration)
-
-  - Run the following command:
-  
-    ```shell
-    az maintenance configuration delete \
-    --subscription <Subscription ID> \
-    -g <Name of the Azure resource group> \
-    --resource-name <Name of the maintenance configuration resource>
-    ```
-
-- [Remove the extensions on Azure Arc-enabled server](https://learn.microsoft.com/azure/azure-arc/servers/manage-vm-extensions-cli#remove-extensions)
-
-  - For **Windows** machines, run the following two commands:
-  
-    ```shell
-    az connectedmachine extension delete \
-    --machine-name <Name of the Azure Arc-enabled server> \
-    --name "WindowsPatchExtension" \
-    -g <Name of the Azure resource group>
-    ```
-
-    ```shell
-    az connectedmachine extension delete \
-    --machine-name <Name of the Azure Arc-enabled server> \
-    --name "WindowsOsUpdateExtension" \
-    -g <Name of the Azure resource group>
-    ```
-
-  - For **Linux** machines, run the following two commands:
-  
-    ```shell
-    az connectedmachine extension delete \
-    --machine-name <Name of the Azure Arc-enabled server> \
-    --name "LinuxPatchExtension" \
-    -g <Name of the Azure resource group>
-    ```
-
-    ```shell
-    az connectedmachine extension delete \
-    --machine-name <Name of the Azure Arc-enabled server> \
-    --name "LinuxOsUpdateExtension" \
-    -g <Name of the Azure resource group>
-    ```
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_customscript_arm/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_customscript_arm/_index.md
deleted file mode 100644
index 8aa934c105..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/day2/arc_vm_extension_customscript_arm/_index.md
+++ /dev/null
@@ -1,200 +0,0 @@
----
-type: docs
-title: "Custom Script Extension"
-linkTitle: "Custom Script Extension"
-weight: 5
-description: >
----
-
-## Deploy Custom Script Extension on Azure Arc Linux and Windows servers using Extension Management
-
-The following Jumpstart scenario will guide you on how to execute custom scripts on Azure Arc-enabled servers by using Virtual Machine extensions. Virtual machine extensions are small applications that provide post-deployment configuration and automation tasks such as software installation, anti-virus protection, or a mechanism to run a custom script.
-
-You can use the Azure portal, Azure CLI, an ARM template, PowerShell or Linux Shell script, or Azure policies to manage the extension deployment to Azure Arc-enabled servers. In this scenario, we will use an ARM template to deploy the custom script extension. This extension downloads and executes scripts on virtual machines and it is useful for post deployment configuration, software installation, or any other configuration or management tasks.
-
-> **NOTE: This guide assumes you already deployed VMs or servers that are running on-premises or other clouds and you have connected them to Azure Arc but If you haven't, this repository offers you a way to do so in an automated fashion:**
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
-
-## Prerequisites
-
-- As mentioned, this scenario starts at the point where you already deployed and connected VMs or servers to Azure Arc. In the screenshots below you can see a GCP server has been connected with Azure Arc and is visible as a resource in Azure.
-
-    ![Screenshot Azure Arc-enabled server on resource group](./01.png)
-
-    ![Screenshot Azure Arc-enabled server on connected status](./02.png)
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure Service Principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- In order to demonstrate the custom script extension, we will use the below Linux and Windows scripts.
-  - [*Linux*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/custom_script_linux.sh): The script will modify the message of the day (MOTD) on the operating system.
-  - [*Windows*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/custom_script_windows.ps1): The script will install Windows Terminal, Microsoft Edge, 7zip and Visual Studio Code [Chocolaty](https://chocolatey.org/) packages on the VM.
-
-## Deployment Options and Automation Flow
-
-This Jumpstart scenario provides multiple paths for deploying and configuring resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-
-The steps below will help you get familiar with the automation and deployment flow.
-
-1. User provides the ARM template parameter values, either via the portal or editing the parameters file. These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User logs in to the Azure Arc-enabled server to check the configurations made by the custom script extension.
-
-## Deployment Option 1: Azure portal
-
-- For the Windows VM custom script extension. Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fextensions%2Farm%2Fcustomscript-templatewindows.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  - _`Resource Group`_: Azure Resource Group where your Azure Arc-enabled server is registered
-  - _`Location`_: Azure region where your Azure Arc-enabled server is connected to
-  - _`VM Name`_: name of your Azure Arc-enabled server
-  - _`File Uris`_: for Windows provide https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/scripts/custom_script_windows.ps1
-  
-  - _`Command to excute:`_ provide `./custom_script_linux.sh`
-
-  ![Screenshot showing Azure portal deployment](./03.png)
-
-  ![Screenshot showing Azure portal deployment](./04.png)
-
-- For the Linux VM custom script extension. Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_servers_jumpstart%2Fextensions%2Farm%2Fcustomscript-templatelinux.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters:
-
-  - _`Resource Group`_: Azure Resource Group where your Azure Arc-enabled server is registered
-  - _`Location`_: Azure region where your Azure Arc-enabled server is connected to
-  - _`VM Name`_: name of your Azure Arc-enabled server
-  - _`File Uris`_: for Linux provide ["https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/scripts/custom_script_linux.sh"] include the URL in brackets
-  - _`Commant to Execute`_: provide ./custom_script_linux.sh
-
-  ![Screenshot showing Azure portal deployment](./05.png)
-
-  ![Screenshot showing Azure portal deployment](./06.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will leverage ARM templates.
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the extensions parameters file for [*Windows*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/extensions/arm/customscript-templatewindows.parameters.json) or for [*Linux*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/extensions/arm/customscript-templatelinux.parameters.json)
-
-   ![Screenshot parameters file](./07.png)
-
-- To match your environment configuration, you will need to provide the following information:
-
-  - The VM name as it is registered in Azure Arc.
-
-    ![Screenshot Azure Arc-enabled server machine name](./08.png)
-
-  - The location of the resource group where you registered the Azure Arc-enabled server.
-
-    ![Screenshot Azure region](./09.png)
-
-  - A public Uri for the script that you would like to run on the servers, in this case use the URL for the script in raw format.
-    - For Windows: [Public Uri](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/scripts/custom_script_windows.ps1)
-    - For Linux: [Public Uri](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_servers_jumpstart/scripts/custom_script_linux.sh)
-
-  - To run either script, use the below commands:
-
-    - Windows:
-
-         ```powershell
-         powershell -ExecutionPolicy Unrestricted -File custom_script_windows.ps1
-         ```
-
-    - Linux:
-
-         ```bash
-         ./custom_script_linux.sh
-         ```
-
-- To deploy the ARM template for Linux or Windows, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/extensions/arm) and run the below command with the templates that match your operating system:
-
-    ```bash
-    az deployment group create --resource-group <Name of the Azure resource group> \
-    --template-file <The *customscript-template.json* template file location for Linux or Windows> \
-    --parameters <The *customscript-template.parameters.json* template file location>
-    ```
-
-- Once the template deployment has completed it's run, you should see an output as follows:
-
-    ![Screenshot ARM template output](./10.png)
-
-- To verify a successful deployment on the Azure Arc-enabled server, in the Azure Portal, by clicking on "Extensions" settings. You should see the Custom Script extension installed.
-
-    ![Screenshot custom script extension](./11.png)
-
-- Another way to verify successful custom script execution is by connecting to the VMs and verifying that the operating system has been configured.
-
-  - For the Linux VM, use SSH to connect the VM and check out the message of the day which was customized by the script:
-
-    ![Screenshot message of the day changed](./12.png)
-
-  - For the Windows VM, use RDP to connect the VM and verify that the additional software has been installed: Microsoft Edge, 7zip and Visual Studio Code.
-
-    ![Screenshot additional software installed](./13.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment.
-
-Remove the virtual machines from each environment by following the teardown instructions from each guide.
-
-- **[GCP Ubuntu instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/)**
-- **[GCP Windows instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/)**
-- **[AWS Ubuntu EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_ubuntu/)**
-- **[AWS Amazon Linux 2 EC2 instance](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/aws/aws_terraform_al2/)**
-- **[Azure Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_linux/)**
-- **[Azure Windows VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure/azure_arm_template_win/)**
-- **[VMware vSphere Ubuntu VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/)**
-- **[VMware vSphere Windows Server VM](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/)**
-- **[Vagrant Ubuntu box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/)**
-- **[Vagrant Windows box](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/)**
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/gcp/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/gcp/_index.md
deleted file mode 100644
index 8a0622d3bd..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/gcp/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Google Cloud Platform"
-linkTitle: "Google Cloud Platform"
-weight: 6
-description: >-
-  If you are working in a multi-cloud environment, you can deploy new GCP instances in an automated fashion using Terraform and onboard it as Azure Arc-enabled servers.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/_index.md
deleted file mode 100644
index 3f1404898f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_ubuntu/_index.md
+++ /dev/null
@@ -1,214 +0,0 @@
----
-type: docs
-title: "Ubuntu GCP instance"
-linkTitle: "Ubuntu GCP instance"
-weight: 1
-description: >
----
-
-## Deploy a GCP Ubuntu instance and connect it to Azure Arc using a Terraform plan
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an Ubuntu Server GCP virtual machine and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- [Create free Google Cloud account]((https://cloud.google.com/free))
-
-- [Install Terraform >=1.1.9](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Google Cloud account with billing enabled - [Create a free trial account](https://cloud.google.com/free). To create Windows Server virtual machines, you must upgraded your account to enable billing. Click Billing from the menu and then select Upgrade in the lower right.
-
-    ![Screenshot showing how to enable billing on GCP account](./01.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./02.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./03.png)
-
-    **Disclaimer - To prevent unexpected charges, please follow the "Delete the deployment" section at the end of this README**
-
-- Create Azure service principal (SP)
-
-    To connect the GCP virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User creates and configures a new GCP project along with a Service Account key which Terraform will use to create and manage resources
-
-2. User edits the tfvars to match the environment.
-
-3. User runs ```terraform init``` to download the required terraform providers
-
-4. User runs the automation. The terraform plan will:
-
-    - Create a Windows Server VM in GCP
-    - Create an Azure Resource Group
-    - Install the Azure Connected Machine agent by executing a PowerShell script when the VM is first booted. Optionally a semi-automated deployment is provided if you want to demo/control the actual registration process.
-
-5. User verifies the VM is create in GCP and the new Azure Arc-enabled resource in the Azure portal.
-
-## Create a new GCP Project
-
-- Browse to <https://console.developers.google.com> and login with your Google Cloud account. Once logged in, [create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo". After creating it, be sure to copy down the project id as it is usually different than the project name.
-
-    ![Screenshot of GCP Cloud console create project screen](./04.png)
-
-    ![Screenshot of GCP cloud new project screen](./05.png)
-
-- Once the new project is created and selected in the dropdown at the top of the page, you must enable Compute Engine API access for the project. Click on "Enable APIs and Services" and search for "Compute Engine". Then click Enable to enable API access.
-
-    ![Screenshot of GCP console showing enabling Compute Engine API](./06.png)
-
-    ![Screenshot of GCP console showing enabling Compute Engine API](./07.png)
-
-- Next, set up a service account key, which Terraform will use to create and manage resources in your GCP project. Go to the [create service account key page](https://console.cloud.google.com/apis/credentials/serviceaccountkey). Select "New Service Account" from the dropdown, give it a name, select Project then Owner as the role, JSON as the key type, and click Create. This downloads a JSON file with all the credentials that will be needed for Terraform to manage the resources. Copy the downloaded JSON file to the [_azure_arc_servers_jumpstart/gcp/ubuntu/terraform_](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/gcp/ubuntu/terraform) directory.
-
-    ![Screenshot of GCP cloud console showing creation of service account](./08.png)
-
-    ![Screenshot of GCP cloud console showing creation of service account](./09.png)
-
-- Finally, make sure your SSH keys are available in _~/.ssh_ and named *id_rsa.pub* and *id_rsa*. If you followed the ssh-keygen guide above to create your key then this should already be setup correctly. If not, you may need to modify [_main.tf_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/gcp/ubuntu/terraform/main.tf) to use a key with a different path.
-
-## Deployment
-
-The only thing you need to do before executing the Terraform plan is to create the tfvars file which will be used by the plan. This is based on the Azure service principal you've just created and your subscription.
-
-- Navigate to the [terraform folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/gcp/ubuntu/terraform) and fill in the terraform.tfvars file with the values for your environment.
-
-- Run the ```terraform init``` command which will download the required terraform providers.
-
-    ![Screenshot showing terraform init being run](./10.png)
-
-- Next, run the ```terraform apply --auto-approve``` command and wait for the plan to finish. Upon completion, you will have a GCP Ubuntu VM deployed and connected as a new Azure Arc-enabled server inside a new resource group.
-
-- Open the Azure portal and navigate to the resource group "Arc-GCP-Demo". The virtual machine created in GCP will be visible as a resource.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server](./11.png)
-
-## Semi-Automated Deployment (Optional)
-
-- As you may have noticed, the last step of the run is to register the VM as a new Azure Arc-enabled server resource.
-
-    ![Screenshot showing azcmagent connect script](./12.png)
-
-- If you want to demo/control the actual registration process, do the following:
-
-- In the [*install_arc_agent.sh.tmpl*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/gcp/ubuntu/terraform/scripts/install_arc_agent.sh.tmpl) script template, comment out the "Run connect command" section and save the file.
-
-    ![Screenshot showing azcmagent connect commented out](./13.png)
-
-- Get the public IP of the GCP VM by running ```terraform output```
-
-    ![Screenshot showing terraform output](./14.png)
-
-- SSH the VM using the ```ssh arcdemo@x.x.x.x``` where x.x.x.x is the host ip.
-
-- Provide values to the environment variables to match your environment in the file [_vars.sh_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/gcp/ubuntu/terraform/scripts/vars.sh). Export the variables by copying and pasting the contents of the file
-
-    ![Screenshot showing export of environment variables from vars.sh](./15.png)
-
-- Run the following command:
-
-    ```shell
-    sudo azcmagent connect \
-        --service-principal-id "${appId}" \
-        --service-principal-secret "${appPassword}" \
-        --tenant-id "${tenantId}" \
-        --subscription-id "${subscriptionId}" \
-        --location "${location}" \
-        --resource-group "${resourceGroup}" \
-        --resource-name $HOSTNAME \
-        --correlation-id "d009f5dd-dba8-4ac7-bac9-b54ef3a6671a"
-    ```
-
-    ![Screenshot of azcmagent connect being run](./16.png)
-
-- When complete, your VM will be registered with Azure Arc and visible in the resource group inside Azure Portal.
-
-## Delete the deployment
-
-To delete all the resources you created as part of this demo use the ```terraform destroy --auto-approve``` command as shown below.
-
-![Screenshot of terraform destroy being run](./17.png)
-
-Alternatively, you can delete the GCP VM directly from [GCP Console](https://console.cloud.google.com/compute/instances).
-
-![Screenshot of deleting VM from GCP cloud console](./18.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/_index.md
deleted file mode 100644
index 5552edfa69..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/gcp/gcp_terraform_windows/_index.md
+++ /dev/null
@@ -1,186 +0,0 @@
----
-type: docs
-title: "Windows GCP instance"
-linkTitle: "Windows GCP instance"
-weight: 2
-description: >
----
-
-## Deploy a GCP Windows instance and connect it to Azure Arc using a Terraform plan
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a Windows Server GCP virtual machine and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install Terraform >=1.1.9](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Google Cloud account with billing enabled - [Create a free trial account](https://cloud.google.com/free). To create Windows Server virtual machines, you must upgraded your account to enable billing. Click Billing from the menu and then select Upgrade in the lower right.
-
-    ![Screenshot showing how to enable billing on GCP account](./01.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./02.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./03.png)
-
-    ***Disclaimer*** - **To prevent unexpected charges, please follow the "Delete the deployment" section at the end of this README**
-
-- Create Azure service principal (SP)
-
-    To connect the GCP virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User creates and configures a new GCP project along with a Service Account key which Terraform will use to create and manage resources
-
-2. User edits the tfvars to match the environment.
-
-3. User runs ```terraform init``` to download the required terraform providers
-
-4. User runs the automation. The terraform plan will:
-
-    - Create a Windows Server VM in GCP
-    - Create an Azure Resource Group
-    - Install the Azure Connected Machine agent by executing a PowerShell script when the VM is first booted. Optionally a semi-automated deployment is provided if you want to demo/control the actual registration process.
-
-5. User verifies the VM is create in GCP and the new Azure Arc-enabled resource in the Azure portal.
-
-## Create a new GCP Project
-
-- Browse to <https://console.cloud.google.com> and login with your Google Cloud account. Once logged in, [create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo". After creating it, be sure to copy down the project id as it is usually different than the project name.
-
-    ![Screenshot of GCP Cloud console create project screen](./04.png)
-
-    ![Screenshot of GCP cloud new project screen](./05.png)
-
-- Once the new project is created and selected in the dropdown at the top of the page, you must enable Compute Engine API access for the project. Click on "Enable APIs and Services" and search for "Compute Engine". Then click Enable to enable API access.
-
-    ![Screenshot of GCP console showing enabling Compute Engine API](./06.png)
-
-    ![Screenshot of GCP console showing enabling Compute Engine API](./07.png)
-
-- Next, set up a service account key, which Terraform will use to create and manage resources in your GCP project. Go to the [create service account key page](https://console.cloud.google.com/apis/credentials/serviceaccountkey). Select "New Service Account" from the dropdown, give it a name, select Project then Owner as the role, JSON as the key type, and click Create. This downloads a JSON file with all the credentials that will be needed for Terraform to manage the resources. Copy the downloaded JSON file to the *azure_arc_servers_jumpstart/gcp/windows/terraform* directory.
-
-    ![Screenshot of GCP cloud console showing creation of service account](./08.png)
-
-    ![Screenshot of GCP cloud console showing creation of service account](./09.png)
-
-## Deployment
-
-The only thing you need to do before executing the Terraform plan is to edit the tfvars file which will be used by the plan to customize it to your environment.
-
-- Navigate to the [terraform folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/gcp/ubuntu/terraform) and fill in the terraform.tfvars file with the values for your environment.
-
-- Run the ```terraform init``` command which will download the required terraform providers.
-
-- Next, run the ```terraform apply --auto-approve``` command and wait for the plan to finish. Upon completion of the Terraform script, you will have deployed a GCP Windows Server 2019 VM and initiated a script to download the Azure Arc agent to the VM and connect the VM as a new Azure Arc-enabled server inside a new Azure resource group. It will take a few minutes for the agent to finish provisioning.
-
-    ![Screenshot of terraform apply being run](./10.png)
-
-- After a few minutes, you should be able to open the Azure portal and navigate to the resource group "Arc-GCP-Demo". The Windows Server virtual machine created in GCP will be visible as a resource.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled server](./11.png)
-
-## Semi-Automated Deployment (Optional)
-
-- The Terraform plan automatically installs the Azure Connected Machine agent and connects the VM to Azure as a managed resource by executing a PowerShell script when the VM is first booted.
-
-    ![Screenshot showing azcmagent connect script](./12.png)
-
-- If you want to demo/control the actual registration process, do the following:
-
-- Before running the ```terraform apply``` command, open [*main.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/gcp/windows/terraform/main.tf) and comment out the ```windows-startup-script-ps1 = local_file.install_arc_agent_ps1.content``` line and save the file.
-
-    ![Screenshot showing main.tf being commented to disable automatic onboarding of Azure Arc agent](./13.png)
-
-- Run ```terraform apply --auto-approve``` as instructed above.
-
-- Open the Google Cloud console and navigate to the [Compute Instance page](https://console.cloud.google.com/compute/instances), then click on the VM that was created.
-
-    ![Screenshot showing GCP cloud console with GCP server](./14.png)
-
-    ![Screenshot showing how to reset password of GCP Windows server](./15.png)
-
-- Create a user and password for the VM by clicking "Set Password" and specifying a username.
-
-    ![Screenshot showing setting username and password of GCP server](./16.png)
-
-- RDP into the VM by clicking the RDP button from the VM page in Google Cloud console, and login with the username and password you just created.
-
-    ![Screenshot showing how to RDP into GCP instance](./17.png)
-
-- Once logged in, open PowerShell ISE **as Administrator**. Make sure you are running the x64 version of PowerShell ISE and not x86. Once open, select File->New to create an empty .ps1 file. Then paste in the entire contents of *./scripts/install_arc_agent.ps1]*. Click the play button to execute the script. When complete, you should see the output showing successful onboarding of the machine.
-
-    ![Screenshot showing Powershell ISE with Azure Arc agent connection script](./18.png)
-
-## Delete the deployment
-
-- To delete all the resources you created as part of this demo use the ```terraform destroy --auto-approve``` command as shown below.
-
-    ![Screenshot showing terraform destroy being run](./19.png)
-
-- Alternatively, you can delete the GCP VM directly from [GCP Console](https://console.cloud.google.com/compute/instances).
-
-    ![Screenshot showing how to delete GCP VM from cloud console](./20.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/general/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/general/_index.md
deleted file mode 100644
index 6677335301..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/general/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Onboarding"
-linkTitle: "Onboarding"
-weight: 1
-description: >-
-  The scenarios in this section can be used to onboard your existing Windows or Linux servers as Azure Arc-enabled servers.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/general/onboard_server_linux/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/general/onboard_server_linux/_index.md
deleted file mode 100644
index d1ad7e322d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/general/onboard_server_linux/_index.md
+++ /dev/null
@@ -1,110 +0,0 @@
----
-type: docs
-title: "Existing Linux server"
-linkTitle: "Existing Linux server"
-weight: 1
-description: >
----
-
-## Connect an existing Linux server to Azure Arc
-
-The following Jumpstart scenario will guide you on how to connect an Linux server to Azure Arc using a simple shell script.
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To connect a server to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- Create a new Azure resource group where you want your server(s) to show up.
-
-    ![Screenshot showing Azure Portal with empty resource group](./01.png)
-
-- Download the [az_connect_linux](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/az_connect_linux.sh) shell script.
-
-- Change the environment variables according to your environment.
-
-    ![Screenshot showing az_connect_linux shell script](./02.png)
-
-- Copy the script to the designated server using your preferred tool of choice (or copy/paste the script to a new file inside the server). Below example shows copy the script from MacOS to the server using SCP.
-
-    ![Screenshot showing scp being run](./03.png)
-
-## Deployment
-
-Run the script using the ```. ./az_connect_linux.sh``` command.
-
-> **NOTE: The extra dot is due to the script having an _export_ function and needs to have the vars exported in the same shell session as the rest of the commands.**
-
-Upon completion, you will have your Linux server, connected as a new Azure Arc resource inside your resource group.
-
-![Screenshot showing az_connect_linux script being run](./04.png)
-
-![Screenshot showing Azure Portal with Azure Arc-enabled resource](./05.png)
-
-![Screenshot showing Azure Portal with Azure Arc-enabled resource detail](./06.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the server via the Azure Portal, just select server and delete it.
-
-![Screenshot showing delete resource function in Azure Portal](./07.png)
-
-If you want to nuke the entire environment, just delete the Azure resource group.
-
-![Screenshot showing delete resource group function in Azure Portal](./08.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/general/onboard_server_win/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/general/onboard_server_win/_index.md
deleted file mode 100644
index 1e0399d92c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/general/onboard_server_win/_index.md
+++ /dev/null
@@ -1,108 +0,0 @@
----
-type: docs
-title: "Existing Windows server"
-linkTitle: "Existing Windows server"
-weight: 2
-description: >
----
-
-## Connect an existing Windows server to Azure Arc
-
-The following Jumpstart scenario will guide you on how to connect an Windows machine to Azure Arc using a simple PowerShell script.
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To connect a server to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- Create a new Azure resource group where you want your machine(s) to show up.
-
-    ![Screenshot showing Azure Portal with empty resource group](./01.png)
-
-- Download the [az_connect_win](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/az_connect_win.ps1) PowerShell script.
-
-- Change the environment variables according to your environment and copy the script to the designated machine.
-
-    ![Screenshot showing PowerShell script](./02.png)
-
-## Deployment
-
-On the designated machine, Open PowerShell ISE **as Administrator** and run the script. Note the script is using *$env:ProgramFiles* as the agent installation path so make sure **you are not using PowerShell ISE (x86)**.
-
-![Screenshot showing PowerShell script](./03.png)
-
-![Screenshot showing PowerShell script](./04.png)
-
-Upon completion, you will have your Windows server, connected as a new Azure Arc resource inside your resource group.
-
-![Screenshot showing PowerShell script being run](./05.png)
-
-![Screenshot showing Azure Portal with Azure Arc-enabled server resource](./06.png)
-
-![Screenshot showing Azure Portal with Azure Arc-enabled server resource detail](./07.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the server via the Azure Portal, just select server and delete it.
-
-![Screenshot showing delete resource function in Azure Portal](./08.png)
-
-If you want to delete the entire environment, just delete the Azure resource group.
-
-![Screenshot showing delete resource group function in Azure Portal](./09.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/_index.md
deleted file mode 100644
index b8e90a7da1..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Scaled Deployment"
-linkTitle: "Scaled Deployment"
-weight: 9
-description: >-
-  The scenarios in this section are designed to provide scaled onboarding experience to Azure Arc of virtual machines deployed in various platforms and existing environments.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/aws_scaled_ansible/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/aws_scaled_ansible/_index.md
deleted file mode 100644
index b4aa6f404e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/aws_scaled_ansible/_index.md
+++ /dev/null
@@ -1,250 +0,0 @@
----
-type: docs
-title: "AWS EC2 dynamic inventory with Ansible"
-linkTitle: "AWS EC2 dynamic inventory with Ansible"
-weight: 3
-description: >
----
-
-## Dynamic scaled onboarding of AWS EC2 instances to Azure Arc using Ansible
-
-The following Jumpstart scenario will guide you on how to automatically perform scaled onboarding of AWS EC2 instances to Azure Arc by using [Ansible](https://www.ansible.com/).
-
-This guide assumes that you have a basic understanding of Ansible. A basic Ansible playbook and configuration is provided that uses the [amazon.aws.aws_ec2](https://docs.ansible.com/ansible/latest/collections/amazon/aws/aws_ec2_inventory.html) plugin for dynamic loading of EC2 server inventory.
-
-This guide can be used even if you do not already have an existing Ansible test environment and includes a Terraform plan that will create a sample AWS EC2 server inventory comprised of four (4) Windows Server 2019 servers and four (4) Ubuntu servers along with a basic CentOS 7 Ansible control server with a simple configuration.
-
-***Warning***: *The provided Ansible sample workbook uses WinRM with password authentication and HTTP to configure Windows-based servers. This is not advisable for production environments. If you are planning to use Ansible with Windows hosts in a production environment then you should use [WinRM over HTTPS](https://docs.microsoft.com/troubleshoot/windows-client/system-management-components/configure-winrm-for-https) with a certificate.*
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client).
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- [Create free AWS account](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/)
-
-- [Install Terraform >=0.13](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- Create Azure service principal (SP)
-
-    To connect the AWS virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Create an AWS identity
-
-In order for Terraform to create resources in AWS, we will need to create a new AWS IAM role with appropriate permissions and configure Terraform to use it.
-
-- Login to the [AWS management console](https://console.aws.amazon.com)
-
-- After logging in, click the "Services" dropdown in the top left. Under "Security, Identity, and Compliance" select "IAM" to access the [Identity and Access Management page](https://console.aws.amazon.com/iam/home)
-
-    ![Screenshot of AWS cloud console](./19.png)
-
-    ![Screenshot of IAM AWS cloud console](./20.png)
-
-- Click on "Users" from the left menu and then click on "Add user" to create a new IAM user.
-
-    ![Screenshot of new user creation in AWS cloud console](./21.png)
-
-- On the "Add User" screen, name the user "terraform" and select the "Programmatic Access" checkbox then click "Next"
-
-    ![Screenshot of new user creation in AWS cloud console](./22.png)
-
-- On the next "Set Permissions" screen, select "Attach existing policies directly" and then check the box next to AmazonEC2FullAccess as seen in the screenshot then click "Next"
-
-    ![Screenshot showing new user in AWS cloud console](./23.png)
-
-- On the tags screen, assign a tag with a key of "azure-arc-demo" and click "Next" to proceed to the Review screen.
-
-    ![Screenshot showing tags in AWS cloud console](./24.png)
-
-- Double check that everything looks correct and click "Create user" when ready.
-
-    ![Screenshot showing creating a user in AWS cloud console](./25.png)
-
-- After the user is created, you will see the user's Access key ID and Secret access key. Copy these values down before clicking the Close button. In the screen below, you can see an example of what this should look like. Once you have these keys, you will be able to use them with Terraform to create AWS resources.
-
-    ![Screenshot showing created user in AWS cloud console](./26.png)
-
-## Option 1- Creating a sample AWS server inventory and Ansible control server using Terraform and onboarding the servers to Azure Arc
-
-**NOTE: If you already have an existing AWS server inventory and Ansible server, skip below to Option 2.**
-
-### Configure Terraform
-
-Before executing the Terraform plan, you must export the environment variables which will be used by the plan. These variables are based on your Azure subscription and tenant, the Azure service principal, and the AWS IAM user and keys you just created.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command.
-
-- The Terraform plan creates resources in both Microsoft Azure and AWS. It then executes a script on an AWS EC2 virtual machine to install Ansible and all necessary artifacts. This Terraform plan requires certain information about your AWS and Azure environments which it accesses using environment variables. Edit [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform/scripts/vars.sh) and update each of the variables with the appropriate values.
-
-  - TF_VAR_subscription_id=Your Azure subscription ID
-  - TF_VAR_client_id=Your Azure service principal app id
-  - TF_VAR_client_secret=Your Azure service principal password
-  - TF_VAR_tenant_id=Your Azure tenant ID
-  - AWS_ACCESS_KEY_ID=AWS access key
-  - AWS_SECRET_ACCESS_KEY=AWS secret key
-
-- From your shell, navigate to the *azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform*) directory of the cloned repo.
-
-- Export the environment variables you edited by running [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform/scripts/vars.sh) with the source command as shown below. Terraform requires these to be set for the plan to execute properly.
-
-    ```shell
-    source ./scripts/vars.sh
-    ```
-
-- Make sure your SSH keys are available in *~/.ssh* and named *id_rsa.pub* and *id_rsa*. If you followed the ssh-keygen guide above to create your key then this should already be setup correctly. If not, you may need to modify [*aws_infra.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform/aws_infra.tf) to use a key with a different path.
-
-- Run the ```terraform init``` command which will download the required Terraform providers.
-
-    ![Screenshot of terraform init being run](./01.png)
-
-### Deploy server infrastructure
-
-- From the *azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform- directory, run ```terraform apply --auto-approve``` and wait for the plan to finish. Upon successful completion, you will have four (4) Windows Server 2019 servers, four (4) Ubuntu servers, and one (1) CentOS 7 Ansible control server.
-
-- Open the AWS console and verify you can see the created servers.
-
-    ![Screenshot of AWS console showing EC2 instances](./02.png)
-
-### Run the Ansible playbook to onboard the AWS EC2 instances as Azure Arc-enabled servers
-
-- When the Terraform plan completes, it will display the public IP of the Ansible control server in an output variable named *ansible_ip*. SSH into the Ansible server by running the ```ssh centos@XX.XX.XX.XX``` where XX.XX.XX.XX is substituted for your Ansible server's IP address.
-
-    ![Screenshot of SSH into Ansible control server](./03.png)
-
-- Change directory to the *ansible* directory by running ```cd ansible```. This folder contains the sample Ansible configuration and the playbook we will use to onboard the servers to Azure Arc.
-
-    ![Screenshot of Ansible config folder in shell](./04.png)
-
-- The aws_ec2 Ansible plugin requires AWS credentials to dynamically read your AWS server inventory. We will export these as environment variables. Run the commands below, replacing the values for AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY with AWS credentials you created earlier.
-
-    ```shell
-    export AWS_ACCESS_KEY_ID="XXXXXXXXXXXXXXXXX"
-    export AWS_SECRET_ACCESS_KEY="XXXXXXXXXXXXXXX"
-    ```
-
-- Replace the placeholder values for Azure tenant ID and subscription id in the [group_vars/all.yml](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform/ansible_config/group_vars/all.yml) with the appropriate values for your environment.
-
-    ![Screenshot of variables YAML file](./09.png)
-
-- Run the Ansible playbook by executing the following command, substituting your Azure service principal id and service principal secret.
-
-    ```shell
-    ansible-playbook arc_agent.yml -i ansible_plugins/inventory_uswest2_aws_ec2.yml --extra-vars '{"service_principal_id": "XXXXXXX-XXXXX-XXXXXXX", "service_principal_secret": "XXXXXXXXXXXXXXXXXXXXXXXX"}'
-    ```
-
-    If the playbook run is successful, you should see output similar to the below screenshot.
-
-    ![Screenshot of Ansible playbook being run](./05.png)
-
-- Open Azure Portal and navigate to the Arc-AWS-Demo resource group. You should see the Azure Arc-enabled servers listed.
-
-    ![Screenshot of Azure Portal showing onboard Azure Arc-enabled servers](./06.png)
-
-### Clean up environment by deleting resources
-
-To delete all the resources you created as part of this demo use the ```terraform destroy --auto-approve``` command as shown below.
-
-![Screenshot of terraform destroy being run](./07.png)
-
-## Option 2 - Onboarding an existing AWS server inventory to Azure Arc using your own Ansible control server
-
-> **NOTE: If you do not have an existing AWS server inventory and Ansible server, navigate back to Option 1**
-
-### Review provided Ansible configuration and playbook
-
-Navigate to the *ansible_config* directory and review the provided configuration. The provided configuration contains a basic *ansible.cfg* file. This file enables the [amazon.aws.aws_ec2](https://docs.ansible.com/ansible/latest/collections/amazon/aws/aws_ec2_inventory.html) Ansible plugin which dynamically loads your server inventory by using an AWS IAM role. Ensure that the IAM role you are using has sufficient privileges to access the inventory you wish to onboard.
-
-![Screenshot showing Ansible config file](./08.png)
-
-The file [inventory_uswest2_aws_ec2.yml](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/aws/scaled_deployment/ansible/terraform/ansible_config/ansible_plugins/inventory_uswest2_aws_ec2.yml) configures the aws_ec2 plugin to pull inventory from uswest-2 region and group assets by applied tags. Adjust this file as needed to support onboarding your server inventory (e.g., change region, or change groups or filters).
-
-The files in ***./ansible_config/group_vars*** should be adjusted to provide the credentials you wish to use to onboard various ansible host groups.
-
-When you have adjusted the provided config to support your environment, run the Ansible playbook by executing the following command, substituting your Azure service principal id and service principal secret.
-
-```shell
-ansible-playbook arc_agent.yml -i ansible_plugins/inventory_uswest2_aws_ec2.yml --extra-vars '{"service_principal_id": "XXXXXXX-XXXXX-XXXXXXX", "service_principal_secret": "XXXXXXXXXXXXXXXXXXXXXXXX"}'
-```
-
-If the playbook run is successful, you should see output similar to the below screenshot.
-
-![Screenshot showing Ansible playbook being run](./05.png)
-
-Open Azure Portal and navigate to the Arc-Aws-Demo resource group. You should see the Azure Arc-enabled servers listed.
-
-![Screenshot showing Azure Portal with Azure Arc-enabled servers](./06.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/configuration_manager_scaled_runscript/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/configuration_manager_scaled_runscript/_index.md
deleted file mode 100644
index 3d58b3976b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/configuration_manager_scaled_runscript/_index.md
+++ /dev/null
@@ -1,163 +0,0 @@
----
-type: docs
-title: "Windows server with Configuration Manager using PowerShell"
-linkTitle: "Windows server with Configuration Manager using PowerShell"
-weight: 4
-description: >
----
-## Connect an existing Windows server to Azure Arc using Configuration Manager with PowerShell
-
-The following Jumpstart scenario will guide you on how to connect a Windows machine to Azure Arc with a PowerShell script using Configuration Manager.
-
-This guide assumes that you already have an installation of [Microsoft Configuration Manager](https://docs.microsoft.com/mem/configmgr/core/understand/introduction), at least one active Windows server client, and a basic understanding of the product.
-
-## Prerequisites
-
-- Make sure you have met all the Configuration Manager [prerequisites](https://docs.microsoft.com/mem/configmgr/apps/deploy-use/create-deploy-scripts#prerequisites) in order to use the "Run Script" feature.
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To connect a server to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- Create a new Azure resource group where you want your machine(s) to show up.
-
-    ![Screenshot showing Azure Portal with empty resource group](./01.png)
-
-- Download the [_az_connect_win_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/az_connect_win.ps1) PowerShell script.
-
-- Change the environment variables according to your environment and save the script.
-
-    ![Screenshot showing PowerShell script](./02.png)
-
-## Setting the PowerShell execution policy in Configuration Manager
-
-In order for Configuration Manager to run the PowerShell script in this scenario, we will need to set the PowerShell execution policy and allow the script authors to approve their own scripts.
-
-   > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is recommended to follow the security recommendations in your organization when it comes to PowerShell scripts execution policy and approvals**
-
-- Login to the Configuration Manager console.
-
-- After logging in, go to the “Administration” workspace. Under “Site Configuration”, select “Client Settings” and open the properties of the "Default Client Settings".
-
-   > **NOTE: You might have different client settings, choose the appropriate one that is deployed to the servers you are onboarding to Azure Arc**
-
-    ![Screenshot showing client settings in the configuration manager console](./03.png)
-
-- Click the “Computer Agent” settings, change the “PowerShell execution policy” to “Bypass”.
-
-    ![Screenshot showing Computer Agent settings in the configuration manager console](./04.png)
-
-## Configuration of the PowerShell script approval settings in Configuration Manager
-
-- Go to the “Administration” workspace. Under “Site Configuration”, select “Sites” and select the Configuration Manager site. Click on “Hierarchy Settings”.
-
-    ![Screenshot showing sites settings in the configuration manager console](./05.png)
-
-- In the “General” tab, uncheck the “Script authors require additional script approver” option.
-
-    ![Screenshot showing script approval settings in the configuration manager console](./06.png)
-
-## Deployment
-
-- Go to the “Software Library” workspace. Click on “Create Script”.
-
-    ![Screenshot showing script creation in the configuration manager console](./07.png)
-
-- Provide a name to the script. Paste the content of the [_az_connect_win_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/az_connect_win.ps1) PowerShell script you downloaded earlier. Click “Next” and “Close”.
-
-    ![Screenshot showing script creation in the configuration manager console](./08.png)
-
-- Select the script and click “Approve/Deny”. Proceed to approve the script and close.
-
-    ![Screenshot showing script approval settings in the configuration manager console](./09.png)
-
-    ![Screenshot showing script approving in the configuration manager console](./10.png)
-
-- Go to the “Assets and Compliance” workspace. Expand on “Device Collections” and select the collection that contains the server(s) you want to onboard. Right-click the collection and click on “Run Script”.
-
-    ![Screenshot showing opening the run script context menu in the configuration manager console](./11.png)
-
-- Select the script you created and click “Next”. Wait for the script to finish execution.
-
-    ![Screenshot showing running the script in the configuration manager console](./12.png)
-
-    ![Screenshot showing the script progress in the configuration manager console](./13.png)
-
-    ![Screenshot showing the script results in the configuration manager console](./14.png)
-
-- Click on the “Run Details” tab. Double click on “Script Output” to see the output of the script.
-
-    ![Screenshot showing the script result message in the configuration manager console](./15.png)
-
-    ![Screenshot showing the script output in the configuration manager console](./16.png)
-
-- Upon completion, you will have your Windows server, connected as a new Azure Arc-enabled server resource inside your resource group.
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled server resource](./17.png)
-
-    ![Screenshot showing Azure Portal with Azure Arc-enabled server resource detail](./18.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the server via the Azure Portal, just select server and delete it.
-
-![Screenshot showing delete resource function in Azure Portal](./19.png)
-
-If you want to delete the entire environment, just delete the Azure resource group.
-
-![Screenshot showing delete resource group function in Azure Portal](./20.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/configuration_manager_scaled_tasksequence/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/configuration_manager_scaled_tasksequence/_index.md
deleted file mode 100644
index 546b5fba15..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/configuration_manager_scaled_tasksequence/_index.md
+++ /dev/null
@@ -1,215 +0,0 @@
----
-type: docs
-title: "Windows server with Configuration Manager using a Task Sequence"
-linkTitle: "Windows server with Configuration Manager using a Task Sequence"
-weight: 5
-description: >
----
-## Connect an existing Windows server to Azure Arc using Configuration Manager with a Task Sequence
-
-The following Jumpstart scenario will guide you on how to connect a Windows machine to Azure Arc with a Task Sequence using Configuration Manager.
-
-This guide assumes that you already have an installation of [Microsoft Configuration Manager](https://docs.microsoft.com/mem/configmgr/core/understand/introduction) and a basic understanding of the product, at least one active Windows server client, an active distribution point.
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP)
-
-    To connect a server to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- Create a new Azure resource group where you want your machine(s) to show up.
-
-    ![Screenshot showing Azure Portal with empty resource group](./01.png)
-
-- Download the [_az_connect_win_ConfigMgr_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/az_connect_win_ConfigMgr.ps1) PowerShell script.
-
-- Change the environment variables according to your environment and save the script.
-
-    ![Screenshot showing PowerShell script](./02.png)
-
-## Creating an msi application to deploy the Azure Connected Machine agent within the Task Sequence
-
-- Download the Azure Connected Machine agent package for Windows from the [Microsoft Download Center](https://aka.ms/AzureConnectedMachineAgent) and copy it to the Configuration Manager server.
-
-- Login to the Configuration Manager console.
-
-- After logging in, go to the “Software Library” workspace. Under “Application Management”, click  “Applications” and click "Create Application".
-
-    ![Screenshot showing the creation of a new application](./03.png)
-
-- Browse to the location of the downloaded Azure Connected Machine agent MSI package and click “Next”.
-
-    ![Screenshot showing the path of the agent](./04.png)
-
-- Add any relevant information about this application. Keep the defaults for the installation program and install behavior and click “Next” to finalize the application.
-
-    ![Screenshot showing the application configuration](./05.png)
-
-    ![Screenshot showing the created application](./06.png)
-
-- Select the newly created application and click on “Distribute Content”.
-
-    ![Screenshot showing initiating a content distribution](./07.png)
-
-- Keep the defaults and click “Next”.
-
-    ![Screenshot showing the initial content distribution wizard](./08.png)
-
-- Make sure to have the Azure Connected Machine agent application selected click “Next”.
-
-    ![Screenshot showing the application being distributed](./09.png)
-
-- Click “Add”, select “Distribution Point” and select one or more distribution points where you would like to distribute the application.
-
-    ![Screenshot showing the distribution point option](./10.png)
-
-    ![Screenshot showing the distribution point selection](./11.png)
-
-- Click “Next” to finalize the wizard and initiate the content distribution.
-
-    ![Screenshot showing a successful content distribution](./12.png)
-
-## Creating a custom Task Sequence for the Azure Connected Machine agent deployment
-
-In order for Configuration Manager to onboard servers in this scenario, we will need to create a custom Task Sequence that has two steps; first to deploy the Azure Connected Machine agent as an application and second to run the “azcmagent connect” command to onboard to Azure Arc.
-
-- Go to the “Software Library” workspace. Under “Operating Systems”, select “Task Sequences”, click "Create Task Sequence" and select “Create a new custom task sequence”.
-
-    ![Screenshot showing a new custom task Sequence](./13.png)
-
-- Give the Task Sequence and name, leave all the defaults and click “Next” to finalize the wizard.
-
-    ![Screenshot showing a new custom task Sequence properties](./14.png)
-
-- Select the newly created Task Sequence and Click “Edit” to open the Task Sequence editor.
-
-    ![Screenshot showing the task Sequence editor](./15.png)
-
-- Click “Add” to add a new Task Sequence step, select “Software” and click on “Install Application”.
-
-    ![Screenshot showing adding an application install step](./16.png)
-
-- Give the step a name, and click the “edit” button to select the Azure Connected Machine agent application.
-
-    ![Screenshot showing adding the agent application](./17.png)
-
-    ![Screenshot showing adding the agent application step completed](./18.png)
-
-- Click “Add” to add a new Task Sequence step, select “General” and click on “Run PowerShell Script”.
-
-    ![Screenshot showing adding the Powershell script step](./19.png)
-
-- Give the step a name, “Select the PowerShell execution policy” to be Bypass, select the option to “Enter a PowerShell script” and click “Add Script”.
-
-    ![Screenshot showing adding the PowerShell script details](./20.png)
-
-- Paste the content of the [_az_connect_win_ConfigMgr_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/scripts/az_connect_win_ConfigMgr.ps1) PowerShell script you downloaded earlier and click “Ok”.
-
-    ![Screenshot showing adding the PowerShell script code](./21.png)
-
-- Click “Ok” to finalize the task sequence.
-
-    ![Screenshot showing adding the finished task sequence](./22.png)
-
-## Deployment
-
-- Go to the “Assets and Compliance” workspace. Expand on “Device Collections” and select the collection that contains the server(s) you want to onboard. Click “Deploy” and click “Task Sequence”.
-
-    ![Screenshot showing deploying the task sequence](./23.png)
-
-- Click on “Browse” and select the Task Sequence created.
-
-    ![Screenshot showing selecting the task sequence to deploy](./24.png)
-
-- Choose the deployment to be available (the deployment can be required or available based on your scenario).
-
-    ![Screenshot showing selecting the enforcement method](./25.png)
-
-- Keep the defaults and finalize the Task Sequence deployment wizard.
-
-- Connect to the server to be onboarded and open “Software Center”. After the server's machine policy has been refreshed, you should see the Task Sequence deployment in the Applications available in Software Center.
-
-    ![Screenshot showing software center](./26.png)
-
-- Click on the Task Sequence deployment and click “Install”.
-
-    ![Screenshot showing software center installation step](./27.png)
-
-- The progress of the Task Sequence will be displayed showing the two steps we created.
-
-    ![Screenshot showing the first task sequence step](./28.png)
-
-    ![Screenshot showing the second task sequence step](./29.png)
-
-    ![Screenshot showing the task sequence completion](./30.png)
-
-- Upon completion, you will have your Windows server, connected as a new Azure Arc-enabled server resource inside your resource group.
-
-    ![Screenshot showing the server onboarded](./31.png)
-
-    ![Screenshot showing the server connected successfully](./32.png)
-
-## Delete the deployment
-
-The most straightforward way is to delete the server via the Azure Portal, just select server and delete it.
-
-![Screenshot showing delete resource function in Azure Portal](./33.png)
-
-If you want to delete the entire environment, just delete the Azure resource group.
-
-![Screenshot showing delete resource group function in Azure Portal](./34.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/vmware_scaled_powercli_linux/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/vmware_scaled_powercli_linux/_index.md
deleted file mode 100644
index 5798db793e..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/vmware_scaled_powercli_linux/_index.md
+++ /dev/null
@@ -1,171 +0,0 @@
----
-type: docs
-title: "VMware vSphere Linux VMs"
-linkTitle: "VMware vSphere Linux VMs"
-weight: 2
-description: >
----
-
-## Scaled onboarding of VMware vSphere Linux VMs to Azure Arc using VMware PowerCLI
-
-The following Jumpstart scenario will guide you on how to use the provided [VMware PowerCLI](https://code.vmware.com/web/dp/tool/vmware-powercli/) script so you can perform an automated scaled deployment of the "Azure Arc Connected Machine Agent" in multiple VMware vSphere virtual machines and as a result, onboard these VMs as Azure Arc-enabled servers.
-
-This guide assumes you already have an exiting inventory of VMware Virtual Machines and will leverage the PowerCLI PowerShell module to automate the onboarding process of the VMs to Azure Arc.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Install VMware PowerCLI
-
-  > **NOTE: This guide was tested with the latest version of PowerCLI as of date (12.0.0) but earlier versions are expected to work as well**
-
-  - Supported PowerShell Versions - VMware PowerCLI 12.0.0 is compatible with the following PowerShell versions:
-    - Windows PowerShell 5.1
-    - PowerShell 7
-    - Detailed installation instructions can be found [here](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.esxi.install.doc/GUID-F02D0C2D-B226-4908-9E5C-2E783D41FE2D.html) but the easiest way is to use the VMware.PowerCLI module from the PowerShell Gallery using the below command.
-
-    ```powershell
-    Install-Module -Name VMware.PowerCLI
-    ```
-
-- To be able to read the VM inventory from vCenter as well as invoke a script on the VM OS-level, the following permissions are needed:
-
-  - [VirtualMachine.GuestOperations](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.security.doc/GUID-6A952214-0E5E-4CCF-9D2A-90948FF643EC.html) user account
-
-  - VMware vCenter Server user assigned with a ["Read Only Role"](https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.vsphere.security.doc/GUID-93B962A7-93FA-4E96-B68F-AE66D3D6C663.html)
-
-- An operating system user account on the Linux guest VM. This user account must not prompt for password on sudo commands. To configure passwordless sudo:
-
-  - Login to the linux VM.
-
-  - Run the below command.
-  
-    ```shell
-    sudo visudo
-    ```
-
-    Or you could also edit the /etc/sudoers file directly with the command:
-
-     ```shell
-    vi /etc/sudoers
-    ```
-
-  - Append the following line replacing <username> with the appropriate user name.
-
-    ```shell
-    <username> ALL=(ALL) NOPASSWD:ALL
-    ```
-
-- Create Azure service principal (SP)
-
-    To connect the VMware vSphere virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Automation Flow
-
-Below you can find the automation flow for this scenario:
-
-1. User edit the [*vars.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/linux/vars.ps1) PowerCLI script
-
-2. Upon execution of the [*scale_deploy.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/linux/scale_deploy.ps1) PowerShell script:
-
-    - The script will auto-generate a *vars.sh* shell script with the user's Azure environment variables.
-
-    - The script execution will initiate authentication against vCenter and will scan the targeted VM folder where Azure Arc candidate VMs are located and will copy both the auto-generated *vars.sh* and the *install_arc_agent.sh* shell scripts to VM Linux OS located in */vmware/scaled_deploy/powercli/linux* to each VM in that VM folder.
-
-3. The *install_arc_agent.sh* shell script will run on the VM guest OS and will install the "Azure Arc Connected Machine Agent" in order to onboard the VM to Azure Arc
-
-## Pre-Deployment
-
-To demonstrate the before & after for this scenario, the below screenshots shows a dedicated, empty Azure resource group, a vCenter VM folder with candidate VMs and the */var/opt/* directory showing no agent is installed.
-
-![An empty Azure resource group](./01.png)
-
-![Vanilla VMware vSphere VM with no Azure Arc agent](./02.png)
-
-![Vanilla VMware vSphere VM with no Azure Arc agent](./03.png)
-
-## Deployment
-
-Before running the PowerCLI script, you must set the [environment variables](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/linux/vars.ps1) which will be used by the *install_arc_agent.sh* script. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your VMware vSphere credentials and data.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command
-
-- Use the Azure service principal ID and password created in the prerequisites section
-
-    ![Export environment variables](./04.png)
-
-- From the [*azure_arc_servers_jumpstart\vmware\scaled_deploy\powercli\linux*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/linux/) folder, open PowerShell session as an Administrator and run the *scale_deploy.ps1* script.
-
-    ![scale_deploy PowerShell script](./05.png)
-
-    ![scale_deploy PowerShell script](./06.png)
-
-    ![scale_deploy PowerShell script](./07.png)
-
-- Upon completion, the VM will have the "Azure Arc Connected Machine Agent" installed as well as the Azure resource group populated with the new Azure Arc-enabled servers.
-
-    ![Azure Arc Connected Machine Agent installed](./08.png)
-
-    ![New Azure Arc-enabled servers in an Azure resource group](./09.png)
-
-    ![New Azure Arc-enabled servers in an Azure resource group](./10.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/vmware_scaled_powercli_win/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/vmware_scaled_powercli_win/_index.md
deleted file mode 100644
index a564ab2e04..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/scaled_deployment/vmware_scaled_powercli_win/_index.md
+++ /dev/null
@@ -1,145 +0,0 @@
----
-type: docs
-title: "VMware vSphere Windows Server VMs"
-linkTitle: "VMware vSphere Windows Server VMs"
-weight: 1
-description: >
----
-
-## Scaled onboarding of VMware vSphere Windows Server VMs to Azure Arc using VMware PowerCLI
-
-The following Jumpstart scenario will guide you on how to use the provided [VMware PowerCLI](https://code.vmware.com/web/dp/tool/vmware-powercli/) script so you can perform an automated scaled deployment of the "Azure Arc Connected Machine Agent" in multiple VMware vSphere virtual machines and as a result, onboard these VMs as Azure Arc-enabled servers.
-
-This guide assumes you already have an exiting inventory of VMware Virtual Machines and will leverage the PowerCLI PowerShell module to automate the onboarding process of the VMs to Azure Arc.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Install VMware PowerCLI
-
-  > **NOTE: This guide was tested with the latest version of PowerCLI as of date (12.0.0) but earlier versions are expected to work as well**
-
-  - Supported PowerShell Versions - VMware PowerCLI 12.0.0 is compatible with the following PowerShell versions:
-    - Windows PowerShell 5.1
-    - PowerShell 7
-    - Detailed installation instructions can be found [here](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.esxi.install.doc/GUID-F02D0C2D-B226-4908-9E5C-2E783D41FE2D.html) but the easiest way is to use the VMware.PowerCLI module from the PowerShell Gallery using the below command.
-
-    ```powershell
-    Install-Module -Name VMware.PowerCLI
-    ```
-
-- To be able to read the VM inventory from vCenter as well as invoke a script on the VM OS-level, the following permissions are needed:
-
-  - [VirtualMachine.GuestOperations](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.security.doc/GUID-6A952214-0E5E-4CCF-9D2A-90948FF643EC.html) user account
-
-  - VMware vCenter Server user assigned with a ["Read Only Role"](https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.vsphere.security.doc/GUID-93B962A7-93FA-4E96-B68F-AE66D3D6C663.html)
-
-- Create Azure service principal (SP)
-
-    To connect the VMware vSphere virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-## Automation Flow
-
-Below you can find the automation flow for this scenario:
-
-1. User edit the *vars.ps1* PowerCLI script
-
-2. The *scale_deploy.ps1* script execution will initiate authentication against vCenter and will scan the targeted VM folder where Azure Arc candidate VMs are located and will copy both the *vars.ps1* and the *install_arc_agent.ps1* PowerCLI scripts to VM Windows OS located in [this folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/windows) to each VM in that VM folder.
-
-3. The *install_arc_agent.ps1* PowerCLI script will run on the VM guest OS and will install the "Azure Arc Connected Machine Agent" in order to onboard the VM to Azure Arc
-
-## Pre-Deployment
-
-To demonstrate the before & after for this scenario, the below screenshots shows a dedicated, empty Azure Resources Group, a vCenter VM folder with candidate VMs and the "Apps & features" view in Windows showing no agent is installed.
-
-![An empty Azure resource group](./01.png)
-
-![Vanilla VMware vSphere VM with no Azure Arc agent](./02.png)
-
-![Vanilla VMware vSphere VM with no Azure Arc agent](./03.png)
-
-## Deployment
-
-Before running the PowerCLI script, you must set the [environment variables](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/windows/vars.ps1) which will be used by the *install_arc_agent.ps1* script. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your VMware vSphere credentials and data.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command
-
-- Use the Azure service principal ID and password created in the prerequisites section
-
-![Export environment variables](./04.png)
-
-- From the [*azure_arc_servers_jumpstart\vmware\scaled_deploy\powercli\windows*](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/windows) folder, open PowerShell session as an Administrator and run the [*scale_deploy.ps1*](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/vmware/scaled_deployment/powercli/windows/scale_deploy.ps1) script.
-
-    ![scale_deploy PowerShell script](./05.png)
-
-    ![scale_deploy PowerShell script](./06.png)
-
-    ![scale_deploy PowerShell script](./07.png)
-
-- Upon completion, the VM will have the "Azure Arc Connected Machine Agent" installed as well as the Azure resource group populated with the new Azure Arc-enabled servers.
-
-    ![Azure Arc Connected Machine Agent installed](./08.png)
-
-    ![New Azure Arc-enabled servers in an Azure resource group](./09.png)
-
-    ![New Azure Arc-enabled servers in an Azure resource group](./10.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/_index.md
deleted file mode 100644
index 8b5abdafb6..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "HashiCorp Vagrant"
-linkTitle: "HashiCorp Vagrant"
-weight: 4
-description: >-
-  If you don't have any existing servers available, the scenarios in this section will guide you on using HashiCorp Vagrant to host a new server locally in order to simulate an "on-premises" server and onboard it as an Azure Arc-enabled server.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/_index.md
deleted file mode 100644
index ec0fb90f4b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_ubuntu/_index.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-type: docs
-title: "Ubuntu Vagrant box"
-linkTitle: "Ubuntu Vagrant box"
-weight: 1
-description: >
----
-
-## Deploy a local Ubuntu server hosted with Vagrant and connect it Azure Arc
-
-The following Jumpstart scenario will guide you on how to deploy a local **Ubuntu** virtual machine using [Vagrant](https://www.vagrantup.com/) and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Vagrant relies on an underlying hypervisor. For the purpose of this guide, we will be using "Oracle VM VirtualBox".
-
-  - Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
-
-    - If you are an OSX user, simply run ```brew cask install virtualbox```
-    - If you are a Windows user, you can use the [Chocolatey package](https://chocolatey.org/packages/virtualbox)
-    - If you are a Linux user, all package installation methods can be found [here](https://www.virtualbox.org/wiki/Linux_Downloads)
-
-  - Install [Vagrant](https://www.vagrantup.com/docs/installation/)
-
-    - If you are an OSX user, simply run ```brew cask install vagrant```
-    - If you are a Windows user, you can use the [Chocolatey package](https://chocolatey.org/packages/vagrant)
-    - If you are a Linux user, look [here](https://www.vagrantup.com/downloads.html)
-
-- Create Azure service principal (SP)
-
-    To connect the Vagrant virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- The Vagrantfile executes a script on the VM OS to install all the needed artifacts as well to inject environment variables. Edit the [*scripts/vars.sh*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/local/vagrant/ubuntu/scripts/vars.sh) shell script to match the Azure service principal you've just created.
-
-  - subscriptionId=Your Azure subscription ID
-  - appId=Your Azure service principal name
-  - password=Your Azure service principal password
-  - tenantId=Your Azure tenant ID
-  - resourceGroup=Azure resource group name
-  - location=Azure region
-
-## Deployment
-
-Like any Vagrant deployment, a [*Vagrantfile*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/local/vagrant/ubuntu/Vagrantfile) and a [Vagrant Box](https://www.vagrantup.com/docs/boxes.html) is needed. At a high-level, the deployment will:
-
-1. Download the Ubuntu 16.04 image file [Vagrant Box](https://app.vagrantup.com/ubuntu/boxes/xenial64)
-2. Execute the installation script
-
-After editing the ***scripts/vars.sh*** script to match your environment, from the *Vagrantfile* folder, run ```vagrant up```. As this is the first time you are creating the VM, the first run will be **much slower** than the ones to follow. This is because the deployment is downloading the Ubuntu box for the first time.
-
-![Screenshot of vagrant up being run](./01.png)
-
-Once the download is complete, the actual provisioning will start. As you can see in the screenshot below, the process takes no longer than 3 minutes.
-
-![Screenshot of completed vagrant up](./02.png)
-
-Upon completion, you will have a local Ubuntu VM deployed, connected as a new Azure Arc-enabled server inside a new resource group.
-
-![Screenshot of Azure portal showing Azure Arc-enabled server](./03.png)
-
-![Screenshot of Azure portal showing Azure Arc-enabled server detail](./04.png)
-
-## Semi-Automated Deployment (Optional)
-
-As you may noticed, the last step of the run is to register the VM as a new Azure Arc-enabled server resource.
-
-![Screenshot of vagrant up being run](./05.png)
-
-In a case you want to demo/control the actual registration process, to the following:
-
-* In the [*install_arc_agent*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/local/vagrant/ubuntu/scripts/install_arc_agent.sh) shell script, comment out the "Run connect command" section and save the file. You can also comment out or change the creation of the resource group.
-
-    ![Screenshot of the azcmagent connect command](./06.png)
-
-    ![Screenshot of the az group create command](./07.png)
-
-- SSH the VM using the ```vagrant ssh``` command.
-
-    ![Screenshot of of SSH to the Vagrant machine](./08.png)
-
-- Run the same *azcmagent connect* command you've just commented out using your environment variables.
-
-    ![Screenshot of the azcmagent connect](./09.png)
-
-## Delete the deployment
-
-To delete the entire deployment, run the ```vagrant destroy -f``` command. The Vagrantfile includes a *before: destroy* Vagrant trigger which will run a script to delete the Azure resource group before destroying the actual VM. That way, you will be starting fresh next time.
-
-![Screenshot of vagrant destroy being run](./10.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/_index.md
deleted file mode 100644
index 5d3ae9740f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vagrant/local_vagrant_windows/_index.md
+++ /dev/null
@@ -1,154 +0,0 @@
----
-type: docs
-title: "Windows Vagrant box"
-linkTitle: "Windows Vagrant box"
-weight: 2
-description: >
----
-
-## Deploy a local Windows server hosted with Vagrant and connect it to Azure Arc
-
-The following Jumpstart scenario will guide you on how to deploy a local **Windows 10** virtual machine using [Vagrant](https://www.vagrantup.com/) and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Vagrant relies on an underlying hypervisor. For the purpose of this guide, we will be using "Oracle VM VirtualBox".
-
-  - Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
-
-    - If you are an OSX user, simply run ```brew cask install virtualbox```
-    - If you are a Windows user, you can use the [Chocolatey package](https://chocolatey.org/packages/virtualbox)
-    - If you are a Linux user, all package installation methods can be found [here](https://www.virtualbox.org/wiki/Linux_Downloads)
-
-  - Install [Vagrant](https://www.vagrantup.com/docs/installation/)
-
-    - If you are an OSX user, simply run ```brew cask install vagrant```
-    - If you are a Windows user, you can use the [Chocolatey package](https://chocolatey.org/packages/vagrant)
-    - If you are a Linux user, look [here](https://www.vagrantup.com/downloads.html)
-
-- Create Azure service principal (SP)
-
-    To connect the Vagrant virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-- The Vagrantfile executes a script on the VM OS to install all the needed artifacts as well to inject environment variables. Edit the [*scripts/vars.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/local/vagrant/windows/scripts/vars.ps1) PowerShell script to match the Azure service principal you've just created.
-
-  - subscriptionId=Your Azure subscription ID
-  - appId=Your Azure service principal name
-  - password=Your Azure service principal password
-  - tenantId=Your Azure tenant ID
-  - resourceGroup=Azure resource group name
-  - location=Azure region
-
-## Deployment
-
-Like any Vagrant deployment, a [*Vagrantfile*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/local/vagrant/windows/Vagrantfile) and a [Vagrant Box](https://www.vagrantup.com/docs/boxes.html) is needed. At a high-level, the deployment will:
-
-1. Download the Windows 10 image file [Vagrant Box](https://app.vagrantup.com/StefanScherer/boxes/windows_10)
-2. Execute the Arc installation script
-
-After editing the ***scripts/vars.ps1*** script to match your environment, from the *Vagrantfile* folder, run ```vagrant up```. As this is the first time you are creating the VM, the first run will be **much slower** than the ones to follow. This is because the deployment is downloading the Windows 10 box for the first time.
-
-![Screenshot of running vagrant up](./01.png)
-
-Once the download is complete, the actual provisioning will start. As you can see in the screenshot below, the process takes can take somewhere between 7 to 10 minutes.
-
-![Screenshot of completed vagrant up](./02.png)
-
-Upon completion, you will have a local Windows 10 VM deployed, connected as a new Azure Arc-enabled server inside a new resource group.
-
-![Screenshot of the Azure portal showing Azure Arc-enabled server](./03.png)
-
-![Screenshot of the Azure portal showing Azure Arc-enabled server detail](./04.png)
-
-## Semi-Automated Deployment (Optional)
-
-As you may noticed, the last step of the run is to register the VM as a new Azure Arc-enabled server resource.
-
-![Screenshot of vagrant up being completed](./05.png)
-
-In a case you want to demo/control the actual registration process, to the following:
-
-- In the [*install_arc_agent*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/local/vagrant/windows/scripts/install_arc_agent.ps1) PowerShell script, comment out the "Run connect command" section and save the file. You can also comment out or change the creation of the resource group.
-
-    ![Screenshot of the install_arc_agent PowerShell script](./06.png)
-
-    ![Screenshot of az group create being run](./07.png)
-
-- RDP the VM using the ```vagrant rdp``` command. Use *vagrant/vagrant* as the username/password.
-
-    ![Screenshot of RDP into a Vagrant server](./08.png)
-
-- Open PowerShell ISE **as Administrator** and edit the *C:\runtime\vars.ps1- with your environment variables.
-
-    ![Screenshot of PowerShell ISE](./09.png)
-
-- Paste the ```Invoke-Expression "C:\runtime\vars.ps1"``` commmand, the ```az group create --location $env:location --name $env:resourceGroup --subscription $env:subscriptionId``` command and the same *azcmagent connect* command you've just commented and execute the script.
-
-    ![Screenshot of PowerShell ISE running a script](./10.png)
-
-## Delete the deployment
-
-To delete the entire deployment, run the ```vagrant destroy -f``` command. The Vagrantfile includes a *before: destroy* Vagrant trigger which will run the command to delete the Azure resource group before destroying the actual VM. That way, you will be starting fresh next time.
-
-![Screenshot of vagrant destroy being run](./11.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vmware/_index.md
deleted file mode 100644
index d8fb9db427..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "VMware vSphere"
-linkTitle: "VMware vSphere"
-weight: 7
-description: >-
-  If you are working with an on-premises VMware vSphere infrastructure, you can deploy new Windows or Linux virtual machines in an automated fashion using Terraform and onboard it as Azure Arc-enabled servers.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/_index.md
deleted file mode 100644
index 5bb376ab08..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/_index.md
+++ /dev/null
@@ -1,148 +0,0 @@
----
-type: docs
-title: "Ubuntu VM"
-linkTitle: "Ubuntu VM"
-weight: 1
-description: >
----
-
-## Deploy a VMware Ubuntu VM and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy an Ubuntu Server, VMware vSphere virtual machine and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install Terraform >=0.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- A VMware vCenter Server user with [permissions to deploy](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-4D0F8E63-2961-4B71-B365-BBFA24673FDB.html) a Virtual Machine from a Template in the vSphere Web Client.
-
-- Make sure the VMware virtual machines you are about to onboard as Azure Arc-enabled servers are installed with the latest [VMware Tools](https://docs.vmware.com/en/VMware-Tools/index.html#:~:text=VMware%20Tools%20is%20a%20set,interactions%20with%20guest%20operating%20systems.&text=It%20includes%20a%20number%20of,for%20new%20guest%20operating%20systems.) available.
-
-- Create Azure service principal (SP)
-
-    To connect the VMware vSphere virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-### Preparing an Ubuntu Server VMware vSphere VM Template
-
-Before using the below guide to deploy an Ubuntu Server VM and connect it to Azure Arc, a VMware vSphere Template is required. [The following README](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/vmware_ubuntu_template/) will instruct you how to easily create such a template using VMware vSphere 6.5 and above.
-
-> **NOTE: If you already have an Ubuntu Server VM template it is still recommended to use the guide as a reference.**
-
-## Deployment
-
-Before executing the Terraform plan, you must set the environment variables which will be used by the plan. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your VMware vSphere credentials.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command.
-
-- The Terraform plan creates resources in both Microsoft Azure and VMware vSphere. It then executes a script on the virtual machine to install the Azure Arc agent and all necessary artifacts. This script requires certain information about your VMware vSphere and Azure environments. Edit [_scripts/vars.sh_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/ubuntu/terraform/scripts/vars.sh) and update each of the variables with the appropriate values.
-
-  - TF_VAR_subscription_id=Your Azure subscription ID
-  - TF_VAR_client_id=Your Azure service principal name
-  - TF_VAR_client_secret=Your Azure service principal password
-  - TF_VAR_tenant_id=Your Azure tenant ID
-  - TF_VAR_resourceGroup=Azure resource group name
-  - TF_VAR_location=Azure Region
-  - TF_VAR_vsphere_user=vCenter Admin Username
-  - TF_VAR_vsphere_password=vCenter Admin Password
-  - TF_VAR_vsphere_server=vCenter server FQDN/IP
-  - TF_VAR_admin_user=OS Admin Username
-  - TF_VAR_admin_password=OS Admin Password
-
-- From CLI, navigate to the _azure_arc_servers_jumpstart/vmware/ubuntu/terraform_ directory of the cloned repo.
-
-- Export the environment variables you edited by running [_scripts/vars.sh_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/ubuntu/terraform/scripts/vars.sh) with the source command as shown below. Terraform requires these to be set for the plan to execute properly. Note that this script will also be automatically executed remotely on the virtual machine as part of the Terraform deployment.
-
-    ```source ./scripts/vars.sh```
-
-- In addition to the _TF_VAR_ environment variables you've just exported, edit the Terraform variables in the [_terraform.tfvars_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/ubuntu/terraform/terraform.tfvars) to match your VMware vSphere environment.
-
-    ![ TF_VAR environment variables](./01.png)
-
-- Run the ```terraform init``` command which will download the Terraform AzureRM, Local and vSphere providers.
-
-    ![terraform init](./02.png)
-
-- Run the ```terraform apply --auto-approve``` command and wait for the plan to finish.
-
-- Once the Terraform deployment is completed, a new Ubuntu Server VM will be up & running and will be projected as an Azure Arc-enabled server resource in a newly created Azure resource group.
-
-    ![terraform apply](./03.png)
-
-    ![New VMware vSphere Ubuntu Server VM](./04.png)
-
-    ![Azure Arc-enabled server in an Azure resource group](./05.png)
-
-    ![Azure Arc-enabled server in an Azure resource group](./06.png)
-
-## Delete the deployment
-
-- The most straightforward way is to delete the Azure Arc resource via the Azure Portal, just select the resource and delete it. In addition, delete the VMware vSphere VM.
-
-    ![Delete Azure Arc-enabled server](./07.png)
-
-    If you delete the instance manually, then you should also delete _install_arc_agent.sh_ which is created by the Terraform plan.
-
-- If you want to nuke the entire environment use the ```terraform destroy --auto-approve``` command as shown below.
-
-    ![terraform destroy](./08.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/vmware_ubuntu_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/vmware_ubuntu_template/_index.md
deleted file mode 100644
index fffe4b8c48..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_ubuntu/vmware_ubuntu_template/_index.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-type: docs
-title: "Create Ubuntu vSphere template"
-linkTitle: "Create Ubuntu vSphere template"
-weight: 1
-description: >
----
-
-## Create a VMware vSphere template for Ubuntu Server 18.04
-
-The following Jumpstart scenario will guide you on how to create an Ubuntu Server 18.04 VMware vSphere virtual machine template.
-
-## Prerequisites
-
-> **NOTE: This guide assumes that you have some VMware vSphere familiarity. It is also does not designed to go over either VMware and/or Ubuntu best-practices.**
-
-- [Download the latest Ubuntu Server 18.04 ISO file](https://releases.ubuntu.com/18.04/)
-
-- VMware vSphere 6.5 and above
-
-- Although it can be used locally, for faster deployment, it is recommended to upload the file to a vSphere datastore or to vCenter Content Library.
-
-## Creating Ubuntu 18.04 VM Template
-
-### Deploying & Installing Ubuntu
-
-- Deploy new virtual machine
-
-    ![Create new VMware vSphere VM](./01.png)
-
-    ![Create new VMware vSphere VM](./02.png)
-
-    ![Create new VMware vSphere VM](./03.png)
-
-    ![Create new VMware vSphere VM](./04.png)
-
-    ![Create new VMware vSphere VM](./05.png)
-
-    ![Create new VMware vSphere VM](./06.png)
-
-- Make sure to select _Ubuntu Linux (64-bit)_ as the Guest OS.
-
-    ![Ubuntu Linux (64-bit) Guest OS](./07.png)
-
-- Point to the Ubuntu Server ISO file location.
-
-    ![Create new VMware vSphere VM](./08.png)
-
-    ![Create new VMware vSphere VM](./09.png)
-
-- Power-on the VM and start the Ubuntu installation. No specific instructions here but:
-
-  - (Optional) Consider using static IP
-  - Install OpenSSH server
-
-    ![Power-on the VM](./10.png)
-
-    ![Ubuntu installation](./11.png)
-
-    ![Ubuntu installation](./12.png)
-
-    ![Ubuntu installation](./13.png)
-
-    ![Ubuntu installation](./14.png)
-
-    ![Ubuntu installation](./15.png)
-
-    ![Ubuntu installation](./16.png)
-
-    ![Ubuntu installation](./17.png)
-
-    ![Ubuntu installation](./18.png)
-
-    ![Ubuntu installation](./19.png)
-
-    ![Ubuntu installation](./20.png)
-
-    ![Ubuntu installation](./21.png)
-
-    ![Ubuntu installation](./22.png)
-
-    ![Ubuntu installation](./23.png)
-
-    ![Ubuntu installation](./24.png)
-
-    ![Ubuntu installation](./25.png)
-
-    ![Ubuntu installation](./26.png)
-
-    ![Ubuntu installation](./27.png)
-
-    ![Ubuntu installation](./28.png)
-
-    ![Ubuntu installation](./29.png)
-
-    ![Ubuntu installation](./30.png)
-
-### Post-installation
-
-Before converting the VM to a template, few actions are needed.
-
-- It's better to have your OS packages up-to-date
-
-    ```shell
-    sudo apt-get update
-    sudo apt-get upgrade -y
-    ```
-
-- Prevent cloudconfig from preserving the original hostname and reset the hostname
-
-    ```shell
-    sudo sed -i 's/preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg
-    sudo truncate -s0 /etc/hostname
-    sudo hostnamectl set-hostname localhost
-    ```
-
-- Remove the current network configuration
-
-    ```shell
-    sudo rm /etc/netplan/50-cloud-init.yaml
-    ```
-
-- Clean shell history and shutdown the VM
-
-    ```shell
-    cat /dev/null > ~/.bash_history && history -c
-    sudo shutdown now
-    ```
-
-### Convert to Template
-
-Reduce the VM CPU count & memory resources to the minimum and convert the VM to template, switch the CD/DVD drive to client device as well disconnect it and convert the VM to template.
-
-![Reduce the VM CPU count & Memory](./31.png)
-
-![Convert the VM to template](./32.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/_index.md
deleted file mode 100644
index 1b72b41cdc..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/_index.md
+++ /dev/null
@@ -1,150 +0,0 @@
----
-type: docs
-title: "Windows VM"
-linkTitle: "Windows VM"
-weight: 2
-description: >
----
-
-## Deploy a VMware Windows VM and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a Windows Server, VMware vSphere virtual machine and connect it as an Azure Arc-enabled server resource.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- [Install Terraform >=0.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-- A VMware vCenter Server user with [permissions to deploy](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-4D0F8E63-2961-4B71-B365-BBFA24673FDB.html) a Virtual Machine from a Template in the vSphere Web Client.
-
-- Make sure the VMware virtual machines you are about to onboard as Azure Arc-enabled servers are installed with the latest [VMware Tools](https://docs.vmware.com/en/VMware-Tools/index.html#:~:text=VMware%20Tools%20is%20a%20set,interactions%20with%20guest%20operating%20systems.&text=It%20includes%20a%20number%20of,for%20new%20guest%20operating%20systems.) available.
-
-- Create Azure service principal (SP)
-
-    To connect the VMware vSphere virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Azure Arc-enabled servers depends on the following Azure resource providers in your subscription in order to use this service. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  - Microsoft.HybridCompute
-  - Microsoft.GuestConfiguration
-  - Microsoft.HybridConnectivity
-
-      ```shell
-      az provider register --namespace 'Microsoft.HybridCompute'
-      az provider register --namespace 'Microsoft.GuestConfiguration'
-      az provider register --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-      You can monitor the registration process with the following commands:
-
-      ```shell
-      az provider show --namespace 'Microsoft.HybridCompute'
-      az provider show --namespace 'Microsoft.GuestConfiguration'
-      az provider show --namespace 'Microsoft.HybridConnectivity'
-      ```
-
-### Preparing a Window Server VMware vSphere VM Template
-
-Before using the below guide to deploy a Windows Server VM and connect it to Azure Arc, a VMware vSphere Template is required. [The following README](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/vmware_winsrv2k19_template/) will instruct you how to easily create such a template using VMware vSphere 6.5 and above.
-
-**The Terraform plan leveraged the _remote-exec_ provisioner which uses the WinRM protocol to copy and execute the required Azure Arc script. To allow WinRM connectivity to the VM, run the [_allow_winrm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/winsrv/terraform/scripts/allow_winrm.ps1) PowerShell script on your VM before converting it to template.**
-
-> **NOTE: If you already have a Windows Server VM template it is still recommended to use the guide as a reference.**
-
-## Deployment
-
-Before executing the Terraform plan, you must set the environment variables which will be used by the plan. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your VMware vSphere credentials.
-
-- Retrieve your Azure subscription ID and tenant ID using the ```az account list``` command.
-
-- The Terraform plan creates resources in both Microsoft Azure and VMware vSphere. It then executes a script on the virtual machine to install the Azure Arc agent and all necessary artifacts. This script requires certain information about your VMware vSphere and Azure environments. Edit [_scripts/vars.sh_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/winsrv/terraform/scripts/vars.sh) and update each of the variables with the appropriate values.
-
-  - TF_VAR_subscription_id=Your Azure subscription ID
-  - TF_VAR_client_id=Your Azure service principal name
-  - TF_VAR_client_secret=Your Azure service principal password
-  - TF_VAR_tenant_id=Your Azure tenant ID
-  - TF_VAR_resourceGroup=Azure resource group name
-  - TF_VAR_location=Azure Region
-  - TF_VAR_vsphere_user=vCenter Admin Username
-  - TF_VAR_vsphere_password=vCenter Admin Password
-  - TF_VAR_vsphere_server=vCenter server FQDN/IP
-  - TF_VAR_admin_user=OS Admin Username
-  - TF_VAR_admin_password=OS Admin Password
-
-- From CLI, navigate to the _azure_arc_servers_jumpstart/vmware/winsrv/terraform_ directory of the cloned repo.
-
-- Export the environment variables you edited by running [_scripts/vars.sh_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/winsrv/terraform/scripts/vars.sh) with the source command as shown below. Terraform requires these to be set for the plan to execute properly. Note that this script will also be automatically executed remotely on the virtual machine as part of the Terraform deployment.
-
-    ```shell
-    source ./scripts/vars.sh
-    ```
-
-- In addition to the _TF_VAR_ environment variables you've just exported, edit the Terraform variables in the [_terraform.tfvars_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/winsrv/terraform/terraform.tfvars) to match your VMware vSphere environment.
-
-    ![TF_VAR environment variables](./01.png)
-
-- Run the ```terraform init``` command which will download the Terraform AzureRM, Local and vSphere providers.
-
-    ![terraform init](./02.png)
-
-- Run the ```terraform apply --auto-approve``` command and wait for the plan to finish.Once the Terraform deployment is completed, a new Windows Server VM will be up & running and will be projected as an Azure Arc server resource in a newly created Azure resource group.
-
-    ![terraform apply completed](./03.png)
-
-    ![New VMware vSphere Windows Server VM](./04.png)
-
-    ![Azure Arc-enabled server in an Azure resource group](./05.png)
-
-    ![Azure Arc-enabled server in an Azure resource group](./06.png)
-
-## Delete the deployment
-
-- The most straightforward way is to delete the Azure Arc resource via the Azure Portal, just select the resource and delete it. In addition, delete the VMware vSphere VM.
-
-    ![Delete Azure Arc-enabled server](./07.png)
-
-- If you delete the instance manually, then you should also delete _install_arc_agent.ps1_  which is created by the Terraform plan.
-
-- If you want to nuke the entire environment use the ```terraform destroy --auto-approve``` command as shown below.
-
-    ![terraform destroy](./08.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/vmware_winsrv2k19_template/_index.md b/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/vmware_winsrv2k19_template/_index.md
deleted file mode 100644
index e12a07efa6..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/vmware_winsrv2k19_template/_index.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-type: docs
-title: "Create Windows vSphere template"
-linkTitle: "Create Windows vSphere template"
-weight: 1
-description: >
----
-
-## Create a VMware vSphere template for Windows Server 2019
-
-The following Jumpstart scenario will guide you on how to create a Windows Server 2019 VMware vSphere virtual machine template.
-
-## Prerequisites
-
-> **NOTE: This guide assumes that you have some VMware vSphere familiarity and you have knowledge on how to install Windows Server. It is also does not designed to go over either VMware and/or Windows best-practices.**
-
-- [Download the latest Windows Server ISO file](https://www.microsoft.com/windows-server/trial)
-
-- VMware vSphere 6.5 and above
-
-- Although it can be used locally, for faster deployment, it is recommended to upload the file to a vSphere datastore or to vCenter Content Library.
-
-## Creating Windows Server 2019 VM Template
-
-### Deploying & Installing Windows Server
-
-- Deploy new virtual machine
-
-    ![Create new VMware vSphere VM](./01.png)
-
-    ![Create new VMware vSphere VM](./02.png)
-
-    ![Create new VMware vSphere VM](./03.png)
-
-    ![Create new VMware vSphere VM](./04.png)
-
-    ![Create new VMware vSphere VM](./05.png)
-
-    ![Create new VMware vSphere VM](./06.png)
-
-- Make sure to select _Microsoft Windows Server 2016 or later (64-bit)_ as the Guest OS.
-
-    ![Windows Server Guest OS](./07.png)
-
-- Point to the Windows Server ISO file location.
-
-    ![Create new VMware vSphere VM](./08.png)
-
-    ![Create new VMware vSphere VM](./09.png)
-
-- Power-on the VM and start the Windows Server installation.
-
-    ![Power-on the VM](./10.png)
-
-    ![Windows Server installation](./11.png)
-
-    ![Windows Server installation](./12.png)
-
-    ![Windows Server installation](./13.png)
-
-    ![Windows Server installation](./14.png)
-
-    ![Windows Server installation](./15.png)
-
-    ![Windows Server installation](./16.png)
-
-### Post-installation
-
-Before converting the VM to a template, few actions needs to be taken.
-
-- Install VMware Tools & Restart
-
-    ![Install VMware Tools](./17.png)
-
-    ![Install VMware Tools](./18.png)
-
-    ![Install VMware Tools](./19.png)
-
-    ![Install VMware Tools](./20.png)
-
-    ![Install VMware Tools](./21.png)
-
-    ![Install VMware Tools](./22.png)
-
-    ![Install VMware Tools](./23.png)
-
-    ![Install VMware Tools](./24.png)
-
-    ![Install VMware Tools](./25.png)
-
-- Perform Windows Updates
-
-- Change PowerShell Execution Policy to "bypass" by running the ```Set-ExecutionPolicy -ExecutionPolicy Bypass``` command in PowerShell (can be later tuned on via Group Policy or a PowerShell script).
-
-- Allow WinRM communication to the OS buy running the [_allow_winrm_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_servers_jumpstart/vmware/winsrv/terraform/scripts/allow_winrm.ps1) PowerShell script.
-
-- None of the below are mandatory but should be considered for a Windows Template:
-
-  - Disabling User Account Control (can be later tuned on via Group Policy or a PowerShell script)
-  - Turn off Windows Defender FW (can be later tuned on via Group Policy or a PowerShell script)
-  - Disabling Internet Explorer Enhanced Security Configuration (ESC) (can be later tuned on via Group Policy or a PowerShell script)
-  - Enable Remote Desktop
-  - In PowerShell, install [Chocolaty](https://chocolatey.org/install)
-
-    ```powershell
-    Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-    ```
-
-  - Install all baseline apps you may want to include in your template.
-
-### Convert to Template
-
-Reduce the VM CPU count & memory resources to the minimum and convert the VM to template, switch the CD/DVD drive to client device as well disconnect it and convert the VM to template.
-
-![Reduce the VM CPU count & Memory](./26.png)
-
-![Convert the VM to template](./27.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/_index.md
deleted file mode 100644
index a0218a60bc..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled SQL Server"
-linkTitle: "Azure Arc-enabled SQL Server"
-weight: 3
-description: >-
-  The deployment scenarios in this section will guide you through onboarding Microsoft SQL Server as an Azure Arc-enabled SQL server.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/aws/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/aws/_index.md
deleted file mode 100644
index 4e56e3943f..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/aws/_index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-type: docs
-title: "Amazon Web Services"
-linkTitle: "Amazon Web Services"
-weight: 2
-description: >-
-  If you are working in a multi-cloud environment, you can deploy new a AWS EC2 instance installed with SQL Server in an automated fashion using Terraform and onboard it as Azure Arc-enabled SQL Server.
----
-
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/aws/aws_terraform_winsrv/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/aws/aws_terraform_winsrv/_index.md
deleted file mode 100644
index 253ee25fcb..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/aws/aws_terraform_winsrv/_index.md
+++ /dev/null
@@ -1,259 +0,0 @@
----
-type: docs
-title: "SQL Server EC2 instance"
-linkTitle: "SQL Server EC2 instance"
-weight: 1
----
-
-## Deploy an AWS EC2 instance with Windows Server & Microsoft SQL Server and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a Windows Server installed with Microsoft SQL Server 2019 (Developer edition) in a Amazon Web Services (AWS) EC2 instance and connect it as an Azure Arc-enabled SQL server resource.
-
-By the end of the guide, you will have an AWS EC2 instance installed with Windows Server 2019 with SQL Server 2019, projected as an Azure Arc-enabled SQL server and a running SQL assessment with data injected to Azure Log Analytics workspace.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-    ```shell
-    az --version
-    ```
-
-* [Create a free Amazon Web Services account](https://aws.amazon.com/free/) if you don't already have one.
-
-* [Install Terraform >=1.3.5](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-* Create Azure service principal  (SP)
-
-    To connect the EC2 instance to Azure Arc, an Azure service principal  assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* Enable subscription for the *Microsoft.AzureArcData* and *Microsoft.HybridCompute* resource providers for Azure Arc-enabled SQL Server. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.AzureArcData
-  az provider register --namespace Microsoft.HybridCompute
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.AzureArcData -o table
-  az provider show -n Microsoft.HybridCompute -o table
-  ```
-
-## Create a new AWS IAM Role & Key
-
-Create AWS User IAM Key. An access key grants programmatic access to your resources which we will be using later in this scenario.
-
-* Navigate to the [IAM Access page](https://console.aws.amazon.com/iam/home#/home).
-
-    ![Create AWS IAM Role & Key](./01.png)
-
-* Select the **Users** from the side menu.
-
-    ![Create AWS IAM Role & Key](./02.png)
-
-* Select the **User** you want to create the access key for.
-
-    ![Create AWS IAM Role & Key](./03.png)
-
-* Select **Security credentials** of the **User** selected.
-
-    ![Create AWS IAM Role & Key](./04.png)
-
-* Under **Access Keys** select **Create Access Keys**.
-
-    ![Create AWS IAM Role & Key](./05.png)
-
-* In the popup window it will show you the ***Access key ID*** and ***Secret access key***. Save both of these values to configure the **Terraform plan** variables later.
-
-    ![Create AWS IAM Role & Key](./06.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User is exporting the Terraform environment variables (1-time export) which are being used throughout the deployment.
-
-2. User is executing the Terraform plan which will deploy the EC2 instance as well as:
-
-    1. Create an Administrator Windows user account, enabling WinRM on the VM and change the Windows Computer Name.
-
-    2. Generate and execute the [*sql.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/scripts/sql.ps1.tmpl) script. This script will:
-
-        1. Install Azure CLI, Azure PowerShell module and SQL Server Management Studio (SSMS) [Chocolaty packages](https://chocolatey.org/).
-
-        2. Create a runtime logon script (*LogonScript.ps1*) which will run upon the user first logon to Windows. Runtime script will:
-
-            * Install SQL Server Developer Edition
-            * Enable SQL TCP protocol on the default instance
-            * Create SQL Server Management Studio Desktop shortcut
-            * Restore [*AdventureWorksLT2019*](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) Sample Database
-            * Onboard both the server and SQL to Azure Arc
-            * Deploy Azure Log Analytics and a workspace
-            * Install the [Microsoft Monitoring Agent (MMA) agent](https://docs.microsoft.com/services-hub/health/mma-setup)
-            * Enable Log Analytics Solutions
-            * Deploy MMA Azure Extension ARM Template from within the VM
-            * Configure SQL Azure Assessment
-
-        3. Disable and prevent Windows Server Manager from running on startup
-
-3. Once Terraform plan deployment has completed and upon the user initial RDP login to Windows, *LogonScript.ps1* script will run automatically and execute all the above.
-
-## Deployment
-
-Before executing the Terraform plan, you must set the environment variables which will be used by the plan. These variables are based on the Azure service principal  you've just created, your Azure subscription and tenant, and your AWS account.
-
-* Retrieve your Azure subscription ID and tenant ID using the `az account list` command.
-
-* The Terraform plan creates resources in both Microsoft Azure and AWS. It then executes a script on the virtual machine to install all the necessary artifacts.
-
-    Both the script and the Terraform plan itself requires certain information about your AWS and Azure environments. Edit variables according to your environment and export it using the below commands
-
-    ```shell
-    export TF_VAR_subId='Your Azure subscription ID'
-    export TF_VAR_servicePrincipalAppId='Your Azure service principal  App ID'
-    export TF_VAR_servicePrincipalSecret='Your Azure service principal  App Password'
-    export TF_VAR_servicePrincipalTenantId='Your Azure tenant ID'
-    export TF_VAR_location='Azure region'
-    export TF_VAR_resourceGroup='Azure resource group name'
-    export TF_VAR_AWS_ACCESS_KEY_ID='Your AWS Access Key ID'
-    export TF_VAR_AWS_SECRET_ACCESS_KEY='Your AWS Secret Key'
-    export TF_VAR_key_name='Your AWS Key Pair name'
-    export TF_VAR_aws_region='AWS region'
-    export TF_VAR_aws_availabilityzone='AWS Availability Zone region'
-    export TF_VAR_instance_type='EC2 instance type'
-    export TF_VAR_hostname='EC2 instance Windows Computer Name'
-    export TF_VAR_admin_user='Guest OS Admin Username'
-    export TF_VAR_admin_password='Guest OS Admin Password'
-    ```
-
-    ![Export terraform variables](./07.png)
-
-    > **NOTE: If you are running in a PowerShell environment, to set the Terraform environment variables, use the _Set-Item -Path env:_ prefix (see example below)**
-
-    ```powershell
-    Set-Item -Path env:TF_VAR_AWS_ACCESS_KEY_ID
-    ```
-
-* From the folder within your cloned repo where the Terraform binaries are, the below commands to download the needed TF providers and to run the plan.
-
-    ```shell
-    terraform init
-    terraform apply --auto-approve
-    ```
-
-    Once the Terraform plan deployment has completed, a new Windows Server VM will be up & running as well as an empty Azure resource group will be created.
-
-    ![terraform apply completed](./08.png)
-
-    ![New AWS EC2 instance](./09.png)
-
-    ![An empty Azure resource group](./10.png)
-
-* Download the RDP file and log in to the VM (**using the data from the *TF_VAR_admin_user* and *TF_VAR_admin_password* environment variables**) which will initiate the *LogonScript* run. Let the script to run it's course and which will also close the PowerShell session when completed.
-
-    ![Connect to AWS EC2 instance](./11.png)
-
-    ![Connect to AWS EC2 instance](./12.png)
-
-    > **NOTE: The script runtime will take ~10-15min to complete**
-
-    ![PowerShell LogonScript run](./13.png)
-
-    ![PowerShell LogonScript run](./14.png)
-
-    ![PowerShell LogonScript run](./15.png)
-
-    ![PowerShell LogonScript run](./16.png)
-
-    ![PowerShell LogonScript run](./17.png)
-
-    ![PowerShell LogonScript run](./18.png)
-
-    ![PowerShell LogonScript run](./19.png)
-
-    ![PowerShell LogonScript run](./20.png)
-
-    ![PowerShell LogonScript run](./21.png)
-
-* Open Microsoft SQL Server Management Studio (a Windows shortcut will be created for you) and validate the *AdventureWorksLT2019* sample database is deployed as well.
-
-    ![Microsoft SQL Server Management Studio](./22.png)
-
-    ![AdventureWorksLT2019 sample database ](./23.png)
-
-* In the Azure Portal, notice you now have an Azure Arc-enabled server resource (with the MMA agent installed via an Extension), Azure Arc-enabled SQL server resource and Azure Log Analytics deployed.
-
-    ![An Azure resource group with deployed resources](./24.png)
-
-    ![Azure Arc-enabled server resource](./25.png)
-
-    ![MMA agent installed via an Extension](./26.png)
-
-    ![Azure Arc-enabled SQL server resources](./27.png)
-
-## Azure SQL Assessment
-
-Now that you have both the server and SQL projected as Azure Arc resources, the last step is complete the initiation of the SQL Assessment run.
-
-* On the SQL Azure Arc resource, click on "Environment Health" followed by clicking the "Download configuration script".
-
-    Since the *LogonScript* run in the deployment step took care of deploying and installing the required binaries, you can safely and delete the downloaded *AddSqlAssessment.ps1* file.
-
-    Clicking the "Download configuration script" will simply send a REST API call to the Azure portal which will make "Step3" available and will result with a grayed-out "View SQL Assessment Results" button.
-
-    ![SQL Assessment Environment Health](./28.png)
-
-    ![SQL Assessment Environment Health](./29.png)
-
-    ![View SQL Assessment Results](./30.png)
-
-* After few minutes you will notice how the "View SQL Assessment Results" button is available for you to click on. At this point, the SQL assessment data and logs are getting injected to Azure Log Analytics.
-
-    Initially, the amount of data will be limited as it take a while for the assessment to complete a full cycle but after few hours you should be able to see much more data coming in.  
-
-    ![SQL Assessment results](./31.png)
-
-    ![SQL Assessment results](./32.png)
-
-## Cleanup
-
-To delete the environment, use the *`terraform destroy --auto-approve`* command which will delete the AWS and the Azure resources.
-
-![terraform destroy completed](./33.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/_index.md
deleted file mode 100644
index df181da209..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-type: docs
-title: "Microsoft Azure"
-linkTitle: "Microsoft Azure"
-weight: 1
-description: >-
-  The guides in this section will walk you through how to project an Azure VM installed with SQL Server as an Azure Arc-enabled server and Azure Arc-enabled SQL. This guide, using Azure VM as the targeted Azure Arc-enabled SQL Server, is designed **for demo and testing purposes ONLY and are not supported.** In the guide you will find a detailed technical explanation of the mechanism and why **it is not expected to project an Azure VM as an Azure Arc-enabled server.**
-
-  In each guide, you find a detailed, technical explanation of the mechanism and why it is not expected to project an Azure VM as an Azure Arc-enabled server.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/archive/azure_arm_template_winsrv/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/archive/azure_arm_template_winsrv/_index.md
deleted file mode 100644
index 625a87ab72..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/archive/azure_arm_template_winsrv/_index.md
+++ /dev/null
@@ -1,265 +0,0 @@
-<!-- ---
-type: docs
-title: "SQL Server on Windows Server Virtual Machine"
-linkTitle: "SQL Server on Windows Server Virtual Machine"
-weight: 1
---- -->
-
-## Deploy an Azure Virtual Machine with Windows Server & Microsoft SQL Server and connect it to Azure Arc using ARM Template
-
-The following Jumpstart scenario will guide you on how to use the provided [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview) to deploy an Azure VM installed with Windows Server and Microsoft SQL Server 2019 (Developer edition) and connect it as an Azure Arc-enabled SQL server resource.
-
-Azure VMs are leveraging the [Azure Instance Metadata Service (IMDS)](https://docs.microsoft.com/azure/virtual-machines/windows/instance-metadata-service) by default. By projecting an Azure VM as an Azure Arc-enabled server, a "conflict" is created which will not allow for the Azure Arc server resources to be represented as one when the IMDS is being used and instead, the Azure Arc server will still "act" as a native Azure VM.
-
-However, **for demo purposes only**, the below guide will allow you to use and onboard Azure VMs to Azure Arc and by doing so, you will be able to simulate a server which is deployed outside of Azure (i.e "on-premises" or in other cloud platforms)
-
-> **NOTE: It is not expected for an Azure VM to be projected as an Azure Arc-enabled server. The below scenario is unsupported and should ONLY be used for demo and testing purposes.**
-
-By the end of the guide, you will have an Azure VM installed with Windows Server 2019 with SQL Server 2019, projected as an Azure Arc-enabled SQL Server and a running SQL assessment with data injected to Azure Log Analytics workspace.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-    ```shell
-    az --version
-    ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/).
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy ArcBox to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Owner” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- Enable subscription for the _Microsoft.AzureArcData_ and _Microsoft.HybridCompute_ resource providers for Azure Arc-enabled SQL Server. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.AzureArcData
-  az provider register --namespace Microsoft.HybridCompute
-  az provider register --namespace Microsoft.OperationsManagement
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.AzureArcData -o table
-  az provider show -n Microsoft.HybridCompute -o table
-  az provider show -n Microsoft.OperationsManagement -o table
-  ```
-
-## Automation Flow
-
-The automation for this scenario includes 3 PowerShell scripts executed in the following order:
-
-1. [_Bootstrap.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/scripts/Bootstrap.ps1) - Executed at ARM Template deployment time as a CustomScriptExtension. This script has the following functionalities:
-
-    1. Download and install pre-requisite utilities via [Chocolatey](https://chocolatey.org/).
-    2. Download the [_LogonScript.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/scripts/LogonScript.ps1) and [_installArcAgentSQL.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/scripts/installArcAgentSQL.ps1) scripts.  
-
-2. [_LogonScript.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/scripts/LogonScript.ps1) - Executed upon initial login to the SQL virtual machine. This script has the following functionalities:
-
-    1. Install and configure SQL Server on the VM
-    2. Restore AdventureWorksLT2019 Database
-    3. Allow Azure VM to be onboarded to Azure Arc
-    4. Execute the _installArcAgentSQL_ script
-
-3. [_installArcAgentSQL.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/scripts/installArcAgentSQL.ps1) - This is the main script and will be executed by the _LogonScript_ script at VM runtime. This script has the following functionalities:
-
-    1. Project SQL Server as an Azure Arc-enabled SQL server resource
-    2. Install Log Analytics agent using an extension on Azure Arc-enabled server
-    3. Create SQL Assessment and inject data to Azure Log Analytics workspace
-
-To get familiar with the automation and deployment flow read the following explanation.
-
-1. User edits the ARM template parameters file (1-time edit). These parameters values are used throughout the deployment.
-
-2. The ARM template includes an Azure VM Custom Script Extension which will deploy the [_Bootstrap.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/scripts/Bootstrap.ps1) PowerShell Script. The script will:
-
-    1. Download the _LogonScript.ps1_ and _installArcAgentSQL_ PowerShell scripts
-
-    2. Set local OS environment variables
-
-## Deployment
-
-As mentioned, this deployment will use an ARM Template. You will deploy a single template that creates all the Azure resources in a single resource group as well as onboarding the created VM to Azure Arc.
-
-- Before deploying the ARM template, login to Azure using AZ CLI with the ```az login``` command.
-
-- The deployment uses the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/azuredeploy.parameters.example.json).
-
-- Create a Resource Group which will contain the target for the ARM Template deployment using the following command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region> --tags "Project=jumpstart_azure_arc_sql"
-    ```
-
-    For example:
-
-    ```shell
-    az group create --name Arc-SQL-Demo --location "East US" --tags "Project=jumpstart_azure_arc_sql"
-    ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template) and run the following command:
-
-    ```shell
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/azuredeploy.json \
-    --parameters <The _azuredeploy.parameters.json_ parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you created in the previous step.**
-
-    For example:
-
-    ```shell
-    az deployment group create \
-    --resource-group Arc-SQL-Demo \
-    --name arcsqlsrvdemo \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_sqlsrv_jumpstart/azure/windows/vanilla/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-- Once Azure resources have been provisioned you will be able to see them in Azure portal.
-
-    ![Screenshot showing ARM deployment](./deployment_complete_cli.png)
-
-    ![Screenshot showing Azure Portal with Azure resources](./deployment_complete_portal.png)
-
-## Windows Login & Post Deployment
-
-Various options are available to connect to _Arc-SQL-Demo_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_winsrv/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Arc-App-Client-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_winsrv/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_winsrv/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Arc-SQL-Demo-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./nsg_rules.png)
-
-  ![Screenshot showing adding a new inbound security rule](./add_nsg_rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./nsg_rule_rdp.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./added_nsg_rule.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./sql_vm_portal.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./sql_vm_bastion.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _Arc-SQL-Demo_ with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./enable_jit.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./rdp_using_jit.png)
-
-### Post Deployment
-
-- At first login a logon script will get executed. This script was created as part of the automated deployment process.
-
-    Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is approximately 30min long**
-
-    ![Screenshot showing PowerShell script executing in VM](./post_deploy_script.png)
-
-- After a successful run you can see in the Azure portal that there is now a new Azure Arc-enabled server (with the Microsoft Monitoring agent installed via an extension), Azure Arc-enabled SQL resources and Azure Log Analytics added to the resource group.
-
-    ![Screenshot showing Azure Arc-enabled SQL resources](./post_deployment_portal_vm.png)
-
-    ![Screenshot showing Azure Arc-enabled SQL resources](./post_deployment_portal_arc.png)
-
-    ![Screenshot showing Azure Arc-enabled SQL resources](./post_deployment_portal_arc_sql.png)
-
-- Open Microsoft SQL Server Management Studio (a Windows shortcut will be created for you) and validate the _AdventureWorksLT2019_ sample database is deployed.
-
-    ![Screenshot showing SQL Management Studio](./sql_server_management_login.png)
-
-    ![Screenshot showing SQL Management Studio](./sql_server_management_data.png)
-
-## Azure SQL Assessment
-
-Now that you have both the server and SQL projected as Azure Arc resources the last step is to complete the initiation of the SQL Assessment run.
-
-- On the SQL Azure Arc resource click on "Environment Health", then click "Download configuration script".
-
-    Since the _installArcAgentSQL_ run in the deployment step took care of deploying and installing the required binaries you can safely ignore and delete the downloaded _AddSqlAssessment.ps1_ file.
-
-    Clicking the "Download configuration script" will simply send a REST API call to the Azure portal which will make "Step3" available and will result with a grayed-out "View SQL Assessment Results" button.
-
-    ![Screenshot showing Environment Health blade of Azure Arc-enabled SQL server](./arc_sql_resource_portal.png)
-
-    ![Screenshot showing Environment Health blade of Azure Arc-enabled SQL server](./environment_health_button.png)
-
-    ![Screenshot showing Environment Health blade of Azure Arc-enabled SQL server](./download_script_button.png)
-
-    ![Screenshot showing Environment Health blade of Azure Arc-enabled SQL server](./view_assessment_disabled.png)
-
-    It might take a bit of time, but after approximately 45-60 minutes you will notice how the "View SQL Assessment Results" becomes available for you to click on. At this point the SQL assessment data and logs are getting injected to Azure Log Analytics.
-
-    Initially the amount of data will be limited as it take a while for the assessment to complete a full cycle but after few hours you should be able to see much more data coming in.  
-
-    ![Screenshot showing Environment Health blade of Azure Arc-enabled SQL server](./view_assessment_enabled.png)
-
-    ![Screenshot showing Environment Health blade of Azure Arc-enabled SQL server](./sql_assessment_results.png)
-
-## Cleanup
-
-To delete the entire deployment simply delete the resource group from the Azure portal.
-
-![Screenshot showing Azure Portal delete resource group function](./delete_resource_group.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/_index.md
deleted file mode 100644
index 2588a3ab96..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/_index.md
+++ /dev/null
@@ -1,288 +0,0 @@
----
-type: docs
-title: "SQL Server Hyper-V Windows Virtual Machine"
-linkTitle: "SQL Server Hyper-V Windows Virtual Machine"
-weight: 1
----
-
-## Integrate Microsoft Defender for SQL servers with Azure Arc-enabled SQL Server (on Windows) using Hyper-V nested virtualization and ARM templates
-
-The following Jumpstart scenario will walk you through how to use the provided [Azure ARM Template](https://docs.microsoft.com/azure/azure-resource-manager/templates/overview) to deploy an Azure VM installed with Windows Server, setup Hyper-V to support nested virtualization, and create guest VM with SQL Server 2019 on Hyper-V to demonstrate Defender for Cloud for SQL servers on machines and generate alerts for SQL attacks.
-
-By the end of the guide, you will have an Azure VM **JS-Client** installed with Windows Server 2019 with Hyper-V and nested Windows Server VM **JS-Win-SQL-01** pre-configured with SQL Server 2019, projected as an Azure Arc-enabled SQL Server, then enabled SQL assessment and Microsoft Defender for SQL servers on machines.
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-    ```shell
-    az --version
-    ```
-
-- In case you don't already have one, you can [Create a free Azure account](https://azure.microsoft.com/free/). By default free subscriptions have limitation on number of VM cores used for VM deployment. This scenarios requires 16 vCores to deploy an Azure VM SKU D16sv4 and setup guest VM SQL Server 2019.
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy Jumpstart scenario ARM template by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Owner” role is required. To create it, login to your Azure account by running the below commands (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- As part of the scenario deployment following resource providers are registered in your subscription to support Azure Arc-enabled SQL Server.
-
-  - _Microsoft.AzureArcData_
-  - _Microsoft.HybridCompute_
-  - _Microsoft.OperationsManagement_
-  - _Microsoft.HybridConnectivity_
-  - _Microsoft.GuestConfiguration_
-  
-## Automation Flow
-
-The automation for this scenario includes different PowerShell scripts executed in the following order:
-
-1. [_Bootstrap.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/Bootstrap.ps1) - Executed at ARM Template deployment time as a CustomScriptExtension. This script has the following functionalities:
-
-    1. Download and install pre-requisite utilities via [Chocolatey](https://chocolatey.org/).
-    2. Download the [_ArcServersLogonScript.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/ArcServersLogonScript.ps1), [_installArcAgentSQLSP.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLSP.ps1), and [_testDefenderForSQL.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/testDefenderForSQL.ps1) scripts.
-
-2. [_ArcServersLogonScript.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/ArcServersLogonScript.ps1) - Executed upon initial login to the **JS-Client** Azure virtual machine. This script has the following functionalities:
-
-    1. Install Windows Hyper-V server and configure networking.
-    2. Create a guest Windows Server VM with SQL Server pre-installed.
-    3. Restore _AdventureWorksLT2019_ Database.
-    4. Execute the _ArcServersLogonScript.ps1_ script.
-    5. Enable Defender for SQL Servers on Machine at the subscription level and setup the default Log Analytics workspace.
-    6. Execute the _testDefenderForSQL.ps1_ script to simulate SQL attacks.
-
-3. [_installArcAgentSQLSP.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/installArcAgentSQLSP.ps1) - This is the main script and will be executed by the _ArcServersLogonScript.ps1_ script at VM runtime. This script has the following functionalities:
-
-    1. Project SQL Server as an Azure Arc-enabled SQL server resource
-    2. Install the Log Analytics agent using an extension on the Azure Arc-enabled server
-    3. Create SQL Assessment and inject data to Azure Log Analytics workspace
-
-To get familiar with the automation and deployment flow read the following explanation.
-
-1. User edits the ARM template parameters file (1-time edit). These parameters values are used throughout the deployment.
-
-2. The ARM template includes an Azure VM Custom Script Extension which will deploy the [_Bootstrap.ps1_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/scripts/Bootstrap.ps1) PowerShell Script. The script will:
-
-    1. Download the _ArcServersLogonScript.ps1_, _installArcAgentSQLSP.ps1_, and _testDefenderForSQL.ps1_ PowerShell scripts
-
-    2. Set local OS environment variables
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_arc_sqlsrv_jumpstart%2Fazure%2Fwindows%2Fdefender_sql%2Farm_template%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment of Jumpstart scenario](./portaldeploy.png)
-
-  ![Screenshot showing Azure portal deployment creation of Jumpstart scenario](./portaldeploy-create.png)
-
-  ![Screenshot showing Azure portal deployment progress of Jumpstart scenario](./portaldeployinprogress.png)
-
-  ![Screenshot showing Azure portal deployment completion of Jumpstart scenario](./portaldeploymentcomplete.png)
-
-## Deployment Option 2: ARM template with Azure CLI
-
-As mentioned, this deployment will use an ARM Template. You will deploy a single template that creates all the Azure resources in a single resource group as well as onboarding the nested Hyper-V guest SQL Server VM to Azure Arc.
-
-- Before deploying the ARM template, login to Azure using AZ CLI with the ```az login``` command.
-
-- The deployment uses the ARM template parameters file. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/azuredeploy.parameters.json) file located in your local cloned repository folder. An example parameters file is located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/azuredeploy.parameters.example.json).
-
-- Create a Resource Group which will contain the target for the ARM Template deployment using the following command:
-
-    ```shell
-    az group create --name <Name of the Azure resource group> --location <Azure Region> --tags "Project=jumpstart_azure_arc_sql_defender"
-    ```
-
-    For example:
-
-    ```shell
-    az group create --name Arc-SQL-Defender --location "East US" --tags "Project=jumpstart_azure_arc_sql_defender"
-    ```
-
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template) and run the following command:
-
-    ```shell
-    az deployment group create \
-    --resource-group <Name of the Azure resource group> \
-    --name <The name of this deployment> \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/azuredeploy.json \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-    > **NOTE: Make sure that you are using the same Azure resource group name as the one you created in the previous step.**
-
-    For example:
-
-    ```shell
-    az deployment group create \
-    --resource-group Arc-SQL-Defender \
-    --name arcsqldefender \
-    --template-uri https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_arc_sqlsrv_jumpstart/azure/windows/defender_sql/arm_template/azuredeploy.json \
-    --parameters azuredeploy.parameters.json
-    ```
-
-    > **NOTE: If you receive an error message stating that the requested VM size is not available in the desired location (as an example: 'Standard_D8s_v3'), it means that there is currently a capacity restriction for that specific VM size in that particular region. Capacity restrictions can occur due to various reasons, such as high demand or maintenance activities. Microsoft Azure periodically adjusts the available capacity in each region based on usage patterns and resource availability. To continue deploying this scenario, please try to re-run the deployment using another region.**
-
-- Once Azure resources have been provisioned you will be able to see them in Azure portal.
-
-  ![Screenshot showing ARM deployment progress](./start-arm-deployment.png)
-
-  ![Screenshot showing ARM deployment successful completion](./completed-arm-deployment.png)
-
-  ![Screenshot showing Azure Portal with Azure resources](./deployment-complete-portal.png)
-
-## Windows Login & Post Deployment
-
-There are two options available to connect to _JS-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _JS-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-### Connecting directly with RDP
-
-By design, port 3389 is not allowed to access from the public internet. You must create an NSG rule to allow inbound 3389.
-
-- Open the _JS-NSG_ resource in the Azure portal, go to Inbound security rules, and click "Add" to add your client IP to allow RDP access to the VM.
-
-  ![Screenshot showing Arc-App-Client NSG with blocked RDP](./default-nsg-rules.png)
-
-  ![Screenshot showing adding a new inbound security rule](./add-nsg-rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  ![Screenshot showing all inbound security rule](./nsg-rule-rdp.png)
-
-  ![Screenshot showing all NSG rules after opening RDP](./added-nsg-rule.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./vm-rdp-connection.png)
-
-### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./vm-bastion.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _JS-Client_ with Azure Bastion.**
-
-### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./enable-jit.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./rdp-using-jit.png)
-
-### Post Deployment
-
-- At first login a logon script will get executed. This script was created as part of the automated deployment process.
-
-    Let the script to run its course and **do not close** the PowerShell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is approximately 30min long**
-
-  ![Screenshot showing PowerShell script executing in VM](./post-deploy-script.png)
-
-  ![Screenshot showing PowerShell script executing in VM](./post-deploy-script-arcsql.png)
-
-- After a successful run you can see in the Azure portal that there is now a new Azure Arc-enabled server (with the Microsoft Monitoring agent installed via an extension), Azure Arc-enabled SQL resources and Azure Log Analytics added to the resource group.
-
-  ![Screenshot showing Azure Arc-enabled SQL resources](./post-deployment-portal-rg.png)
-
-  ![Screenshot showing Azure Arc-enabled server](./post-deployment-portal-arc.png)
-
-  ![Screenshot showing Azure Arc-enabled SQL server](./post-deployment-portal-arcsql.png)
-
-  ![Screenshot showing Azure Arc-enabled SQL server threat simulation](./post-deploy-script-testsqlinjection.png)
-
-- Open Hyper-V to login to nested SQL server VM
-
-  ![Screenshot showing Hyper-V with nested SQL Server VM](./hyperv-nested-vm.png)
-
-  ![Screenshot showing Azure nested SQL Server VM after login](./hyperv-nested-vm-sql-login.png)
-
-- Open Microsoft SQL Server Management Studio (a Windows shortcut will be created for you) and validate the _AdventureWorksLT2019_ sample database is deployed.
-
-  ![Screenshot showing SQL Management Studio](./sqlserver-management-login.png)
-
-  ![Screenshot showing SQL Management Studio](./sqlserver-management-database.png)
-
-## Microsoft Defender for Cloud - SQL servers on machines
-
-This section guides you through different settings for enabling Microsoft Defender for Cloud - SQL servers on machines. Most of these settings are already enabled during the logon script execution when login to _JS-Client_ Azure VM. Even though these are pre-configured there might be delays in showing them in the Azure portal.
-
-- Following are the settings of Microsoft Defender for Cloud - SQL servers on machines configured using automation scripts and can be reviewed in Azure portal.
-
-  ![Screenshot showing Microsoft Defender for Cloud plans](./microsoft-defender-plans.png)
-
-  ![Screenshot showing Microsoft Defender for Cloud SQL enabled](./defender-sql-plan.png)
-
-- The below screenshots show Arc-enabled SQL Server Defender for Cloud enablement and protection status. Defender for Cloud for SQL Server is enabled at the subscription level, but the protection status is still showing as not enabled.
-Please note it may take some time to show this status in the Azure portal, but still able to detect SQL threats generated by the test scripts.
-
-  ![Screenshot showing Microsoft Defender for Cloud - Arc-enabled SQL server status](./arcsql-defender-status.png)
-
-- The below screenshot shows the SQL threat detected by Defender for Cloud.
-
-  ![Screenshot showing Defender for SQL security incidents and alerts](./defender-sql-security-incidents.png)
-
-- The below screenshot shows the test script used to generate SQL threats, detect, and alert using Defender for Cloud for SQL servers.
-
-  ![Screenshot showing Defender for SQL test scripts](./defender-sql-testing-script.png)
-
-- Please note once in a while these test execution may fails randomly. If you don't find these alerts, login to nested SQL VM in Hyper-V and execute test script manually as show below. Following are the credentials to login to nested SQL Server VM.
-
-  ```text
-  Username: Administrator
-  Password: ArcDemo123!!
-  ```
-
-  ![Screenshot showing manual execution of the test scripts](./manual-brute-force-test.png)
-
-- The below screenshot shows an email alert sent by Defender for Cloud when a SQL threat is detected. By default, this email is sent to the registered contact email at the subscription level.
-  ![Screenshot showing test script results](./brute-force-attack-alert.png)
-
-## Cleanup
-
-To delete the entire deployment simply delete the resource group from the Azure portal.
-
-![Screenshot showing Azure Portal delete resource group function](./delete-resource-group.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/day2/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/day2/_index.md
deleted file mode 100644
index fa42be9944..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/day2/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Unified Operations Use Cases"
-linkTitle: "Unified Operations Use Cases"
-weight: 5
-description: >-
-  Once you have server resources projected into Azure with Azure Arc, you can start to use native Azure tooling to manage the servers as native Azure resources. The following scenarios show examples of using Azure management tools with Azure Arc-enabled SQL Server.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/day2/esu/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/day2/esu/_index.md
deleted file mode 100644
index e955a9fe6c..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/day2/esu/_index.md
+++ /dev/null
@@ -1,194 +0,0 @@
----
-type: docs
-title: "Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server 2012 and SQL Server 2012"
-linkTitle: "Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server and SQL Server 2012"
-weight: 1
-description: >
----
-
-## Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server and SQL Server 2012
-
-The following Jumpstart scenario will guide you on how to use Azure Arc to enroll Windows Server 2012/2012 R2 and SQL Server (Standard 2012) machines in [Extented Security Updates (ESUs)](https://learn.microsoft.com/windows-server/get-started/extended-security-updates-overview). This scenario creates an Azure VM with Hyper-V installed where the Windows Server and/or SQL Server VMs will run and will be onboard as Azure Arc-enabled server and/or Azure Arc-enabled SQL Server respectively. Once these VMs are registered in Azure you will have visibility into their ESU coverage and can enroll them through the Azure portal one month before Windows Server 2012 end of support.
-
-In this scenario, you will be able to choose between working with Windows Server 2012 R2, SQL Server 2012 Standard Edition, or both.
-
-**NOTE: In this scenario, ESU licenses are not provided or created, and will require you to provision them separately. The scenario will however create Windows Server 2012 R2 and/or SQL Server 2012 (Standard) machines that are connected to Azure Arc that you will be able to enroll on Extended Security Updates via the Azure portal and get billed monthly via your Azure subscription.**
-
-## Prerequisites
-
-- [Install or update Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Azure CLI should be running version 2.49.0 or later. Use ```az --version``` to check your current installed version.
-
-- Create Azure service principal (SP)
-
-    To connect a VM or bare-metal server to Azure Arc, Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.**
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-## Deployment Options and Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User provides the Bicep template parameter values, either via the portal or editing the parameters file. These parameters values are used throughout the deployment.
-
-- User will run the Bicep template at resource group level.
-
-- User logs in to the Azure VM using Azure Bastion or RDP to trigger the Logon script. The script will:
-  - Install Hyper-V
-  - Create Windows and/or SQL VMs in Hyper-V
-  - Onboard the Hyper-V VMs as Arc-enabled resources
-
-## Bicep template deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the parameter file to match your environment. You will need to provide:
-  - _`spnClientId`_: the AppId of the service principal you created before.
-  - _`spnClientSecret`_: the password of the service principal you created before.
-  - _`spnTenantId`_: your Azure AD's tenant ID.
-  - _`windowsAdminUsername`_: Windows admin username for your Azure VM.
-  - _`windowsAdminPassword`_: password for the Windows admin username.
-  - _`deployBastion`_: whether or not you'd like to deploy Azure Bastion to access the Azure VM. Values can be "true" or "false"
-  - _`esu`_: this parameter will allow you to control what VMs will be deployed. It can be either:
-    - _`ws`_: to only deploy a Windows Server 2012 R2 VM that will be registered as an Arc-enabled server.
-    - _`sql`_: to only deploy a SQL Server 2012 Standard Edition VM that will be registered as an Arc-enabled SQL Server.
-    - _`both`_: to deploy both a Windows Server 2012 R2 VM and a SQL Server 2012 Standard Edition VM that will be Arc-enabled.
-
-    > **NOTE: Make sure to set the _esu_ parameter to _sql_ or _both_ to have an Arc-enabled SQL Server deployed.**
-
-  ![Screenshot of Parameters file](./01.png)
-
-- To run the automation, navigate to the [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_arc_servers_jumpstart/esu/bicep). From the deployment folder run the below command:
-
-  ```shell
-    az group create --name "<resource-group-name>"  --location "<preferred-location>"
-    az deployment group create -g "<resource-group-name>" \
-    -f "main.bicep" -p "main.parameters.json"
-  ```
-
-    For example:
-
-  ```shell
-    az group create --name Arc-ESU-Demo --location "westeurope"
-    az deployment group create --resource-group Arc-ESU-Demo \
-    --name Arc-ESU-Demo --template-file main.bicep \
-    --parameters main.parameters.json
-  ```
-
-- Once the automation finishes its run, you should see an output as follows:
-
-  ![Screenshot of automation output](./02.png)
-
-- After the script has finished its run verify the resources are created on the Azure Portal:
-
-    ![Screenshot of resources created on resource group](./03.png)
-
-    ![Screenshot of resources created on resource group](./04.png)
-
-## Windows Login & Post Deployment
-
-- Now that the Azure Windows Server VM is created, it is time to connect to it using either RDP or Azure Bastion.
-
-    ![Screenshot of Azure Bastion session 01](./05.png)
-
-    ![Screenshot of Azure Bastion session 02](./06.png)
-
-    ![Screenshot of Azure Bastion session 03](./07.png)
-
-- At first login, as mentioned in the "Automation Flow" section, a logon script will get executed. This script was created as part of the automated deployment process.
-
-    ![Screenshot of script's output](./08.png)
-
-    ![Screenshot of script's output](./09.png)
-
-    ![Screenshot of script's output](./10.png)
-
-    ![Screenshot of script's output](./11.png)
-
-- Let the script to run its course and **do not close** the Powershell session, this will be done for you once completed.
-
-    > **NOTE: The script run time is ~10-15 min long.**
-
-- Upon successful run, a new Azure Arc-enabled server and/or Azure Arc-enabled SQL Server will be added to the resource group.
-
-  ![Screenshot Azure Arc-enabled resources on resource group](./12.png)
-
-- Now that you have successfully onboarded the Arc-enabled resources, you will be able to manage the Extended Security Updates (ESU) from the Azure Portal:
-
-## Extended Security Updates (ESU)
-
-Now that you have Windows Server 2012 R2 and/or SQL Server 2012 Arc-enabled, you are able to manage ESU licenses for these servers.
-
-- Navigate to the Azure Arc page.
-
-  ![Screenshot of Azure Arc navigate](./13.png)
-
-- Select Extended Security Updates in the left pane.
-
-  ![Screenshot of Azure Arc Extended](./14.png)
-
-- Provision Windows Server 2012 and 2012 R2 Extended Security Update licenses from Azure Arc.
-
-  ![Screenshot of ESU Licenses](./15.png)
-
-  ![Screenshot of ESU Licenses](./16.png)
-
-- Select one or more Arc-enabled servers to link to an Extended Security Update license.
-
-  ![Screenshot of Enable ESU Licenses](./17.png)
-
-**NOTE: Verify that the databases running on your Azure Arc-enabled SQL Server are being discovered. If the databases are not shown in the Azure Portal, follow these steps to fix it.**
-
-- Select the Azure Arc-enabled SQL Server.
-
- ![Screenshot of Azure Arc-enabled SQL Server resource](./18.png)
-
-- Select "Databases" under "Data Management". Click on "Change License Type".
-
- ![Screenshot of Azure Arc-enabled SQL Server resource](./19.png)
-
- ![Screenshot of Change License Type](./20.png)
-
-- Choose "License with Software Assurance".
-
- ![Screenshot of software assurance](./21.png)
-
-- The databases will be discovered and shown in the Azure Portal after a few seconds.
-
- ![Screenshot of Databases in Azure portal](./22.png)
-
-## Clean up environment
-
-To clean up your deployment, simply delete the resource group from the portal.
-
-![Screenshot of Azure Resource Group delete](./23.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/gcp/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/gcp/_index.md
deleted file mode 100644
index 67bffa9738..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/gcp/_index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-type: docs
-title: "Google Cloud Platform"
-linkTitle: "Google Cloud Platform"
-weight: 3
-description: >-
-  If you are working in a multi-cloud environment, you can deploy new a GCP instance installed with SQL Server in an automated fashion using Terraform and onboard it as Azure Arc-enabled SQL Server.
----
-
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/gcp/gcp_terraform_winsrv/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/gcp/gcp_terraform_winsrv/_index.md
deleted file mode 100644
index 2e2bb4b45d..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/gcp/gcp_terraform_winsrv/_index.md
+++ /dev/null
@@ -1,278 +0,0 @@
----
-type: docs
-title: "SQL Server GCP instance"
-linkTitle: "SQL Server GCP instance"
-weight: 1
-description: >-
----
-
-## Deploy a GCP instance with Windows Server & Microsoft SQL Server and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a Windows Server installed with Microsoft SQL Server 2019 (Developer edition) in a Google Cloud Platform (GCP) virtual machine and connect it as an Azure Arc-enabled SQL server resource.
-
-By the end of the guide, you will have a GCP VM instance installed with Windows Server 2019 with SQL Server 2019, projected as an Azure Arc-enabled SQL Server and a running SQL assessment with data injected to Azure Log Analytics workspace.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* Google Cloud account with billing enabled - [Create a free trial account](https://cloud.google.com/free). To create Windows Server virtual machines, you must upgraded your account to enable billing. Click Billing from the menu and then select Upgrade in the lower right.
-
-    ![Screenshot showing how to enable billing on GCP account](./45.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./46.png)
-
-    ![Screenshot showing how to enable billing on GCP account](./47.png)
-
-    ***Disclaimer*** - **To prevent unexpected charges, please follow the "Delete the deployment" section at the end of this README**
-
-* [Install Terraform >=0.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-* Create Azure service principal (SP)
-
-    To connect the GCP virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* Enable subscription for the *Microsoft.AzureArcData* and *Microsoft.HybridCompute* resource providers for Azure Arc-enabled SQL Server. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.AzureArcData
-  az provider register --namespace Microsoft.HybridCompute
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.AzureArcData -o table
-  az provider show -n Microsoft.HybridCompute -o table
-  ```
-
-## Create a new GCP Project, IAM Role & Service Account
-
-In order to deploy resources in GCP, we will create a new GCP Project as well as a service account to allow Terraform to authenticate against GCP APIs and run the plan to deploy resources.
-
-* Browse to <https://console.cloud.google.com/> and login with your Google Cloud account. Once logged in, [create a new project](https://cloud.google.com/resource-manager/docs/creating-managing-projects) named "Azure Arc Demo". After creating it, be sure to copy down the project id as it is usually different then the project name.
-
-  ![Screenshot showing GCP cloud console dashboard](./01.png)
-
-  ![Screenshot showing GCP console new project creation](./02.png)
-
-  ![Screenshot showing GCP console new project creation](./03.png)
-
-* Enable the Compute Engine API for the project, create a project Owner service account credentials and download the private key JSON file and copy the file to the directory where Terraform files are located. Change the JSON file name (for example *account.json*). The Terraform plan will be using the credentials stored in this file to authenticate against your GCP project.
-
-  ![Screenshot showing enabling Compute Engine API in GCP](./04.png)
-
-  ![Screenshot showing enabling Compute Engine API in GCP](./05.png)
-
-  ![Screenshot showing creating a GCP service account](./06.png)
-
-  ![Screenshot showing creating a GCP service account](./07.png)
-
-  ![Screenshot showing creating a GCP service account](./08.png)
-
-  ![Screenshot showing creating a GCP service account](./09.png)
-
-  ![Screenshot showing creating a GCP service account](./10.png)
-
-  ![Screenshot showing creating a GCP service account](./11.png)
-
-  ![Screenshot showing creating a GCP service account key](./12.png)
-
-  ![Screenshot showing creating a GCP service account key](./13.png)
-
-  ![Screenshot showing creating a GCP service account key](./14.png)
-
-  ![Screenshot showing creating a GCP service account key](./15.png)
-
-  ![Screenshot GCP service account key saved to project folder in Visual Studio Code](./16.png)
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User is exporting the Terraform environment variables (1-time export) which are being used throughout the deployment.
-
-2. User is executing the Terraform plan which will deploy the VM as well as:
-
-    1. Create an Administrator Windows user account and enabling WinRM on the VM
-
-    2. Generate and execute the [*sql.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/gcp/winsrv/terraform/scripts/sql.ps1.tmpl) script. This script will:
-
-        1. Install Azure CLI, Azure PowerShell module and SQL Server Management Studio (SSMS) [Chocolaty packages](https://chocolatey.org/).
-
-        2. Create a runtime logon script (*LogonScript.ps1*) which will run upon the user first logon to Windows. Runtime script will:
-            * Install SQL Server Developer Edition
-            * Enable SQL TCP protocol on the default instance
-            * Create SQL Server Management Studio Desktop shortcut
-            * Restore [*AdventureWorksLT2019*](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) Sample Database
-            * Onboard both the server and SQL to Azure Arc
-            * Deploy Azure Log Analytics and a workspace
-            * Install the [Microsoft Monitoring Agent (MMA) agent](https://docs.microsoft.com/services-hub/health/mma-setup)
-            * Enable Log Analytics Solutions
-            * Deploy MMA Azure Extension ARM Template from within the VM
-            * Configure SQL Azure Assessment
-
-        3. Disable and prevent Windows Server Manager from running on startup
-
-3. Once Terraform plan deployment has completed and upon the user initial RDP login to Windows, *LogonScript.ps1* script will run automatically and execute all the above.
-
-## Deployment
-
-Before executing the Terraform plan, you must set the environment variables which will be used by the plan. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your GCP project.
-
-* Retrieve your Azure subscription ID and tenant ID using the `az account list` command.
-
-* The Terraform plan creates resources in both Microsoft Azure and GCP. It then executes a script on the virtual machine to install all the necessary artifacts.
-
-  Both the script and the Terraform plan itself requires certain information about your GCP and Azure environments. Edit variables according to your environment and export it using the below commands
-
-  ```shell
-  export TF_VAR_subId='Your Azure subscription ID'
-  export TF_VAR_servicePrincipalAppId='Your Azure service principal App ID'
-  export TF_VAR_servicePrincipalSecret='Your Azure service principal App Password'
-  export TF_VAR_servicePrincipalTenantId='Your Azure tenant ID'
-  export TF_VAR_location='Azure Region'
-  export TF_VAR_resourceGroup='Azure resource group name'
-  export TF_VAR_gcp_project_id='GCP Project ID'
-  export TF_VAR_gcp_credentials_filename='GCP Project credentials filename'
-  export TF_VAR_gcp_region='GCP region where resource will be created'
-  export TF_VAR_gcp_zone='GCP zone where resource will be created'
-  export TF_VAR_gcp_instance_name='GCP VM instance name'
-  export TF_VAR_gcp_instance_machine_type='GCP VM instance type'
-  export TF_VAR_admin_user='Guest OS Admin Username' # Note: do not set this to "Administrator" 
-  export TF_VAR_admin_password='Guest OS Admin Password'
-  ```
-
-    > **NOTE: If you are running in a PowerShell environment, to set the Terraform environment variables, use the _Set-Item -Path env:_ prefix (see example below)**
-
-    ```powershell
-    Set-Item -Path env:TF_VAR_gcp_project_id
-    ```
-
-    > **NOTE: Do not set the TF_VAR_admin_user variable to "Administrator". GCP Windows images have the administrator account [disabled by default](https://cloud.google.com/compute/docs/images/os-details#windows_server). Therefore, you must use a different username for your TF_VAR_admin_user (e.g., "arcdemo")**
-
-  ![Screenshot showing exporting environment variables in shell](./19.png)
-
-* From the folder within your cloned repo where the Terraform binaries are, the below commands to download the needed TF providers and to run the plan.
-
-    ```shell
-    terraform init
-    terraform apply --auto-approve
-    ```
-
-  Once the Terraform plan deployment has completed, a new Windows Server VM will be up & running as well as an empty Azure resource group will be created.
-
-  ![Screenshot showing terraform apply being run](./20.png)
-
-  ![Screenshot showing GCP cloud console with server](./21.png)
-
-  ![Screenshot showing Azure Portal with empty resource group](./22.png)
-
-* Download the RDP file and log in to the VM (**using data from the *TF_VAR_admin_user* and *TF_VAR_admin_password* environment variables**) which will initiate the *LogonScript* run. Let the script to run it's course and which will also close the PowerShell session when completed.
-
-  ![Screenshot showing link to download RDP file in GCP cloud console](./23.png)
-
-  > **NOTE: The script runtime will take ~10-15min to complete**
-
-  ![Screenshot showing PowerShell script being run in server](./24.png)
-
-  ![Screenshot showing PowerShell script being run in server](./25.png)
-
-  ![Screenshot showing PowerShell script being run in server](./26.png)
-
-  ![Screenshot showing PowerShell script being run in server](./27.png)
-
-  ![Screenshot showing PowerShell script being run in server](./28.png)
-
-  ![Screenshot showing PowerShell script being run in server](./29.png)
-
-  ![Screenshot showing PowerShell script being run in server](./30.png)
-
-  ![Screenshot showing PowerShell script being run in server](./31.png)
-
-  ![Screenshot showing PowerShell script being run in server](./32.png)
-
-* Open Microsoft SQL Server Management Studio (a Windows shortcut will be created for you) and validate the *AdventureWorksLT2019* sample database is deployed as well.
-
-  ![Screenshot showing SQL Management Studio](./33.png)
-
-  ![Screenshot showing SQL Management Studio](./34.png)
-
-* In the Azure Portal, notice you now have an Azure Arc-enabled server resource (with the MMA agent installed via an Extension), Azure Arc-enabled SQL resource and Azure Log Analytics deployed.
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled SQL resources](./35.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled SQL resources](./36.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled SQL resources](./37.png)
-
-  ![Screenshot showing Azure Portal with Azure Arc-enabled SQL resources](./38.png)
-
-## Azure SQL Assessment
-
-Now that you have both the server and SQL projected as Azure Arc resources, the last step is complete the initiation of the SQL Assessment run.
-
-* On the SQL Azure Arc resource, click on "Environment Health" followed by clicking the "Download configuration script".
-
-  Since the *LogonScript* run in the deployment step took care of deploying and installing the required binaries, you can safely and delete the downloaded *AddSqlAssessment.ps1* file.
-
-  Clicking the "Download configuration script" will simply send a REST API call to the Azure portal which will make "Step3" available and will result with a grayed-out "View SQL Assessment Results" button.
-
-  ![Screenshot showing Azure Arc-enabled SQL Server Environment Health blade](./39.png)
-
-  ![Screenshot showing Azure Arc-enabled SQL Server Environment Health blade](./40.png)
-
-  ![Screenshot showing Azure Arc-enabled SQL Server Environment Health blade](./41.png)
-
-* After few minutes you will notice how the "View SQL Assessment Results" button is available for you to click on. At this point, the SQL assessment data and logs are getting injected to Azure Log Analytics.
-
-  Initially, the amount of data will be limited as it take a while for the assessment to complete a full cycle but after few hours you should be able to see much more data coming in.  
-
-  ![Screenshot showing SQL Assessment Results in Azure Portal](./42.png)
-
-  ![Screenshot showing SQL Assessment Results in Azure Portal](./43.png)
-
-## Cleanup
-
-To delete the environment, use the *`terraform destroy --auto-approve`* command which will delete the GCP and the Azure resources.
-
-![Screenshot showing terraform destroy being run](./44.png)
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/vmware/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/vmware/_index.md
deleted file mode 100644
index f2b49bcb6b..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/vmware/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "VMware vSphere"
-linkTitle: "VMware vSphere"
-weight: 4
-description: >-
-  If you are working with an on-premises VMware vSphere infrastructure, you can deploy new Windows Server virtual machine installed with SQL Server in an automated fashion using Terraform and onboard it as Azure Arc-enabled SQL Server.
----
\ No newline at end of file
diff --git a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/vmware/vmware_terraform_winsrv/_index.md b/docs/azure_arc_jumpstart/azure_arc_sqlsrv/vmware/vmware_terraform_winsrv/_index.md
deleted file mode 100644
index dc96b92caa..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_sqlsrv/vmware/vmware_terraform_winsrv/_index.md
+++ /dev/null
@@ -1,243 +0,0 @@
----
-type: docs
-title: "SQL Server VM"
-linkTitle: "SQL Server VM"
-weight: 1
-description: >-
----
-
-## Deploy a VMware vSphere-based Windows Server with SQL and connect it to Azure Arc using Terraform
-
-The following Jumpstart scenario will guide you on how to use the provided [Terraform](https://www.terraform.io/) plan to deploy a Windows Server installed with Microsoft SQL Server 2019 (Developer edition) in a VMware vSphere virtual machine and connect it as an Azure Arc-enabled SQL server resource.
-
-By the end of the guide, you will have a VMware vSphere VM installed with Windows Server 2019 with SQL Server 2019, projected as an Azure Arc-enabled SQL Server and a running SQL assessment with data injected to Azure Log Analytics workspace.
-
-## Prerequisites
-
-* Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-* [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-* [Install Terraform >=0.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
-
-* A VMware vCenter Server user with [permissions to deploy](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-4D0F8E63-2961-4B71-B365-BBFA24673FDB.html) a Virtual Machine from a Template in the vSphere Web Client.
-
-* Create Azure service principal (SP)
-
-    To connect the VMware vSphere virtual machine to Azure Arc, an Azure service principal assigned with the "Contributor" role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password**.
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-* Enable subscription for the *Microsoft.AzureArcData* and *Microsoft.HybridCompute* resource providers for Azure Arc-enabled SQL Server. Registration is an asynchronous process, and registration may take approximately 10 minutes.
-
-  ```shell
-  az provider register --namespace Microsoft.AzureArcData
-  az provider register --namespace Microsoft.HybridCompute
-  ```
-
-  You can monitor the registration process with the following commands:
-
-  ```shell
-  az provider show -n Microsoft.AzureArcData -o table
-  az provider show -n Microsoft.HybridCompute -o table
-  ```
-
-### Preparing a Window Server VMware vSphere VM Template
-
-Before using the below guide to deploy a Windows Server VM and connect it to Azure Arc, a VMware vSphere Template is required. [The following README](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/vmware/vmware_terraform_winsrv/) will instruct you how to easily create such a template using VMware vSphere 6.5 and above.
-
-**The Terraform plan uses the *remote-exec* provisioner which uses the WinRM protocol to copy and execute the required Azure Arc script. To allow WinRM connectivity to the VM, run the [*allow_winrm*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/scripts/allow_winrm.ps1) PowerShell script on your VM before converting it to template.**
-
-> **NOTE: If you already have a Windows Server VM template it is still recommended to use the guide as a reference.**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User is exporting the Terraform environment variables (1-time export) which are being used throughout the deployment.
-
-2. User is executing the Terraform plan which will deploy the VM as well as generate and execute the [*sql.ps1*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/scripts/sql.ps1.tmpl) script. This script will:
-
-    1. Install Azure CLI, Azure PowerShell module and SQL Server Management Studio (SSMS) [Chocolaty packages](https://chocolatey.org/).
-
-    2. Create a runtime logon script (*LogonScript.ps1*) which will run upon the user first logon to Windows. Runtime script will:
-        * Install SQL Server Developer Edition
-        * Enable SQL TCP protocol on the default instance
-        * Create SQL Server Management Studio Desktop shortcut
-        * Restore [*AdventureWorksLT2019*](https://docs.microsoft.com/sql/samples/adventureworks-install-configure?view=sql-server-ver15&tabs=ssms) Sample Database
-        * Onboard both the server and SQL to Azure Arc
-        * Deploy Azure Log Analytics and a workspace
-        * Install the [Microsoft Monitoring Agent (MMA) agent](https://docs.microsoft.com/services-hub/health/mma-setup)
-        * Enable Log Analytics Solutions
-        * Deploy MMA Azure Extension ARM Template from within the VM
-        * Configure SQL Azure Assessment
-
-    3. Disable Windows Firewall
-
-    4. Disable and prevent Windows Server Manager from running on startup
-
-3. Once Terraform plan deployment has completed and upon the user initial RDP login to Windows, *LogonScript.ps1* script will run automatically and execute all the above.
-
-## Deployment
-
-Before executing the Terraform plan, you must set the environment variables which will be used by the plan. These variables are based on the Azure service principal you've just created, your Azure subscription and tenant, and your VMware vSphere environment.
-
-* Retrieve your Azure subscription ID and tenant ID using the `az account list` command.
-
-* The Terraform plan creates resources in both Microsoft Azure and VMware vSphere. It then executes a script on the virtual machine to install all the necessary artifacts.
-
-* Both the script and the Terraform plan itself requires certain information about your VMware vSphere and Azure environments. Edit variables according to your environment and export it using the below commands
-
-    ```shell
-    export TF_VAR_subId='Your Azure subscription ID'
-    export TF_VAR_servicePrincipalAppId='Your Azure service principal App ID'
-    export TF_VAR_servicePrincipalSecret='Your Azure service principal App Password'
-    export TF_VAR_servicePrincipalTenantId='Your Azure tenant ID'
-    export TF_VAR_location='Azure Region'
-    export TF_VAR_resourceGroup='Azure resource group name'
-    export TF_VAR_vsphere_datacenter='VMware vSphere Datacenter Name'
-    export TF_VAR_vsphere_datastore='VMware vSphere Datastore Name'
-    export TF_VAR_vsphere_resource_pool='VMware vSphere Cluster or Resource Pool Name'
-    export TF_VAR_network_cards='VMware vSphere Network Name'
-    export TF_VAR_vsphere_folder='VMware vSphere Folder Name'
-    export TF_VAR_vsphere_vm_template_name='VMware vSphere VM Template Name'
-    export TF_VAR_vsphere_virtual_machine_name='VMware vSphere VM Name'
-    export TF_VAR_vsphere_virtual_machine_cpu_count='VMware vSphere VM CPU Count'
-    export TF_VAR_vsphere_virtual_machine_memory_size='VMware vSphere VM Memory Size in Megabytes'
-    export TF_VAR_domain='Domain'
-    export TF_VAR_vsphere_user='VMware vSphere vCenter Admin Username'
-    export TF_VAR_vsphere_password='VMware vSphere vCenter Admin Password'
-    export TF_VAR_vsphere_server='VMware vSphere vCenter server FQDN/IP'
-    export TF_VAR_admin_user='Guest OS Admin Username'
-    export TF_VAR_admin_password='Guest OS Admin Password'
-    ```
-
-    > **NOTE: If you are running in a PowerShell environment, to set the Terraform environment variables, use the _Set-Item -Path env:_ prefix (see example below)**
-
-    ```powershell
-    Set-Item -Path env:TF_VAR_servicePrincipalAppId
-    ```
-
-    > **NOTE: Use the Terraform plan [*variables.tf*](https://github.com/microsoft/azure_arc/blob/main/azure_arc_sqlsrv_jumpstart/vmware/winsrv/terraform/variables.tf) file for more details around VMware vSphere vars structure if needed**
-
-    ![Screenshot of environment variables exporting in shell](./01.jpg)
-
-* From the folder within your cloned repo where the Terraform binaries are, the below commands to download the needed TF providers and to run the plan.
-
-    ```shell
-    terraform init
-    terraform apply --auto-approve
-    ```
-
-    Once the Terraform plan deployment has completed, a new Windows Server VM will be up & running as well as an empty Azure resource group will be created.
-
-    ![Screenshot of terraform plan completing](./02.jpg)
-
-    ![Screenshot of SQL Server in vCenter](./03.jpg)
-
-    ![Screenshot of Azure Portal showing empty resource group](./04.jpg)
-
-* Log in to the VM (**using data from the *TF_VAR_admin_user* and *TF_VAR_admin_password* environment variables**) which will initiate the *LogonScript* run. Let the script to run it's course and which will also close the PowerShell session when completed.
-
-    > **NOTE: The script runtime will take ~10-15min to complete**
-
-    ![Screenshot of PowerShell script being run](./05.jpg)
-
-    ![Screenshot of PowerShell script being run](./06.jpg)
-
-    ![Screenshot of PowerShell script being run](./07.jpg)
-
-    ![Screenshot of PowerShell script being run](./08.jpg)
-
-    ![Screenshot of PowerShell script being run](./09.jpg)
-
-    ![Screenshot of PowerShell script being run](./10.jpg)
-
-    ![Screenshot of PowerShell script being run](./11.jpg)
-
-    ![Screenshot of PowerShell script being run](./12.jpg)
-
-    ![Screenshot of PowerShell script being run](./13.jpg)
-
-* Open Microsoft SQL Server Management Studio (a Windows shortcut will be created for you) and validate the *AdventureWorksLT2019* sample database is deployed as well.
-
-    ![Screenshot of SQL Server Management Studio](./14.jpg)
-
-    ![Screenshot of SQL Server Management Studio](./15.jpg)
-
-* In the Azure Portal, notice you now have an Azure Arc-enabled Server resource (with the MMA agent installed via an Extension), Azure Arc-enabled SQL resource and Azure Log Analytics deployed.
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled SQL server resources](./16.jpg)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled SQL server resources](./17.jpg)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled SQL server resources](./18.jpg)
-
-    ![Screenshot of Azure Portal showing Azure Arc-enabled SQL server resources](./19.jpg)
-
-## Azure SQL Assessment
-
-Now that you have both the server and SQL projected as Azure Arc resources, the last step is complete the initiation of the SQL Assessment run.
-
-* On the SQL Azure Arc resource, click on "Environment Health" followed by clicking the "Download configuration script".
-
-    Since the *LogonScript* run in the deployment step took care of deploying and installing the required binaries, you can safely and delete the downloaded *AddSqlAssessment.ps1* file.
-
-    Clicking the "Download configuration script" will simply send a REST API call to the Azure portal which will make "Step3" available and will result with a grayed-out "View SQL Assessment Results" button.
-
-    ![Screenshot showing Azure Arc-enabled SQL Server Environment Health](./20.jpg)
-
-    ![Screenshot showing Azure Arc-enabled SQL Server Environment Health](./21.jpg)
-
-    ![Screenshot showing Azure Arc-enabled SQL Server Environment Health](./22.jpg)
-
-* After few minutes you will notice how the "View SQL Assessment Results" button is available for you to click on. At this point, the SQL assessment data and logs are getting injected to Azure Log Analytics.
-
-    Initially, the amount of data will be limited as it take a while for the assessment to complete a full cycle but after few hours you should be able to see much more data coming in.  
-
-    ![Screenshot showing Azure Arc-enabled SQL Server Environment Health](./23.jpg)
-
-    ![Screenshot showing Azure Arc-enabled SQL Server Environment Health](./24.jpg)
-
-    ![Screenshot showing Azure Arc-enabled SQL Server Environment Health](./25.jpg)
-
-## Cleanup
-
-To delete the environment, use the *`terraform destroy --auto-approve`* command which will delete the VMware vSphere VM and the Azure resource group along with it's resources.
-
-![Screenshot showing terraform destroy being run](./26.jpg)
diff --git a/docs/azure_arc_jumpstart/azure_arc_vsphere/_index.md b/docs/azure_arc_jumpstart/azure_arc_vsphere/_index.md
deleted file mode 100644
index 19ab635a56..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_vsphere/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled VMware vSphere"
-linkTitle: "Azure Arc-enabled VMware vSphere"
-weight: 2
-description: >-
-  The deployment scenarios in this section will guide you through how to manage VMware vSphere resources with Azure Arc.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_vsphere/day2/_index.md b/docs/azure_arc_jumpstart/azure_arc_vsphere/day2/_index.md
deleted file mode 100644
index 4433d23a97..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_vsphere/day2/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc-enabled VMware vSphere lifecycle"
-linkTitle: "Azure Arc-enabled VMware vSphere lifecycle"
-weight: 2
-description: >-
-  The deployment scenarios in this section will guide you through how to manage the lifecycle of VMware vSphere resources with Azure Arc.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_vsphere/day2/vmware_arm_template_win/_index.md b/docs/azure_arc_jumpstart/azure_arc_vsphere/day2/vmware_arm_template_win/_index.md
deleted file mode 100644
index 56041d0e36..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_vsphere/day2/vmware_arm_template_win/_index.md
+++ /dev/null
@@ -1,127 +0,0 @@
----
-type: docs
-title: "Create a Windows VMware VM to an Azure Arc-enabled vSphere cluster using ARM templates"
-linkTitle: "Create a Windows VMware VM to an Azure Arc-enabled vSphere cluster using ARM templates"
-weight: 2
-description: >
----
-
-## Create a Windows VMware VM to an Azure Arc-enabled vSphere cluster using ARM templates
-
-The following Jumpstart scenario will guide you on how to use the provided ARM template to deploy a Windows VM in your Azure Arc-enabled vSphere cluster using custom locations.
-
-> **NOTE:  This Jumpstart scenario assumes you already have a working VMware vSphere environment and is not covering VMware-specific best practices and design recommendations.**
-
-> **NOTE: Azure Arc-enabled VMware vSphere is currently in Preview and as a result, versions captured in the scenario's various screenshots are subject to change.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Create Azure service principal (SP).
-
-    To be able to complete the scenario and its related automation, Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account run the below command (this can also be done in [Azure Cloud Shell](https://shell.azure.com/)).
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArc" --role "Contributor" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look like this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArc",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-    > **NOTE: It is optional but highly recommended to scope the SP to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest)**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-1. User is editing the ARM template parameters file (1-time edit). These parameter values are being used throughout the deployment.
-
-2. User deploys the ARM template at the resource group level.
-
-3. User verifies the deployment of the Windows virtual machine in the vSphere cluster.
-
-## Create the Virtual Machine
-
-As mentioned, this deployment will leverage an ARM template. You will deploy a single ARM template at resource group scope.
-
-- Before deploying the ARM template, login to Azure using AZ CLI with the ```az login``` command.
-
-- The deployment will use an ARM template parameters file to customize your environment. Before initiating the deployment, edit the [_azuredeploy.parameters.json_](https://github.com/microsoft/azure_arc/blob/main/azure_arc_vsphere_jumpstart/vmware_arm_template_win/azuredeploy.parameters.json) file located in your local cloned repository folder. Example parameters files are located [here](https://github.com/microsoft/azure_arc/blob/main/azure_arc_vsphere_jumpstart/vmware_arm_template_win/azuredeploy.example.parameters.json). Fill out the parameters according to your environment:
-
-  - _`virtualMachineName`_ - the name of the Windows virtual machine that will be created
-  - _`customLocationName`_ - the name of your Azure Arc custom location
-  - _`vCenterName`_ - the name of your vCenter
-  - _`networkName`_ - the vSphere network (port group) you will use to deploy your VM
-  - _`nicType`_ - the network type to associate to the VM
-  - _`templateName`_ - your Windows VM template name
-  - _`clusterName`_ - the vSphere cluster to host the VM
-  - _`adminUserName`_ - the admin username for the created Windows VM
-  - _`adminUserPassword`_ - the admin user password for the created Windows VM
-  
-- To deploy the ARM template, navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/blob/main/azure_arc_vsphere_jumpstart/vmware_arm_template_win/) and run the below command.
-
-    ```shell
-    az deployment group create \
-    --location <Azure Region Location> \
-    --resource-group <Resource Group Name> \
-    --name <Deployment Name> \
-    --template-file <The *azuredeploy.json* template file location> \
-    --parameters <The *azuredeploy.parameters.json* parameters file location>
-    ```
-
-- Once Azure resources has been provisioned, you will be able to see it in Azure portal and in your vCenter.
-
-    ![Screenshot showing ARM template output](./01.jpg)
-
-    ![Screenshot showing vCenter console](./02.jpg)
-
-    ![Screenshot showing the VM created in the Azure portal](./03.jpg)
-
-    ![Screenshot showing the VM properties in the Azure portal](./04.jpg)
-
-- The VM is also onboarded to Azure Arc.
-
-    ![Screenshot showing the VM guest configuration enabled](./05.jpg)
-
-## Clean up
-
-Complete the following steps to clean up your environment:
-
-- To delete the just the Windows VM. Navigate to the VM in the Azure portal and click "Delete". This will initiate the deletion in your connected vCenter.
-
-    ![Screenshot showing the VM deletion in the Azure portal](./06.jpg)
-
-    ![Screenshot showing the VM deletion in the vCenter console](./07.jpg)
-
-- If you want to delete the entire Azure resources, simply delete the deployment resource group from the Azure portal.
-
-    ![Screenshot showing the resource group deletion in the Azure portal](./08.jpg)
diff --git a/docs/azure_arc_jumpstart/azure_arc_vsphere/resource_bridge/_index.md b/docs/azure_arc_jumpstart/azure_arc_vsphere/resource_bridge/_index.md
deleted file mode 100644
index 17ce255511..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_vsphere/resource_bridge/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-type: docs
-title: "Azure Arc resource bridge deployment"
-linkTitle: "Azure Arc resource bridge deployment"
-weight: 2
-description: >-
-  The scenarios in this section will walk you through how to connect your VMware vCenter Server to Azure Arc using PowerShell.
----
diff --git a/docs/azure_arc_jumpstart/azure_arc_vsphere/resource_bridge/powershell/_index.md b/docs/azure_arc_jumpstart/azure_arc_vsphere/resource_bridge/powershell/_index.md
deleted file mode 100644
index cea0ad8bca..0000000000
--- a/docs/azure_arc_jumpstart/azure_arc_vsphere/resource_bridge/powershell/_index.md
+++ /dev/null
@@ -1,203 +0,0 @@
----
-type: docs
-title: "Connect VMware vCenter Server to Azure Arc using PowerShell"
-linkTitle: "Connect VMware vCenter Server to Azure Arc using PowerShell"
-weight: 1
-description: >
----
-
-## Connect VMware vCenter Server to Azure Arc using PowerShell
-
-The following README will guide you on how to use the provided PowerShell script to deploy the [Azure Arc resource bridge](https://docs.microsoft.com/azure/azure-arc/resource-bridge/overview) in your vSphere environment to connect your vCenter Server to Azure Arc.
-
-> **NOTE:  This Jumpstart scenario assumes you already have a working VMware vSphere environment and is not covering VMware-specific best practices and design recommendations.**
-
-> **NOTE: Azure Arc-enabled VMware vSphere is currently in Preview and as a result, versions captured in the scenario's various screenshots are subject to change.**
-
-## Prerequisites
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Create Azure service principal (SP)
-
-    To be able to complete the scenario and its related automation, an Azure service principal assigned with the “Contributor” role is required. To create it, login to your Azure account using PowerShell and run the below command.
-
-    ```powershell
-    Connect-AzAccount
-    $sp = New-AzADServicePrincipal -DisplayName "<Unique SP Name>" -Role 'Contributor'
-    ```
-
-    For example:
-
-    ```powershell
-    $sp = New-AzADServicePrincipal -DisplayName "AzureArcvSphere" -Role 'Contributor'
-    ```
-
-    This command will create a variable with a secure string as shown below:
-
-    ```shell
-    Secret                : System.Security.SecureString
-    ServicePrincipalNames : {XXXXXXXXXXXXXXXXXXXXXXXXXXXX, http://AzureArcvSphere}
-    ApplicationId         : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    ObjectType            : ServicePrincipal
-    DisplayName           : AzureArcvSphere
-    Id                    : XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Type                  :
-    ```
-
-    To expose the generated password use the below code to export the secret:
-
-    ```powershell
-    $BSTR = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($sp.Secret)
-    $UnsecureSecret = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR)
-    ```
-
-    Copy and save the Service Principal ApplicationId and Secret as you will need it for later in the automation.
-
-    > **NOTE: It is optional but highly recommended to scope the SP to a specific [Azure subscription and resource group](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal?view=azps-5.4.0)**
-
-- Get the ConnectedVMwarevSphere resource provider Id.
-
-  ```shell
-  az ad sp show --id 'ac9dc5fe-b644-4832-9d03-d9f1ab70c5f7' --query '{name:displayName,objectId:objectId}'
-  ```
-  
-    ![Screenshot of Azure resource provider for vSphere](./01.png)
-
-### vCenter Prerequisites
-
-- VMware vSphere vCenter Server v6.7.
-
-- A virtual network that can provide internet access, directly or through a proxy. It must also be possible for VMs on this network to communicate with the vCenter server on TCP port (usually 443).
-
-- At least one free IP address on the above network that isn't in the DHCP range. At least three free IP addresses if there's no DHCP server on the network.
-
-- A vSphere resource pool or a cluster with a minimum capacity of 16 GB of RAM and four vCPUs.
-
-- A vSphere datastore with a minimum of 100 GB of free disk space.
-
-- A vSphere account [assigned](https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.vsphere.security.doc/GUID-18071E9A-EED1-4968-8D51-E0B4F526FDA3.html) with the following [permissions](https://docs.microsoft.com/azure/azure-arc/vmware-vsphere/quick-start-connect-vcenter-to-arc-using-script#vsphere-account):
-  - Read all inventory.
-  - Deploy and update VMs to all the resource pools (or clusters), networks, and VM templates that you want to use with Azure Arc.
-
-As mentioned, this scenario starts at the point where you already have an up and running VMware vSphere environment managed by vCenter. The automation will be run from a PowerShell window on a computer (which can be your local computer) that has network connectivity to vCenter.
-
-  > **NOTE: the script will automatically uninstall any pre-existing Azure CLI versions in the workstation and will deploy the latest 64-bit version, as it is a requirement to deploy the Azure Arc resource bridge**
-
-## Automation Flow
-
-For you to get familiar with the automation and deployment flow, below is an explanation.
-
-- User is editing the onboarding PowerShell script to match the environment (1-time edit).
-
-- User will run the script from their local workstation or alternatively, a workstation with the required vCenter access.
-
-- User will verify the correct onboarding.
-
-## Connect VMware vCenter Server to Azure Arc
-
-- Change the environment variables according to your environment:
-  - _`location`_ - the Azure region you want to deploy to
-  - _`subscriptionId`_ - your subscription ID
-  - _`resourceGroupName`_ - the name of the Azure resource group you will create your resources in
-  - _`applianceName`_ - a name for the Azure Arc resource bridge appliance
-  - _`customLocationName`_ - the name of your Azure Arc custom location
-  - _`vcenterName`_ -  the name of your vCenter
-  - _`vcenterFqdn`_ - your vCenter fully qualified name
-  - _`vcenterUsername`_ - username to authenticate to vCenter
-  - _`vcenterPassword`_ - password to authenticate to vCenter
-  - _`spnClientId`_ - your service principal App ID
-  - _`spnClientSecret`_ - your service principal password
-  - _`spnTenantId`_ - your Azure AD tenant ID
-  - _`vmTemplate`_ - the Arc appliance template name
-  - _`datacenter`_ - the vSphere datacenter where the appliance will be deployed
-  - _`datastore`_ - the vSphere datastore name where the appliance will be deployed
-  - _`folder`_ - the vSphere folder where the template and appliance will be deployed
-  - _`dnsServer`_ - DNS server to be used for the appliance
-  - _`gateway`_ - Gateway address to be used for the appliance
-  - _`ipAddressPrefix`_ - Network address in CIDR notation to be used by the appliance
-  - _`k8sNodeIpPoolStart`_ - IP range start for the IPs to be used by the appliance
-  - _`k8sNodeIpPoolEnd`_ - IP range end for the IPs to be used by the appliance
-  - _`segment`_ - Name of the virtual network or segment to which the appliance VM must be connected
-  - _`resourcePool`_ - the name of the vSphere resource pool to be used by the appliance
-  - _`controlPlaneEndpoint`_ - IP address of the Kubernetes cluster control plane
-  - _`vSphereRP`_ - _ConnectedVMwarevSphere_ resource provider Id
-  
-  ![Screenshot environment variables](./02.png)
-
-- Once you have provided all of the required environment variables, open a PowerShell window (as an Administrator) and run the script with the command:
-
-  ```powershell
-  .\vCenter_onboarding.ps1
-  ```
-
-  ![Screenshot showing script output](./03.png)
-  
-  ![Screenshot showing script output](./04.png)
-
-  ![Screenshot showing script output](./05.png)
-
-  ![Screenshot showing script output](./06.png)
-
-- While the script is running, from vCenter you should be able to see a running task:
-
-  ![Screenshot showing vCenter task](./07.png)
-  
-  ![Screenshot showing vCenter task](./08.png)
-  
-  ![Screenshot showing script output](./10.png)
-  
-  ![Screenshot showing script output](./11.png)
-   
-  ![Screenshot showing script output](./12.png)
-    
-  ![Screenshot showing script output](./13.png)
-     
-  ![Screenshot showing script output](./14.png)
-   
-  ![Screenshot showing script output](./15.png)
-   
-  ![Screenshot showing script output](./16.png)
-   
-  ![Screenshot showing script output](./17.png)
-
-- From the Azure portal, in the resource group, you should see three new resources, including the VMware vCenter.
-
-  ![Screenshot showing the Azure Arc resources in the Azure Portal](./18.png)
-
-  ![Screenshot showing the connected VMware vCenter](./19.png)
-
-- You should also be able to get a list of VMs, resource pools, templates, networks and data stores that are managed by the vCenter.
-
-  ![Screenshot showing the Azure Arc virtual machines list](./20.png)
-  
-  ![Screenshot showing the Resource pools list](./21.png)
-  
-  ![Screenshot showing the Templates list](./22.png)
-  
-  ![Screenshot showing the Networks list](./23.png)
-  
-  ![Screenshot showing the Data stores list](./24.png)
-
-## Clean up environment
-
-Complete the following steps to clean up your environment:
-
-- If you want to delete the entire Azure resources, simply delete the deployment resource group from the Azure portal.
-     
-    ![Screenshot showing Azure resource group deletion](./25.png)
-    
-- From the vSphere client, power Off the appliance and remove from disk.
-
-    ![Screenshot showing powering off the appliance from vSphere client](./26.png)
-
-    ![Screenshot showing deleting the appliance from vSphere client](./27.png)
-    
-- From the vSphere client, remove the appliance template from disk.
-
-    ![Screenshot showing deleting the appliance template from vSphere client](./28.png)
-
diff --git a/docs/azure_jumpstart_ag/_index.md b/docs/azure_jumpstart_ag/_index.md
deleted file mode 100644
index 047c551f20..0000000000
--- a/docs/azure_jumpstart_ag/_index.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart Agora"
-weight: 3
----
-
-## Jumpstart Agora
-
-### Overview
-
-Jumpstart Agora is a marketplace of various “cloud to edge” industry scenarios, designed to provide an end-to-end user experience. The word "Agora" comes from the ancient Greek term for a public gathering place or assembly, and it has come to be used more broadly to refer to any place or forum where people come together for discussion or exchange.
-
-Our mission is to create a rich marketplace of applications that can leverage Hybrid Cloud, Internet of Things (IoT), and artificial intelligence (AI) technologies and make those accessible for enablement and educational purposes via the Jumpstart automation mechanisms.
-
-<p align="center"><img src="/img/agora_logo.png" alt="Jumpstart Agora logo" width="250"></p>
-
-### Why Jumpstart Agora?
-
-- Sandbox environment for getting hands-on with “cloud to edge” industry scenarios.
-- Accelerator for proofs-of-concept or pilots.
-- Training tool for various Microsoft Azure services and open-source projects skills development.
-- Demo environment for customer presentations or events.
-- Rapid integration testing platform.
-
-### Jumpstart Agora scenarios and get started
-
-Each Agora scenario is a full-stack deployment, from the infrastructure layer all the way to the line of business applications. To get started with Jumpstart Agora, each scenario has a dedicated set of guides that will walk you through the deployment process. The guides are designed to be as simple as possible but also keep the detailed-oriented spirit of the Jumpstart.
-
-| __Scenario__                                                                                | __Industry__ | __Version__           |
-|---------------------------------------------------------------------------------------------|--------------|-----------------------|
-| [Contoso Supermarket](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/) | Retail       | 1.0                   |
-
-### Jumpstart Agora use cases
-
-Each Agora scenario includes a comprehensive deployment stack, all the way from the foundation infrastructure to the line of business applications.
-
-To achieve the goal of providing end-to-end “cloud to edge" hands-on experience, each Agora scenario incorporates application development concepts and delivery models, all as part of driving towards showing how developers can implement edge-based applications while increasing velocity. Our aspiration is for each scenario to have as many of the below concepts and design patterns.
-
-- Distributed applications and cloud services integration
-- Azure Arc integrations
-- Service discovery
-- Performance optimization
-- Data plane design
-- Scalability
-- IoT integrations and various industry protocols
-- Artificial Intelligence (AI) integrations
-- Developer experience
-- Continues integration and delivery (CI/CD) pipelines
-- Observability & Logging
-- Security principals
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/_index.md
deleted file mode 100644
index 9f65a20a27..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/_index.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-type: docs
-linkTitle: "Contoso Supermarket"
-weight: 1
----
-
-# Contoso Supermarket overview
-
-Contoso Supermarket is a leading global retailer at the forefront of the digital revolution. With a strong presence in multiple countries, Contoso Supermarket is dedicated to providing exceptional customer experiences while embracing the latest technologies. Their cloud-to-edge strategy, combined with a commitment to digital transformation, has positioned them as an industry leader.
-
-Contoso Supermarket's cloud-to-edge strategy enables them to leverage the power of both cloud computing and edge computing technologies. By harnessing the scalability, flexibility, and cost-effectiveness of the cloud, they optimize their operations, streamline processes, and enhance customer interactions. Simultaneously, their edge computing capabilities ensure real-time responsiveness and reduced latency, enabling them to deliver superior services at the edge of their network.
-
-To achieve their digital transformation goals, Contoso Supermarket integrates cutting-edge technologies into their business operations. The Internet of Things (IoT) plays a vital role in their operations, enabling them to connect and manage a vast network of smart devices and sensors throughout their supply chain and physical stores. This connectivity enhances inventory management, enables predictive maintenance, and facilitates personalized customer experiences.
-
-Additionally, Contoso Supermarket harnesses the power of Artificial Intelligence (AI) to gain actionable insights from their vast data streams. Through AI algorithms and machine learning models, they can analyze customer behavior, optimize inventory, and personalize marketing campaigns, leading to increased customer satisfaction and higher profitability.
-
-A key component of Contoso Supermarket's digital transformation is their utilization of hybrid cloud technology using Azure Arc. Azure Arc enables them to seamlessly manage and deploy their applications across on-premises infrastructure, private cloud, and public cloud environments. This hybrid cloud approach allows them to leverage the benefits of both cloud and on-premises solutions, ensuring scalability, security, and compliance while maximizing operational efficiency.
-
-Contoso Supermarket's commitment to digital transformation, along with their cloud-to-edge strategy, positions them as a forward-thinking and customer-centric retailer. By leveraging technologies like IoT, AI, and hybrid cloud with Azure Arc, they continue to innovate, enhance operational excellence, and deliver exceptional experiences to their customers worldwide.
-
-## Architecture and technology stack
-
-To support their digital transformation aspirations, Contoso Supermarket stores have a robust technology stack, services, and processes. To demonstrate the various use cases mentioned below, a set of reference applications is included:
-
-- __Point of Sale (PoS)__ - Streamlining sales transactions and customer interactions through a user-friendly and efficient point-of-sale system, simplifying the purchasing process and enhancing overall customer satisfaction.
-- __Managers Control Center__ - Enabling managers to monitor and manage store operations in real-time, ensuring optimal performance and customer satisfaction.
-- __Checkout Queue Monitoring__ - Enhancing customer experience by monitoring and managing checkout queues in real-time to minimize waiting times and improve operational efficiency.
-- __Freezer Monitoring for Food Safety__ - Ensuring food safety by monitoring and maintaining optimal conditions in freezers to prevent spoilage and maintain product quality.
-
-![Applications and technology stack architecture diagram](./img/technology_stack.png)
-
-## Getting started
-
-To get started with the "Contoso Supermarket" Jumpstart Agora scenario, we provided you with a dedicated guide for each step of the way. The guides are designed to be as simple as possible but also keep the detailed-oriented spirit of the Jumpstart.
-
-| __Guide__                                                                                                                                                                     | __Contoso Supermarket service or platform__                 | __Technology stack__                                                                               |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
-| [Contoso Supermarket deployment guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/)                                                       | Not applicable                                              | Not applicable                                                                                     |
-| [Data pipeline and reporting across cloud and edge for store orders](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/data_pos/)                           | Point of Sale (PoS)                                         | Cosmos DB, Azure Data Explorer, OSS PostgreSQL, AKS Edge Essentials                                |
-| [Data pipeline and reporting across cloud and edge for sensor telemetry](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/freezer_monitor/)                | Freezer Monitoring for Food Safety                          | IoT Hub, Azure Data Explorer, Mosquitto MQTT Broker, Prometheus, Grafana, AKS Edge Essentials      |
-| [Enabling AI at the Edge & Software configurations rollout with basic GitOps flow](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/ai/)                   | Managers Control Center                                     | AKS Edge Essentials, GitOps (Flux), OSS PostgreSQL, Intel OpenVino Inference Engine                |
-| [Streamlining the Software Delivery Process using CI/CD](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/ci_cd/)                                          | Point of Sale (PoS)                                         | AKS, AKS Edge Essentials, Azure Arc, Flux, GitHub Actions, Azure Container Registry                |
-| [Infrastructure observability for Kubernetes and Arc-enabled Kubernetes](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/k8s_infra_observability/)        | Infrastructure                                              | AKS, AKS Edge Essentials, Prometheus, Grafana                                                      |
-| [Infrastructure observability for Azure Arc-enabled servers using Azure Monitor](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/arc_monitoring_servers/) | Infrastructure                                              | Azure Arc-enabled servers, Azure Monitor                                                           |
-| [Infrastructure security with Microsoft Defender for Servers](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/arc_defender_servers/)                      | Infrastructure                                              | Azure Arc-enabled servers, Microsoft Defender for Cloud                                            |
-| [Cleanup deployment](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/cleanup/)                                                                            | Not applicable                                              | Not applicable                                                                                     |
-| [Troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/troubleshooting/)                                                                       | Not applicable                                              | Not applicable                                                                                     |
-| [Frequently asked questions (FAQ)](https://azurearcjumpstart.io/azure_jumpstart_ag/faq/)                                                                                      | Not applicable                                              | Not applicable                                                                                     |
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/ai/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/ai/_index.md
deleted file mode 100644
index c7e69587c6..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/ai/_index.md
+++ /dev/null
@@ -1,217 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Enabling AI at the Edge & Software configurations rollout with basic GitOps flow
-
-## Overview
-
-Contoso prides itself on being technology innovators. In the current market, Contoso's leadership recognizes that maintaining their position as leaders in the retail space requires innovation in every aspect of their operations.
-
-To this end, Contoso Supermarket has developed an artificial intelligence (AI) mechanism that empowers them to enhance the customer experience in their stores. By implementing such a mechanism, their objective is to accurately detect the number of people waiting at different checkout lanes and enable proactive actions based on this data.
-
-Contoso has also adopted GitOps methodologies so they can enable their DevOps teams to centrally and gradually rollout new features developed by the development team to their stores in a controlled manner.
-
-## Architecture
-
-Contoso has four Kubernetes environments for their application rollout process (Dev, Staging, Canary, and Production), each environment is represented in their GitHub repository as a separate branch to allow developers to develop, test, and ship features and fixes in a controlled manner across each environment.
-
-  ![Screenshot showing the Contoso Supermarket's virtualization stack](./img/ag_aks_clusters.png)
-
-In each cluster, a queue monitoring frontend service is deployed to allow store managers to monitor the checkout queues and leverages the power of AI to detect the number of users in a certain queue so they can take immediate action to enhance the customers' checkout experience.
-
-  ![Screenshot showing the Contoso Supermarket's queue monitoring service](./img/ai_diagram.png)
-
-Contoso's DevOps team has adopted GitOps methodologies which allows them to use Git as the single source of truth for managing infrastructure and application deployments. It involves declarative definitions of infrastructure and application configurations, which are stored in Git repositories. The GitOps pipeline automatically detects any changes made to the repositories and triggers the necessary actions to deploy the changes to the target environments.
-
-One of the main benefits of GitOps is its ability to provide a consistent and auditable deployment process. All changes to the infrastructure and application configurations are tracked and versioned in Git, making it easy to roll back to a previous state if necessary. The declarative nature of GitOps also enables the automation of the deployment process, which reduces the risk of human error and streamlines the entire process.
-
-### AI at the Edge using Intel OpenVino
-
-Contoso aims to maximize the usage of their existing Closed-circuit television (CCTV) cameras installed across their stores. After careful evaluation, Contoso has opted to utilize Intel's OpenVino Technology for their solution. By leveraging OpenVino, Contoso can perform inference on the CPU of their edge devices, eliminating the need for expensive discrete GPUs. Intel also provides a set of pre-trained models that align with Contoso's requirements.
-
-In this specific use case, Contoso has chosen the [_"person-detection-retail-0013 pre-trained model"_](https://docs.openvino.ai/2022.3/omz_models_model_person_detection_retail_0013.html). This model boasts an impressive Average Precision of 88.62% and accepts high-definition videos (1024x768) as input.
-
-The developed application showcases the live video feed with bounding boxes encompassing identified individuals. Additionally, a heatmap is superimposed on the video to provide a visual representation of people density in different areas of the frame.
-
-Furthermore, the application communicates the results via HTTP messages, enabling accessibility from other devices within the network. In the event of any errors or issues, they are promptly displayed in the console, aiding in the debugging process.
-
-## Store Manager Experience
-
-Contoso leverages their existing CCTV cameras by seamlessly integrating them into the store manager interface. This integration enables Store Managers to take immediate action, such as opening or closing lanes, based on the real-time data provided by the cameras. All data processing occurs locally using an edge device, ensuring compliance with corporate policies and safeguarding data privacy.
-
-The "Managers Control Center" serves as the central hub of this experience. From this interface, store managers can easily monitor the number of people in each lane. The home page consists of two main areas.
-
-To access the "Managers Control Center", select the POS [_env_] Manager option from the _POS_ Bookmarks folder. Each environment will have it's own "Managers Control Center" instance with a different IP.
-
-![Screenshot showing the POS Bookmark](./img/control-center-menu.png)
-
-- __Heatmap:__ Using the heatmap, the Store Manager can open or close checkout lanes to distribute the traffic of the store, using the Toggles above each lane.
-
-    ![Screenshot showing the Store Manager Screenshot Heatmap focus](./img/checkout-heatmap.png)
-
-- __Reporting:__ Contoso is interested in improving their store experience by measuring two key metrics: Total people in the store, and Shopper Wait Time. These metrics are shown in the Store Manager Control Center as shown below.
-
-    ![Screenshot showing the Store Manager Reporting Pane](./img/reporting.png)
-
-## Live View
-
-These metrics are generated by combining an AI engine that captures inferences from the CCTV cameras with an application running the business logic. To provide visibility into the process of capturing these inferences, the Contoso Dev team has included an option to view the live video feed from one of their cameras.
-
-Contoso has decided to have the "Live View" option enabled by default in the Dev and Staging environments.
-
-![Screenshot showing the enabled live view button](./img/live-view-button.png)
-
-Live View will be disabled by default in Seattle and Chicago environments as shown in the picture below:
-
-![Screenshot of disabled live view button](./img/disabled-live-view.png)
-
-### GitOps workflow
-
-Contoso has deployed GitOps configurations for all of their services to make it easier for their developers to focus on code and streamline all the code build, test, and deployment activities. Flux v2 is the main driver for Contoso's GitOps workflow by monitoring the Git repository holding all the clusters' configurations and applications code for changes and automatically updating the deployed resources accordingly. This makes it easy for teams to manage their infrastructure as code, using Git as the single source of truth.
-
-[GitOps on Azure Arc-enabled Kubernetes](https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/hybrid/arc-enabled-kubernetes/eslz-arc-kubernetes-cicd-gitops-disciplines) leverages Flux v2 to provide a unified experience for managing Kubernetes clusters across different environments. This integration allows users to deploy and manage applications in Arc-enabled Kubernetes clusters, while also providing a centralized management plane through Azure Arc. This can simplify the process of managing Kubernetes clusters across different environments and provide greater visibility and control over the entire deployment process.
-
-Before starting to code this new feature, it is useful to take a look at how Contoso's GitHub repository is structured.
-
-- The GitHub repository for Contoso's applications has a branch per environment as follows:
-  - _Main_ branch targets the local _Dev_ environment/cluster
-  - _Staging_ branch targets the _Staging_ environment/cluster
-  - _Canary_ branch targets the _Chicago_ environment/cluster
-  - _Production_ branch targets the _Seattle_ environment/cluster
-
-    ![Screenshot showing the GitHub repository branches](./img/repo_branches.png)
-
-- The repository has two main folders to separate the development team applications' code (developer) and the DevOps team operations GitOps configurations (operations).
-
-    ![Screenshot showing the GitHub repository main folder structure](./img/repo_folder_structure.png)
-
-- Within the _developer_ folder there is a folder for each application's source code. This is where Contoso Supermarket's developers develop new features.
-
-    ![Screenshot showing the developer folder structure](./img/repo_developer_structure.png)
-
-- Within the _operations_ folder there is also a folder for each application's GitOps configuration. This is where Contoso Supermarket's DevOps team manages how the applications are deployed to the different environments.
-
-    ![Screenshot showing the operations folder structure](./img/repo_operations_structure.png)
-
-- Each application has a folder for [Helm](https://helm.sh/docs/) _charts_ where the Kubernetes manifests for each application are located and a folder for _releases_ where the Helm Releases for each application and each environment is located. This way the DevOps team can control the promotion of each version of the applications across the GitOps workflow on different environments and also enable/disable features created by the developers as needed.
-
-    ![Screenshot showing the helm folder structure](./img/repo_operations_helm_structure.png)
-
-    ![Screenshot showing the helm releases folder structure](./img/repo_operations_helmreleases_structure.png)
-
-## DevOps team experience
-
-Contoso's DevOps team has received a request from the _Chicago_ store managers that they need the "Live View" feature enabled in their store as their queues are getting longer throughout peak hours throughout the day.
-
-- Connect to the Client VM _Ag-VM-Client_ using the instructions in the [deployment guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#connecting-to-the-agora-client-virtual-machine).
-
-- Open VSCode from the desktop shortcut.
-
-    ![Screenshot showing the the VSCode icon on the desktop](./img/open_vscode.png)
-
-- Bring up the VSCode command palette.
-
-    ![Screenshot showing the opening the command palette in VSCode](./img/vscode_command_palette.png)
-
-- Select the option to open a folder in a dev container from the command palette.
-
-    ![Screenshot showing opening a folder in a dev container](./img/vscode_dev_container.png)
-
-- Browse to the cloned repository on the Client VM located at _C:\Ag\AppsRepo\jumpstart-agora-apps_.
-
-    ![Screenshot showing the cloned repository on the client VM](./img/vscode_dev_container_open_folder.png)
-
-- Select the _Ubuntu_ operating system for your dev container.
-
-    ![Screenshot showing the operating system for the dev container](./img/vscode_dev_container_os.png)
-
-    ![Screenshot showing the jammy ubuntu flavor for the dev container](./img/vscode_dev_container_ubuntu_flavor.png)
-
-- No need for any additional features to install, so click _Ok_.
-
-    ![Screenshot showing the additional operating system features to install](./img/vscode_dev_container_os_options.png)
-
-- Click on _Trust folder and continue_, now you can see the cloned repository opened in VSCode, in the _Ubuntu_ dev container.
-
-    ![Screenshot showing the cloned repository opened in the dev container](./img/vscode_dev_container_trust_folder.png)
-
-    ![Screenshot showing the trust folder prompt in VSCode](./img/vscode_dev_container_pos_app.png)
-
-- Click on the _Source Control_ icon in the VSCode toolbar, click on _Manage Unsafe Repositories_, and select the _jumpstart-agora-apps_ repository to include the repository to the allow list.
-
-    ![Screenshot showing the trust repository prompt in VSCode](./img/vscode_dev_container_trust_repository.png)
-
-- Switch to the _canary_ branch to enable the "Live View" feature on the _Chicago_ Kubernetes cluster.
-
-    ![Screenshot showing switching to the canary branch](./img/vscode_canary_branch.png)
-
-- Navigate to the file _contoso_supermarket/operations/contoso_supermarket/releases/queue-monitoring-frontend/canary/chicago.yaml_. You can see that "Live View" is disabled.
-
-    ![Screenshot showing the navbar.html file](./img/vscode_canary_live_view_disabled.png)
-
-- Change the value to _True_ to enable the "Live View" feature.
-
-    ![Screenshot showing the navbar.html file](./img/vscode_canary_live_view_enabled.png)
-
-- You should see a new change visible in the GitHub pane (if you don't see any changes, click refresh).
-
-    ![Screenshot showing the added changes in the repository](./img/vscode_add_changes.png)
-
-- Add a commit message and click Commit, for example: "Adding Live View feature" and push your code.
-
-    ![Screenshot showing the added a commit message](./img/vscode_add_committ_message.png)
-
-    ![Screenshot showing the added pushing code to remote](./img/vscode_push_changes.png)
-
-- After a couple of seconds, the Flux operator should detect the change and you should start seeing pod recreation activity on the _Chicago_ Kubernetes cluster.
-
-    ![Screenshot showing pods terminating in the canary cluster](./img/live_view_containers.png)
-
-- Upon refreshing the store manager view, you can see that the "Live View" feature is enabled and the "Live View" button is not greyed out anymore.
-
-    ![Screenshot showing the live view feature enabled on the browser](./img/edge_live_view_enabled.png)
-
-    ![Screenshot showing the live view feature showing the video feed](./img/edge_canary_pos_manage_live_view.png)
-
-Contoso's DevOps team has also received a request from the _Seattle_ store managers that they would like to add a "Holiday Banner" feature on the customer view of the PoS application that was created by the development team.
-
-- Navigate to the customer view in the PoS application, you can see that there is no "Holidays Banner" feature in the navigation bar.
-
-    ![Screenshot showing customer view with no holiday banner](./img/edge_seattle_pos_no_banner.png)
-
-- Switch to the _production_ branch to enable the "Holiday Banner" feature on the _Seattle_ Kubernetes cluster.
-
-    ![Screenshot showing switching to the production branch](./img/vscode_production_branch.png)
-
-- Navigate to the _contoso_supermarket/operations/contoso_supermarket/releases/contosopos/production/seattle.yaml_ file. You can see that the "Holiday Banner" feature is disabled.
-
-    ![Screenshot showing the navbar.html file](./img/vscode_production_holiday_banner_disabled.png)
-
-- Change the value to _True_ to enable the "Holiday Banner" feature.
-
-    ![Screenshot showing the navbar.html file](./img/vscode_production_holiday_banner_enabled.png)
-
-- You should see a new change visible in the GitHub pane (if you don't see any changes, click refresh).
-
-    ![Screenshot showing the added changes in the repository](./img/vscode_production_view_changes.png)
-
-- Add a commit message and click Commit, for example: "Adding Live View feature" and push your code.
-
-    ![Screenshot showing the added a commit message](./img/vscode_production_add_committ_message.png)
-
-    ![Screenshot showing the added pushing code to remote](./img/vscode_production_push_changes.png)
-
-- After a couple of seconds, the Flux operator should detect the change and you should start seeing pod recreation activity on the _Seattle_ Kubernetes cluster.
-
-    ![Screenshot showing pods terminating in the production cluster](./img/live_view_containers_production.png)
-
-- Upon refreshing the customer view, you can see that the "Holiday Banner" feature is enabled and the holiday banner is visible on the customer view of the PoS application.
-
-    ![Screenshot showing the Holiday banner feature enabled on the browser](./img/edge_production_pos_holiday_banner.png)
-
-## Next Steps
-
-In the next scenario, learn how Contoso Supermarket are streamlining the [Software Delivery Process using CI/CD](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/ci_cd/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/arc_defender_servers/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/arc_defender_servers/_index.md
deleted file mode 100644
index ef420e602b..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/arc_defender_servers/_index.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Infrastructure security with Microsoft Defender for Servers
-
-## Overview
-
-Contoso Supermarket are aware that as they navigate the complex landscape of edge computing, it is essential to protect their servers against threats while maintaining a comprehensive view of their security posture. Microsoft Defender for Servers emerges as a vital component, playing a pivotal role in protecting servers from threats and providing unparalleled visibility into their security landscape.
-
-[Microsoft Defender for Servers](https://learn.microsoft.com/azure/defender-for-cloud/plan-defender-for-servers) ensures that Contoso's Azure Arc-enabled servers remain resilient against a wide range of cyber threats. With advanced threat protection, machine learning algorithms, and real-time security intelligence, Microsoft Defender for Servers proactively detects and neutralizes potential risks.
-
-On the other hand, maintaining visibility into the security posture of Azure Arc-enabled servers is crucial for Contoso. Microsoft Defender for Servers offers comprehensive insights into the servers' security status, providing a centralized view of threats, vulnerabilities, and security events. By analyzing telemetry data, logs, and behavioral patterns, Contoso Supermarket gains a deep understanding of their security landscape, enabling proactive risk mitigation.
-
-## Enable Microsoft Defender for Servers
-
-To protect workloads with Microsoft Defender for Servers, you will need to enable its "Servers" plan at the Azure subscription level. Follow these steps, if it is not already enabled:
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-    ![Screenshot showing the checking default subscription](./img/check_default_subscription.png)
-
-- Run the following command to check whether Microsoft Defender for Servers is already enabled in your subscription or not:
-
-    ```shell
-    az security pricing show -n VirtualMachines
-    ```
-
-    ![Screenshot showing how to check Microsoft Defender for Servers enabled at subscription level](./img/check_defender_for_servers.png)
-
-    > __NOTE: Proceed with the next step if the value you have got for _pricingTier_ is equal to _Free_. If the value was _Standard_, Microsoft Defender for Servers is already enabled and no additional action is required.__
-
-- Run the following command to enable Microsoft Defender for Servers in your subscription:
-
-    ```shell
-    az security pricing create -n VirtualMachines --tier 'standard'
-    ```
-
-    ![Screenshot showing gow to enable Microsoft Defender for Servers at subscription level](./img/enable_defender_for_servers.png)
-
-    > __NOTE: Remember to follow the steps provided in the Cleanup section at the end of this guide to disable Microsoft Defender for Servers, otherwise you may incur additional charges on your subscription.__
-
-## Azure Arc-enabled servers and Microsoft Defender for Servers Integration
-
-Now that you have successfully enabled Microsoft Defender for Servers, you will start getting recommendations to help you protect your resources, including your Azure Arc-enabled servers.
-
-Microsoft Defender for Servers will collect data from your Arc-enabled servers to monitor for security vulnerabilities and threats. The data collection will allow greater visibility into missing updates, non-secure OS settings, endpoint protection status, health, and threat protection.
-
-- Navigate to Microsoft Defender for Cloud. In the __Inventory__ section under __VM and Servers__, Defender will provide you with an overview of all the discovered security recommendations for your __Azure Arc-enabled servers__.
-
-    ![Screenshot showing the Microsoft Defender for Cloud Inventory](./img/inventory_defender_for_servers.png)
-
-    > __NOTE: it may take up to 30 minutes for your Azure Arc-enabled server to be shown in Microsoft Defender for Cloud Dashboard__
-
-- Select one of the Azure Arc-enabled servers. Microsoft Defender for Cloud will show the security recommendations:
-
-    ![Screenshot showing the Microsoft Defender for Cloud Recommendations](./img/recommendations_defender_for_servers.png)
-
-- Select one of the recommendations. Each recommendation will include:
-  - A short description of what is being recommended.
-  - Related recommendations.
-  - The remediation steps to carry out in order to implement the recommendation. For specific recommendations, you may also get a __Quick Fix__ that enables you to quickly remediate a recommendation on multiple resources.
-
-    ![Screenshot showing the Defender recommendation on Azure Arc-enabled server](./img/recommendation_arc_server_defender_for_servers.png)
-
-- For this Azure Arc-enabled server the recommendation _Machines should be configured to periodically check for missing system updates_ provides a __Quick Fix__. It is using an ARM template to enable a periodic update assessment on the Azure Arc-enabled server.
-
-    ![Screenshot showing the Defender recommendation Quick Fix ARM template](./img/recommendation_quickfix_defender_for_servers.png)
-
-- You can trigger the remediation by clicking on the __Fix__ button:  
-
-    ![Screenshot showing the Defender recommendation Fix button](./img/recommendation_fixbutton_defender_for_servers.png)
-
-- After you apply the recommendation, it will be now marked as healthy. Note that it can take several minutes after remediation completes to see the resources in the 'healthy resources' tab
-
-    ![Screenshot showing showing healthy Azure Arc-enabled server](./img/recommendation_healthy_defender_for_servers.png)
-
-## Cleanup
-
-> __NOTE: Proceed with the next steps if Microsoft Defender for Servers in your subscription was set to _Free_.__
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-    ![Screenshot showing the checking default subscription](./img/check_default_subscription.png)
-
-- Run the following command to disable Microsoft Defender for Servers in your subscription:
-
-    ```shell
-    az security pricing create -n VirtualMachines --tier 'free'
-    ```
-
-    ![Screenshot showing Disable Microsoft Defender for Servers at the subscription level](./img/disable_defender_for_servers.png)
-
-## Next steps
-
-Now that you have successfully completed all of the Contoso Supermarket scenarios, continue to the next step to learn how to [cleanup the deployment](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/cleanup/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/arc_monitoring_servers/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/arc_monitoring_servers/_index.md
deleted file mode 100644
index a2dcac0b41..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/arc_monitoring_servers/_index.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Infrastructure observability for Azure Arc-enabled servers using Azure Monitor
-
-## Overview
-
-Infrastructure observability is key for Contoso Supermarket to understand the performance and the health of their Azure Arc-enabled servers. This is where [Azure Monitor](https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/hybrid/arc-enabled-servers/eslz-management-and-monitoring-arc-server) steps in, playing a crucial role in providing visibility into every aspect of their Azure Arc-enabled servers ecosystem.
-
-Azure Monitor empowers Contoso with the ability to monitor and collect telemetry data from their Azure Arc-enabled servers. It acts as a central hub, delivering near real-time insights into server performance, health, and resource utilization. Azure Monitor provides a holistic view of the entire infrastructure, ensuring proactive identification and resolution of potential issues.
-
-## Enable and configure Azure Monitor
-
-Azure Monitor can collect data directly from your Arc-enabled servers into a Log Analytics workspace for detailed analysis and correlation. It requires installing both the Azure Monitor Agent (AMA) and the Dependency Agent VM extension in your Azure Arc-enabled servers, enabling VM insights to collect data from your machines.
-
-As part of the automated deployment, an Azure Policy monitoring initiative and a Data Collection Rule (DCR) are deployed. They allow collecting monitoring data from your Azure Arc-enabled servers.
-
-Follow these steps to verify that these required Azure Monitor artifacts have been successfully deployed:
-
-- In the top bar of the Azure portal, search for __policy__ and click on __Policy__:
-
-    ![Screenshot of searching Azure Policy](./img/search_policy.png)
-
-- Click on __Assignments__. You will see the Azure Policy initiative "_(Ag) Enable Azure Monitor for Hybrid VMs with AMA_". This initiative enables Azure Monitor for the hybrid virtual machines with AMA. It takes a Log Analytics workspace as a parameter and asks for an option to enable Processes and Dependencies.
-
-    ![Screenshot of Azure Monitor initiative assignment Azure Policy](./img/azure_monitor_initiative.png)
-
-- The Azure Policy initiative mentioned above deploys a Data Collection Rule (DCR), which is in charge of collecting monitoring data from the Azure Arc-enabled servers. In the top bar, search for __Data collection rules__:
-
-    ![Screenshot of searching Data Collection Rules](./img/search_dcr.png)
-
-- You will find the DCR that has been created to collect insights from the Azure Arc-enabled servers:
-
-    ![Screenshot of the Data Collection Rules](./img/dcr_vmi.png)
-
-- Click on the DCR. You will see the data sources collected ant the Azure Arc-enabled servers associated with this DCR:
-
-    ![Screenshot of the DCR - Data sources](./img/dcr_datasources.png)
-
-    ![Screenshot of the DCR - Resources](./img/dcr_resources.png)
-
-## Azure Arc-enabled servers and Azure Monitor VMInsights Integration
-
-Now that we have checked that the required monitoring artifacts have been successfully enabled, it's time to leverage VMInsights. It monitors the performance and health of your Azure Arc-enabled servers by collecting data on their running processes and dependencies on other resources.
-
-- Search for __Azure Arc__, go to __Servers__ and click in one of your __Azure Arc-enabled servers__:
-
-    ![Screenshot of searching for an Azure Arc-enabled server](./img/search_arc_server.png)
-
-- Click on __Insights__ and then on __Performance__. You will find a set of performance charts that target several key performance indicators to help you determine how well your Azure Arc-enabled server is performing. The charts show resource utilization over a period of time:
-
-    ![Screenshot of VMInsights - Performance](./img/vminsights_performance.png)
-
-- After you have explored all the available performance charts, click on __Map__. You will see the processes running in your Azure Arc-enabled servers, their connections and dependencies:
-
-    ![Screenshot of VMInsights - Map](./img/vminsights_map.png)
-
-## Next steps
-
-Now that you have successfully learned how the integration of Azure Monitor for Azure Arc-enabled servers works, continue to the next step to learn how to [secure your Azure Arc-enabled servers with Microsoft Defender for Servers](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/arc_defender_servers/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/ci_cd/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/ci_cd/_index.md
deleted file mode 100644
index 7a6fa9cc8e..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/ci_cd/_index.md
+++ /dev/null
@@ -1,238 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Streamlining the Software Delivery Process using CI/CD
-
-## Overview
-
-In today's fast-paced software development industry having a robust and efficient CI/CD (Continuous Integration/Continuous Deployment) pipeline is critical for organizations to maintain a competitive edge and stay ahead of the curve. This is particularly important for organizations like Contoso Supermarket to deliver a seamless shopping experience to its customers. With the increasing adoption of cloud technologies, the need for an efficient CI/CD pipeline has become more pronounced, as it allows Contoso Supermarket to quickly and reliably deploy changes to their applications and infrastructure.
-
-GitHub Actions allows Contoso Supermarket's developers to define workflows to build, test, and deploy their applications directly from their GitHub repositories. With its wide range of pre-built actions and integrations, GitHub Actions makes it easy for developers to implement CI/CD pipelines for Contoso Supermarket's critical applications and services and to ship more features without compromising quality, security, and speed.
-
-Contoso Supermarket's DevOps team has adopted GitOps methodologies which allows them to use Git as the single source of truth for managing infrastructure and application deployments. It involves declarative definitions of infrastructure and application configurations, which are stored in Git repositories. The GitOps pipeline automatically detects any changes made to the repositories and triggers the necessary actions to deploy the changes to the target environments.
-
-One of the main benefits of GitOps is its ability to provide a consistent and auditable deployment process. All changes to the infrastructure and application configurations are tracked and versioned in Git, making it easy to roll back to a previous state if necessary. The declarative nature of GitOps also enables the automation of the deployment process, which reduces the risk of human error and streamlines the entire process.
-
-## Architecture
-
-Contoso has four Kubernetes environments for their application rollout process (Dev, Staging, Canary, and Production), each environment is represented in their GitHub repository as a separate branch to allow developers to develop, test, and ship features and fixes in a controlled manner across each environment.
-
-   ![Screenshot showing the Contoso Supermarket's virtualization stack](./img/ag_aks_clusters.png)
-
-### Development workflow
-
-- The inner loop is where developers start to make changes and test locally on the local _Dev_ cluster and then use the CI/CD workflow.
-- Changes are then automatically pushed to the _Staging_ environment for testing and validation.
-- Once the changes are approved by a release manager, the changes are pushed to the outer loop to the _Canary_ environment which is where the actual cluster in the Chicago store is deployed.
-- After this release has been cleared for successful testing and operation in the Chicago environment, the release manager will approve the changes for production
-- The CI/CD workflow will run final tests and deploy this release to the _Production_ environment in the Seattle store
-
-    ![Screenshot showing the developer workflow](./img/developer_workflow.png)
-
-### CI/CD workflow
-
-Contoso has implemented a CI/CD workflow to make it easier for their developers to focus on code and streamline all the code build, test, and deployment activities. Before starting to code this new feature, it is useful to take a look at how Contoso's GitHub repository is structured and how their CI/CD workflow is configured.
-
-   ![Screenshot showing the CI/CD workflow](./img/ci_cd_workflow.png)
-
-- The GitHub repository for Contoso's applications has a branch per environment as follows:
-  - _Main_ branch targets the local _Dev_ environment/cluster
-  - _Staging_ branch targets the _Staging_ environment/cluster
-  - _Canary_ branch targets the _Chicago_ environment/cluster
-  - _Production_ branch targets the _Seattle_ environment/cluster
-
-    ![Screenshot showing the GitHub repository branches](./img/repo_branches.png)
-
-- The repository has two main folders to separate the development team applications' code (developer) and the DevOps team operations GitOps configurations (operations).
-
-    ![Screenshot showing the GitHub repository main folder structure](./img/repo_folder_structure.png)
-
-- Within the _developer_ folder there is a folder for each application's source code. This is where Contoso Supermarket's developers develop new features.
-
-    ![Screenshot showing the developer folder structure](./img/repo_developer_structure.png)
-
-- Within the _operations_ folder there is also a folder for each application's GitOps configuration. This is where Contoso Supermarket's DevOps team manages how the applications are deployed to the different environments.
-
-    ![Screenshot showing the operations folder structure](./img/repo_operations_structure.png)
-
-- Each application has a folder for [Helm](https://helm.sh/docs/) _charts_ where the Kubernetes manifests for each application are located and a folder for _releases_ where the Helm Releases for each application and each environment is located. This way the DevOps team can control the promotion of each version of the applications across the CI/CD workflow on different environments and also enable/disable features created by the developers as needed.
-
-    ![Screenshot showing the helm folder structure](./img/repo_operations_helm_structure.png)
-
-    ![Screenshot showing the helm releases folder structure](./img/repo_operations_helmreleases_structure.png)
-
-- Helm Releases control the promotion of the PoS application images from one environment to the other using the image tag as a Helm value.
-
-    ![Screenshot showing the helm release values](./img/github_helm_release_example.png)
-
-- The repository has the following GitHub actions that build the Contoso Supermarket's CI/CD workflow
-  - __Promote-to-staging:__ This workflow is triggered once a pull request targeting the code of the PoS application is merged. It will build the new images based on code changes, increment the image tag, run unit tests, and update the PoS application on the _Staging_ environment.
-  - __Promote-to-canary:__ This workflow is triggered once the staging cluster has a healthy deployment of the PoS application, this is done once the Flux v2 operator captures the new commit in the staging branch and generates a notification that the deployment is ready. It will build the new canary image, run integration tests, and submits a PR to update the image tag on the _canary_ Helm release.
-  - __Promote-to-production:__ This workflow is triggered once the canary cluster has a healthy deployment of the PoS application, this is done once the Flux v2 operator captures the new commit in the canary branch and generates a notification that the deployment is ready. It will build the new production image, run final tests, and submits a PR to update the image tag on the _production_ Helm release.
-
-    ![Screenshot showing all the GitHub actions](./img/github_actions_list.png)
-
-## Developer experience
-
-As a Contoso Supermarket developer, you are assigned a new task to implement a new feature to the Point of Sale (PoS) application where customers have provided feedback that the checkout process is not optimal. As products get added to the cart there is no way to see how many items are in the cart and the total cost.
-
-The development process will start from the local _dev_ cluster, where as a developer, you will write some code to add this new functionality using VSCode's dev containers feature.
-
-   ![Screenshot showing the PoS application before the checkout feature](./img/pos_before_checkout_feature.png)
-
-- Connect to the Client VM _Ag-VM-Client_ using the instructions in the [deployment guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#connecting-to-the-agora-client-virtual-machine).
-
-- Open VSCode from the desktop shortcut.
-
-    ![Screenshot showing the the VSCode icon on the desktop](./img/open_vscode.png)
-
-- Bring up the VSCode command palette.
-
-    ![Screenshot showing the opening the command palette in VSCode](./img/vscode_command_palette.png)
-
-- Select the option to open a folder in a dev container from the command palette.
-
-    ![Screenshot showing opening a folder in a dev container](./img/vscode_dev_container.png)
-
-- Browse to the cloned repository on the Client VM located at _C:\Ag\AppsRepo\jumpstart-agora-apps_.
-
-    ![Screenshot showing the cloned repository on the client VM](./img/vscode_dev_container_open_folder.png)
-
-- Select the _Ubuntu_ operating system for your dev container.
-
-    ![Screenshot showing the operating system for the dev container](./img/vscode_dev_container_os.png)
-
-    ![Screenshot showing the jammy ubuntu flavor for the dev container](./img/vscode_dev_container_ubuntu_flavor.png)
-
-- No need for any additional features to install, so click _Ok_.
-
-    ![Screenshot showing the additional operating system features to install](./img/vscode_dev_container_os_options.png)
-
-- Click on _Trust folder and continue_, now you can see the cloned repository opened in VSCode, in the _Ubuntu_ dev container.
-
-    ![Screenshot showing the trust folder prompt in VSCode](./img/vscode_dev_container_trust_folder.png)
-
-    ![Screenshot showing the cloned repository opened in the dev container](./img/vscode_dev_container_pos_app.png)
-
-- Click on the _Source Control_ icon in the VSCode toolbar, click on _Manage Unsafe Repositories_ and select the _jumpstart-agora-apps_ repository to add it to the allow list.
-
-    ![Screenshot showing the trust repository prompt in VSCode](./img/vscode_dev_container_trust_repository.png)
-
-- To add this new checkout functionality, you will have to create a new feature branch and edit the _navbar.html_ file in the _pos_ application.
-- Create a new branch from VSCode called _feature-checkout-cart_ and publish this branch to the remote repository.
-
-    ![Screenshot showing creating a new branch](./img/vscode_dev_new_feature_branch.png)
-
-    ![Screenshot showing publishing the new branch](./img/vscode_dev_publish_branch.png)
-
-- Navigate to the file _contoso_supermarket/developer/PoS/src/templates/navbar.html_.
-
-    ![Screenshot showing the navbar.html file](./img/vscode_dev_navbar_file.png)
-
-- To simulate adding this new functionality, uncomment the commented section in the _navbar.html_ file and save your changes.
-
-    ![Screenshot showing the commented section of the navbar.html file](./img/vscode_dev_navbar_file_uncommented.png)
-
-- You should see a new change visible in the GitHub pane (if you don't see any changes, click refresh).
-
-    ![Screenshot showing the added changes in the repository](./img/vscode_dev_add_changes.png)
-
-- Add a commit message and click Commit, for example: "Adding checkout functionality" and push your code.
-
-    ![Screenshot showing the added a commit message](./img/vscode_dev_commit_message.png)
-
-    ![Screenshot showing the added pushing code to remote](./img/vscode_dev_push_changes.png)
-
-- After the code has been pushed, navigate to your GitHub fork of the _jumpstart-agora-apps_, you will see a notification about changes in the _feature-checkout-cart_branch_. Click _Compare & Pull request_.
-
-    ![Screenshot showing new changes message](./img/github_create_pr_dev.png)
-
-- Change the base repository to your fork, create the pull request, merge the pull request and delete the feature branch after the merge.
-
-    ![Screenshot showing changing base branch and submitting the pull request](./img/github_change_remote.png)
-
-    ![Screenshot showing changing base branch and submitting the pull request](./img/github_change_remote_updated.png)
-
-    ![Screenshot showing merging the pull request](./img/github_merge_dev.png)
-
-    ![Screenshot showing deleting the feature](./img/github_delete_branch_dev.png)
-
-- A GitHub action is automatically triggered to build a new Docker image of the PoS application and deploy this new image to the Staging cluster.
-
-    ![Screenshot showing the staging GitHub Action](./img/github_actions_dev.png)
-
-- On the Client VM, open Windows Terminal, switch to the _Staging_ Kubernetes cluster and monitor the _contosopos_ pods. You should see the pods are recreated as the Flux v2 extension picks up the changes you made on the _Dev_ environment and deploys it to the _Staging_ cluster.
-
-  ```azurecli
-  kubectx staging
-  kubectl get pods -n contoso-supermarket
-  ```
-
-    ![Screenshot showing the PoS application pods](./img/repo_staging_pods_gitops.png)
-
-- Open the Microsoft Edge browser, and navigate to the _POS Staging - Customer_ bookmark.
-
-    ![Screenshot showing the staging customer bookmark in edge](./img/edge_staging_customer_portal.png)
-
-- The new checkout feature is now deployed and visible on the _Staging_ environment.
-
-    ![Screenshot showing the new checkout feature in the staging environment](./img/pos_after_checkout_feature.png)
-
-    > __NOTE: In some cases you may need to force a refresh of your browser's cache to see the updated feature. This can be done by pressing Ctrl-F5 to force the cache to clear and reload the page.__
-
-- Once the PoS application is healthy on the _Staging_ cluster, a pull request is created automatically to update the _Canary_ environment with the new PoS application image.
-
-    ![Screenshot showing the canary Pull request](./img/github_canary_pr.png)
-
-- Merge the new pull request to deploy this new checkout feature to the _Canary_ environment (Chicago store) and delete the branch.
-
-    ![Screenshot showing merging canary Pull request](./img/github_canary_pr_merge.png)
-
-    ![Screenshot showing deleting the canary Pull request branch](./img/github_canary_pr_delete_branch.png)
-
-- Once the merge is complete, GitOps configuration will pick up the new changes and deploy the new image to the _Canary_ cluster.
-
-    ![Screenshot showing canary customer view before update](./img/edge_canary_before_update.png)
-
-- On the Client VM, open Windows Terminal, switch to the _Chicago_ Kubernetes cluster and monitor the _contosopos_ pods. You should see the pods are recreated as the Flux v2 extension picks up the changes you made on the _Staging_ environment and deploys it to the _Canary_ cluster.
-
-  ```azurecli
-  kubectx chicago
-  kubectl get pods -n contoso-supermarket
-  ```
-
-    ![Screenshot showing canary customer view before update](./img/repo_canary_pods_gitops.png)
-
-    ![Screenshot showing canary customer view after update](./img/edge_canary_after_update.png)
-
-- Once the PoS application is healthy on the _Canary_ cluster, a pull request is created automatically to update the _Production_ environment with the new PoS application image.
-
-    ![Screenshot showing the production Pull request](./img/github_production_pr.png)
-
-- Merge the new pull request to deploy this new checkout feature to the _Production_ environment (Seattle store) and delete the branch.
-
-    ![Screenshot showing merging production Pull request](./img/github_production_pr_merge.png)
-
-    ![Screenshot showing deleting the production Pull request branch](./img/github_production_pr_delete_branch.png)
-
-- Once the merge is complete, GitOps configuration will pick up the new changes and deploy the new image to the _Production_ cluster.
-
-    ![Screenshot showing production customer view before update](./img/edge_production_before_update.png)
-
-- On the Client VM, open Windows Terminal, switch to the _Seattle_ Kubernetes cluster and monitor the _contosopos_ pods. You should see the pods are recreated as the Flux v2 extension picks up the changes you made on the _Staging_ environment and deploys it to the _Canary_ cluster.
-
-     ```azurecli
-     kubectx seattle
-     kubectl get pods -n contoso-supermarket
-     ```
-
-    ![Screenshot showing production customer view before update](./img/repo_production_pods_gitops.png)
-
-    ![Screenshot showing production customer view after update](./img/edge_production_after_update.png)
-
-## Next steps
-
-It is now time to move on to the next Contoso Supermarket scenario and learn how to experiment with [infrastructure observability for Kubernetes and Arc-enabled Kubernetes](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/k8s_infra_observability/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/cleanup/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/cleanup/_index.md
deleted file mode 100644
index 32ca003e61..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/cleanup/_index.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Cleanup deployment
-
-- To clean up your deployment, simply delete the resource group using Azure CLI or Azure portal.
-
-  ```shell
-  az group delete -n <name of your resource group>
-  ```
-
-  ![Screenshot showing az group delete](./img/az_group_delete.png)
-
-  ![Screenshot showing group delete from Azure portal](./img/portal_delete.png)
-
-- If you used Azure Developer CLI to deploy then ```azd down``` can be used instead.
-
-  ![Screenshot showing azd down](./img/azd_down.png)
-
-  > __NOTE: If you have manually configured Defender for Cloud, please refer to the [dedicated page](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/arc_defender_servers/#cleanup) to clean up Defender for Cloud resources.__
-
-## Next steps
-
-If you still having issues with the deployment, please refer to the [Troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/troubleshooting/) section. Otherwise, if you have additional questions or feedback, please refer to the [FAQ](https://azurearcjumpstart.io/azure_jumpstart_ag/faq/) section.
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/data_pos/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/data_pos/_index.md
deleted file mode 100644
index 397f270bcc..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/data_pos/_index.md
+++ /dev/null
@@ -1,121 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Data pipeline and reporting across cloud and edge for store orders
-
-## Overview
-
-One of Contoso's biggest objectives is how to use the data coming from their stores and visualize it for business intelligence by leveraging the power of the cloud.
-
-In this scenario, Contoso wants to use their data pipeline so customer orders placed in the Point of Sale (PoS) application on the various supermarket stores, flow to [Azure Data Explorer (ADX)](https://learn.microsoft.com/azure/data-explorer/data-explorer-overview) database and generate near real-time reports. By doing so, Contoso management can leverage these reports to adjust their inventory and supply chain based on the product demand from customer orders across multiple filters - stores, day, week, month, and year. This helps optimize Contoso resources, stores supplies, saves significant costs and at the same time improves customer satisfaction and trust.
-
-## Architecture
-
-Below is an architecture diagram that shows how the data flows from the PoS application and into the ADX database to generate near real-time reports of orders received and processed across various supermarket store locations. This architecture includes a local PostgreSQL database running at the edge in the store, [Azure Cosmos DB](https://learn.microsoft.com/azure/cosmos-db/introduction) and ADX cluster in Azure cloud, and a Cloud Sync service that moves orders data from edge location to Cosmos DB in the cloud.
-
-![Screenshot showing the data pipeline architecture diagram](./img/contoso_supermarket_pos_service_architecture.png)
-
-## PoS dashboard reports
-
-Contoso supports dashboard reports for the PoS application analytics and monitoring. These reports are created in ADX to allow users to view dashboards reports. These reports are generated based on live data received from the PoS application into the ADX database using data integration.
-
-## Manually import dashboards
-
-> __NOTE: If you used the [Azure Developer CLI (azd) method](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#deployment-via-azure-developer-cli) to deploy the Contoso Supermarket scenario, you may skip this section as these reports are automatically imported for you during the automated deployment.__
-
-Follow the below steps in order to view the PoS Orders dashboard reports you will need to import these into ADX.
-
-- On the Client VM, open Windows Explorer and navigate to folder _C:\Ag\adx_dashboards_ folder. This folder contains two ADX dashboard report JSON files (_adx-dashboard-iotsensor-payload.json_ and _adx-dashboard-orders-payload.json_) with the ADX name and URI updated when the deployment PowerShell logon script is completed.
-
-  ![Screenshot showing the dashboard report template files location](./img/adx_dashboard_report_files.png)
-
-- Copy these ADX dashboards report JSON files on your local machine in a temporary folder to import into ADX dashboards. Alternatively, you can log in to ADX Dashboards directly on the Client VM.
-
-  > __NOTE: Depending on the account being used to log in to the ADX portal, the Azure AD tenant of that account may have conditional access policies enabled to allow access only from corporate-managed devices (for example managed by Microsoft Intune) and might prevent login to ADX Dashboards from the Client VM as this VM is not managed by your organization.__
-
-- On your local machine open the browser of your choice OR on the Client VM open the Edge browser and log in to [ADX Dashboards](https://dataexplorer.azure.com/). Use the same user account that you deployed Jumpstart Agora in your subscription. Failure to use the same account will prevent access to the ADX Orders database to generate reports.
-
-- Once you are logged in to ADX dashboards, click on Dashboards in the left navigation to import the PoS Orders dashboard report.
-
-  ![Screenshot showing how to navigate to ADX dashboard reports](./img/adx_view_dashboards.png)
-
-- Select _Import dashboard from file_ to select previously copied file from the Client VM to your local machine or the _C:\Ag\adx_dashboards_ folder on the Client VM.
-
-  ![Screenshot showing the import dashboard file](./img/adx_import_dashboard_file.png)
-
-- Choose to import the _adx-dashboard-orders-payload.json_ file.
-
-  ![Screenshot showing the dashboard report JSON file to import](./img/adx_select_dashboard_file.png)
-
-- Confirm the dashboard report name, accept the suggested name (or choose your own), and click Create.
-
-  ![Screenshot showing the dashboard report name confirmation](./img/adx_confirm_dashboard_report_name.png)
-
-- By default, there is no data available in the ADX Orders database to display in the report after deployment. Click Save to save the dashboard report in ADX.
-
-  ![Screenshot showing the empty data in orders dashboard report](./img/adx_orders_report_empty_data.png)
-
-  > __NOTE: Depending on the type of user account being used to access ADX dashboards, you might have issues accessing data in the _Orders_ database in the ADX cluster with an error _User principal 'msauser=xyz@abc.com' is not authorized to read database 'Orders'_. If you experience this access issue, refer to [Jumpstart Agora - Contoso Supermarket scenario troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/troubleshooting#user-principal-is-not-authorized-to-read-database-orders) guide to troubleshoot and address this access issue__.
-
-## Generate sample data using Data Emulator
-
-By default there is no data available in Cosmos DB database after the deployment is complete. There are two ways you can generate Orders data. One method is using PoS application and place orders. Another option is by using Data Emulator tool available on the Agora client VM. Use instructions below to generate sample data using the Data Emulator tool.
-
-- On the Client VM, locate Data Emulator icon on the desktop.
-
-  ![Screenshot showing the Data Emulator on the desktop](./img/locate_data_emulator_desktop.png)
-
-- Double click on the Data Emulator desktop icon to launch executable and generate sample data. Confirm by entering __Yes__ or __Y__ to start generating data, entering No or N will exit the tool. This tool generates data for the last 30 days. Say No or N to prevent regenerating sample data if it is generated earlier.
-
-  > __NOTE: You can still generate additional sample data by running this tool multiple times, but there might be duplicate key errors and fails to generate data in subsequent attempts.__
-
-  ![Screenshot showing the sample data generation confirmation](./img/confirm_sample_data_generation.png)
-
-  ![Screenshot showing the generating sample data](./img/sample_data_generation.png)
-
-- From ADX open PoS Orders report to view simulated orders data. Allow some time to propagate data into the ADX database using an integrated data pipeline.
-
-  ![Screenshot showing the PoS Orders with simulated data](./img/adx_posorders_with_simulated_data.png)
-
-- PoS Orders dashboard report is configured to display data from the _"Last 1 hour"_ by default. To view all the simulated orders data, change report time range to _"Last 30 days"_ as shown in the picture below. Dashboard report will refresh data and display reports for the selected time range.
-
-  ![Screenshot showing the PoS Orders select time range](./img/adx_orders_report_select_timerange.png)
-
-  ![Screenshot showing the PoS Orders with simulated data for selected time range](./img/adx_posorders_with_simulated_data_selected_timerange.png)
-
-### Generate orders from Contoso Supermarket store applications
-
-- On the Agora client VM, open Edge browser. From the favorites bar review bookmarks created for PoS applications for different stores and environments.
-
-  ![Screenshot showing the PoS app bookmarks](./img/pos_app_edge_bookmarks.png)
-
-- From the bookmarks expand POS -> Chicago and select "POS Chicago - Customer".
-
-  ![Screenshot showing the PoS Chicago store selection](./img/pos_app_edge_select_pos_chicago_customer.png)
-
-- Randomly add a few items to the cart.
-
-  ![Screenshot showing the PoS Chicago store products](./img/chicago_pos_app_customer.png)
-
-- Click on Cart, review items, and click Place Order.
-
-  ![Screenshot showing the PoS Chicago store cart to place order](./img/pos_chicago_customer_place_order.png)
-
-- Place additional orders from the same store by repeating the above steps. Try adding random items to each order to simulate orders from different customers of the store.
-
-- In the ADX Portal, under Dashboards, open the PoS Orders report and set the time range for "_Last 30 minutes_", and refresh the report to see data.
-
-  > __NOTE: As the Cloud Sync service performs the sync in the backend, it might take a few minutes for orders to show up in ADX.__
-
-  ![Screenshot showing the PoS Chicago dashboard report](./img/pos_chicago_customer_report.png)
-
-- From Edge browser bookmarks, open the PoS application for other stores and repeat the order processing and see the PoS Orders dashboard for multiple stores and environments.
-
-  ![Screenshot showing the PoS Orders multiple stores dashboard report](./img/pos_orders_multiplestores_report.png)
-
-## Next steps
-
-Now that you have completed the first data pipeline scenario, it's time to continue to the next scenario, [Data pipeline and reporting across cloud and edge for sensor telemetry](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/freezer_monitor/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/deployment/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/deployment/_index.md
deleted file mode 100644
index e562e54194..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/deployment/_index.md
+++ /dev/null
@@ -1,310 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Jumpstart Agora - Contoso Supermarket deployment guide
-
-## Overview
-
-Jumpstart Agora provides a simple deployment process using Azure Bicep and PowerShell that minimizes user interaction. This automation automatically configures the Contoso Supermarket scenario environment, including the infrastructure, the Contoso-Supermarket applications, CI/CD artifacts, and observability components. The diagram below details the high-level architecture that is deployed and configured as part of the automation.
-
-![Architecture diagram](./img/architecture_diagram.png)
-
-Deploying the "Contoso Supermarket" scenario consists of the following steps (once prerequisites are met).
-  
-  1. Deploy infrastructure - The user deploys a Bicep file that creates the infrastructure in an Azure resource group.
-  2. Bicep template deploys multiple Azure resources including the Client virtual machine.
-  3. Client VM uses a custom script extension to run the Bootstrap PowerShell script which initializes the environment.
-  4. Bootstrap script injects the Logon script to the Client VM.
-  5. User logs in to the Agora-VM-Client Azure virtual machine.
-  6. After login the Agora-VM-Client PowerShell scripts automatically run that configure the applications and CI/CD. These scripts will take some time to run.
-
-Once automation is complete, users can immediately start enjoying the Contoso Supermarket experience.
-
-![Deployment flow architecture diagram](./img/deployment_flow.png)
-
-## Prerequisites
-
-- Fork the [_jumpstart-agora-apps_ repo](https://github.com/microsoft/jumpstart-agora-apps) into your own GitHub account. If you do not have a GitHub account, visit [this link](https://github.com/join) to create one.
-
-  - Open the [_jumpstart-Agora-apps_ repo](https://github.com/microsoft/jumpstart-agora-apps) while signed in to your GitHub account and click the "Fork" button in the upper-right corner.
-
-    ![Screenshot showing how to fork the Jumpstart Agora Apps repo](./img/fork_repo1.png)
-  
-  - Use the default settings to create your fork. Ensure your user is selected in the dropdown and then click the "Create Fork" button.
-
-    ![Screenshot showing how to fork the Jumpstart Agora Apps repo](./img/fork_repo2.png)
-
-- Configure a GitHub fine-grained personal access token (PAT) with permission to modify __only__ the Jumpstart Agora Apps repo that you forked.
-
-  > __NOTE: The PAT token only needs to be created once as part of the prerequisites. Your token can be reused on subsequent deployments for as long as the token is valid. Therefore you should only need to complete these steps before your first deployment. If your token expires, simply follow the steps to create another.__
-
-  - In the top right of the GitHub website, click on your user icon and then click "Settings".
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT0.png)
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT1.png)
-
-  - In the left menu navigation click on "Developer settings".
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT2.png)
-
-  - Under "Personal access tokens" select "Fine-grained tokens".
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT3.png)
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT4.png)
-
-  - Give your token a name and select an expiry period.
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT5.png)
-
-  - Under "Repository access" select "Only select repositories" and then choose the _jumpstart-agora-apps_ repo that you forked in the previous steps.
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT6.png)
-
-  - Assign the "Read and write" permissions for your fork of the _jumpstart-agora-apps_ repo. The PAT should have read and write permissions for the following operations: Actions, Administration, Contents, Pull Requests, Secrets, and Workflows.
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT7.png)
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT8.png)
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT9.png)
-
-  - Once the correct permissions are assigned click the "Generate token" button.
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT10.png)
-
-  - Copy the token value to a temporary location such as in Notepad. You will need this value in a later step.
-
-    ![Screenshot showing how to create the GitHub PAT](./img/github_PAT11.png)
-
-    > __NOTE: GitHub fine-grained access tokens are a beta feature of GitHub and may be subject to change in user experience or functionality.__
-    > __NOTE: The token shown in the above screenshot is a placeholder value for example purposes only and not a working token.__
-
-- [Install or update Azure CLI to version 2.49.0 or above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the following command to check your current installed version.
-
-    ```shell
-    az --version
-    ```
-
-- Login to Azure CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy Agora to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- Agora must be deployed to one of the following regions. __Deploying Agora outside of these regions may result in unexpected results or deployment errors.__
-
-  - East US
-  - East US 2
-  - West US 2
-  - North Europe
-  - West Europe
-
-- __Agora requires 40 Ds-series vCPUs__. Ensure you have sufficient vCPU quota available in your Azure subscription and the region where you plan to deploy Agora. You can use the below Az CLI command to check your vCPU utilization.
-
-  ```shell
-  az vm list-usage --location <your location> --output table
-  ```
-
-  ![Screenshot showing az vm list-usage](./img/az_vm_list_usage.png)
-
-- __Agora requires 10 Public IP addresses__. Ensure you have sufficient Public IP addresses available in your Azure subscription and the region where you plan to deploy Agora.
-
-- Create Azure service principal (SP). An Azure service principal assigned with the _Owner_ Role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartAgoraSPN" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartAgora",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install or update Azure PowerShell to version 10.4.0 or above.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    echo "SPN tenant: $($account.Context.Tenant.Id)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "JumpstartAgoraSPN" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    Output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./img/create_spn_powershell.png)
-
-    > __NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct secret.__
-    > __NOTE: The Jumpstart scenarios are designed with as much ease of use in mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well as considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)__
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client). The SSH key is used to configure secure access to the Linux virtual machines that are used to run the Kubernetes clusters.
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-## Deployment: Bicep deployment via Azure CLI
-
-- Upgrade to latest Bicep version
-
-  ```shell
-  az bicep upgrade
-  ```
-
-- Edit the [main.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_ag/bicep/main.parameters.json) template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`deployBastion`_ - Option to deploy using Azure Bastion instead of traditional RDP. Set to true or false.
-  - _`githubUser`_ - The name of the user account on GitHub where you have forked the [_jumpstart-agora-apps_ repo](https://github.com/microsoft/jumpstart-agora-apps)
-  - _`githubPAT`_ - The GitHub PAT token that you created as part of the prerequisites.
-
-  ![Screenshot showing example parameters](./img/parameters_bicep.png)
-
-- Now you will deploy the Bicep file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_ag/bicep) and run the below command:
-
-  ```shell
-  az login
-  az group create --name "<resource-group-name>"  --location "<preferred-location>"
-  az deployment group create -g "<resource-group-name>" -f "main.bicep" -p "main.parameters.json"
-  ```
-
-    > __NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/troubleshooting/).__
-
-## Deployment via Azure Developer CLI
-
-Jumpstart Agora provides a feature that allows users to deploy with the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/overview). Follow these steps to try this feature in your subscription.
-
-- Follow to install guide for the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd?tabs=winget-windows%2Cbrew-mac%2Cscript-linux&pivots=os-linux) for your environment.
-
-  > __NOTE: PowerShell is required for using azd with Jumpstart Agora. If you are running in a Linux environment be sure that you have [PowerShell for Linux](https://learn.microsoft.com/powershell/scripting/install/installing-powershell-on-linux?view=powershell-7.3) installed.__
-
-- Login with azd using ```azd auth login``` which will open a browser for interactive login.
-
-  ![Screenshot showing azd auth login](./img/azd_auth_login.png)
-
-- Run the ```azd init``` command from your cloned repo _*azure_jumpstart_ag*_ folder.
-  
-  ![Screenshot showing azd init](./img/azd_init.png)
-
-- Run the ```azd up``` command to deploy the environment. Azd will prompt you to enter the target subscription, region and all required parameters.
-
-  ![Screenshot showing azd up](./img/azd_up.png)
-
-## Start post-deployment automation
-
-Once your deployment is complete, you can open the Azure portal and see the Agora scenario resources inside your resource group. You will be using the _Agora-Client-VM_ Azure virtual machine to explore various capabilities of Agora. You will need to remotely access _Agora-Client-VM_.
-
-  ![Screenshot showing all deployed resources in the resource group](./img/deployed_resources.png)
-
-   > __NOTE: For enhanced Agora security posture, RDP (3389) and SSH (22) ports are not open by default in Agora deployments. You will need to create a network security group (NSG) rule to allow network access to port 3389, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.__
-
-### Connecting to the Agora Client virtual machine
-
-Various options are available to connect to _Agora-Client-VM_, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _Agora-NSG-Prod_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#connect-using-just-in-time-accessjit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-#### Connecting directly with RDP
-
-By design, Agora does not open port 3389 on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _Agora-NSG-Prod_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing adding a new inbound security rule](./img/nsg_add_rule.png)
-
-- Select My IP address from the dropdown.
-
-  <img src="./img/nsg_add_rdp_rule.png" alt="Screenshot showing adding a new allow RDP inbound security rule" width="400">
-  
-  <br/>
-  
-  ![Screenshot showing all inbound security rule](./img/nsg_rdp_all_rules.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./img/rdp_connect.png)
-
-#### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./img/bastion_connect.png)
-
-  > __NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _Agora-Client-VM_ with Azure Bastion.__
-
-#### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing how to enable JIT](./img/enable_jit.png)
-
-  ![Screenshot showing how to enable JIT](./img/enable_jit2.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./img/connect_jit.png)
-
-### The Logon scripts
-
-- Once you log into the _Agora-Client-VM_, multiple automated scripts will open and start running. These scripts usually take around thirty minutes to finish, and once completed, the script windows will close automatically. At this point, the deployment is complete.
-
-  ![Screenshot showing Agora-Client-VM](./img/automation.png)
-
-- Deployment is complete! Let's begin exploring the features of Contoso Supermarket!
-
-  ![Screenshot showing complete deployment](./img/contoso_supermarket_complete.png)
-
-  ![Screenshot showing Agora resources in Azure portal](./img/rg_complete.png)
-
-## Next steps
-
-Once deployment is complete its time to start experimenting with the various scenarios under the “Contoso Supermarket” experience, starting with the [“Data pipeline and reporting across cloud and edge for store orders”](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/data_pos/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/freezer_monitor/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/freezer_monitor/_index.md
deleted file mode 100644
index ee131d1530..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/freezer_monitor/_index.md
+++ /dev/null
@@ -1,305 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Data pipeline and reporting across cloud and edge for sensor telemetry
-
-## Overview
-
-Contoso Supermarket is obsessed with achieving the highest levels of food safety. To support this obsession Contoso has invested in technology to let it know when any food in a store's freezers is potentially unsafe due to the freezer reaching temperatures that would allow the food to thaw and pathogens to grow.
-
-Contoso has installed temperature and humidity sensors in each freezer in each store to detect both temperature and humidity. The IoT sensors send current measurements via Message Queuing Telemetry Transport (MQTT) to a broker service in each store. The broker service forwards the data to [Azure IoT Hub](https://azure.microsoft.com/products/iot-hub/) and along to [Azure Data Explorer (ADX)](https://azure.microsoft.com/products/data-explorer/) database for aggregation with data from all stores and analysis. In addition, the sensor data is also sent to a dashboard in each store for visualizing sensor history and to enable early warning notifications to the store manager when a safety issue is imminent.
-
-Contoso Supermarket is researching a number of additional health and safety systems that will leverage the same IoT infrastructure. These include:
-
-- Air quality sensors to detect the presence of smoke or other contaminants.
-
-- Water quality sensors to detect the presence of contaminants in the water supply.
-
-- Motion and presence sensors to lights should be turned on for personal safety.
-
-The local collection and visualization of sensor data uses the same infrastructure as the [Infrastructure Observability](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/k8s_infra_observability/) stack, namely Prometheus and Grafana. This provides the store manager with a single pane of glass for monitoring both the infrastructure and the sensors, and minimizes the number of new technologies that the manager needs to learn and that Contoso must support.
-
-[Prometheus](https://prometheus.io/) is a highly efficient open-source monitoring system that collects and stores metrics from various sources in real-time. It provides a flexible query language for analyzing the collected metrics and offers robust alerting capabilities. On the other hand, [Grafana](https://grafana.com/) is a powerful open-source data visualization and analytics platform. It allows users to create interactive and customizable dashboards to visualize the collected metrics in real-time and also offers its own alerting capabilities.
-
-### Architecture
-
-![A diagram showing the applications and technology stack architecture](./img/architecture.png)
-
-The environmental observability architecture for _Dev_, _Staging_, and _Prod_ environments leverage the same Kube Prometheus Stack as Infrastructure Observability, which includes Kubernetes manifests, Grafana dashboards, and Prometheus rules. Added to that are the IoT sensors (simulated in the scenario), [Mosquitto MQTT broker](https://mosquitto.org/), Azure IoT Hub, ADX, and a service that exposes IoT data to be scraped by Prometheus called [MQTT2PROM](https://github.com/hikhvar/mqtt2prometheus).
-
-Mosquitto open-source MQTT broker was chosen due to its popularity, lightweight implementation, and efficiency, making it a good fit for handling the sensors' messaging flow. Azure IoT Hub is a fully managed service that enables reliable and secure bi-directional communications between millions of IoT devices and a solution backend. It also provides a device registry that stores information about the devices and their capabilities.
-
-The _Dev_ and _Staging_ environments are configured with individual Prometheus and Grafana instances, while the _Prod_ environment is configured with a central Grafana instance. This architecture allows for more granular monitoring and troubleshooting in the _Dev_ and _Staging_ environments, while still providing a centralized view of the infrastructure's health and performance in the _Prod_ environment.
-
-## Freezer Monitoring dashboard
-
-Contoso has an ADX dashboard report for Freezer Monitoring analytics and monitoring. The dashboard is generated from live data sent from the IoT devices through the MQTT broker and IoT Hub to the ADX database using data integration.
-
-![Screenshot showing the default freezer dashboard](./img/adx_freezer_dashboard_default.png)
-
-### Manually import dashboard
-
-> __NOTE: If you used the [Azure Developer CLI (azd) method](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#deployment-via-azure-developer-cli) to deploy the Contoso Supermarket scenario, you may skip this section as the dashboard is automatically imported for you during the automated deployment.__
-
-To view the Freezer Monitoring dashboard you will first need to import it into ADX.
-
-- On the Client VM, open Windows Explorer and navigate to the _C:\Ag\adx_dashboards_ folder. This folder contains two ADX dashboard JSON files (_adx-dashboard-iotsensor-payload.json_ and _adx-dashboard-orders-payload.json_) with the ADX name and URI updated when the deployment PowerShell logon script is completed.
-
-  ![Screenshot showing locating the dashboard template files](./img/adx_dashboard_report_files.png)
-
-- Copy these ADX dashboard JSON files on your local machine in a temporary folder to import into ADX dashboards. Alternatively, you can log in to ADX Dashboards directly on the Client VM.
-
-  > __NOTE: Depending on the account being used to log in to the ADX portal, the Azure AD tenant of that account may have conditional access policies enabled to allow access only from corporate-managed devices (for example managed by Microsoft Intune) and might prevent login to ADX Dashboards from the Client VM as this VM is not managed by your organization.__
-
-- On your local machine open the browser of your choice OR on the Client VM open the Edge browser and log in to [ADX Dashboards](https://dataexplorer.azure.com/). Use the same user account that you deployed Jumpstart Agora in your subscription. Failure to use the same account will prevent access to the ADX Orders database to generate dashboards.
-
-- Once you are logged in to ADX dashboards, click on Dashboards in the left navigation to import the Freezer Monitoring dashboard.
-
-  ![Screenshot showing navigating to ADX dashboard](./img/adx_view_dashboards.png)
-
-- Select _Import dashboard from file_ to select previously copied file from the Client VM to your local machine or the _C:\Ag\adx_dashboards_ folder on the Client VM.
-
-  ![Screenshot showing selecting import dashboard file](./img/adx_import_dashboard_file.png)
-
-- Choose to import the _adx-dashboard-iotsensor-payload.json_ file.
-
-  ![Screenshot showing choosing the dashboard JSON file to import](./img/adx_select_dashboard_file.png)
-
-- Confirm the dashboard name, accept the suggested name (or choose your own), and click Create.
-
-  ![Screenshot showing confirming the dashboard name](./img/adx_confirm_dashboard_report_name.png)
-
-- By default, the simulated IoT sensors are sending data to ADX so you will see at least a few minutes of data in the dashboard. Click Save to save the dashboard in ADX.
-
-  ![Screenshot showing the default freezer dashboard](./img/adx_freezer_dashboard_default.png)
-
-  > __NOTE: Depending on the type of user account being used to access ADX dashboards, you might have issues accessing data in the _Orders_ database in the ADX cluster with an error _User principal 'msauser=xyz@abc.com' is not authorized to read database 'Orders'_. If you experience this access issue, refer [Jumpstart Agora - Contoso Supermarket scenario troubleshooting](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/troubleshooting#user-principal-is-not-authorized-to-read-database-orders) guide to troubleshoot and address this access issue__.
-
-## Scenarios
-
-Below are a few scenarios that Contoso Supermarket might encounter, and how they can be addressed using the data collected by the IoT sensors.
-
-### Scenario 1: Identifying the broken freezer
-
-The manager of the Chicago store has reported that food in one of the freezers has not been staying frozen. She moved the food to the second freezer and called for service, but the technician reported that the freezer seems to be operating within parameters. Your job as the data analyst is to determine if the temperature sensor in the freezer has observed the issue and provide the data to the store manager.
-
-#### Confirm the issue in Azure Data Explorer
-
-- Open the __Freezer Monitoring__ dashboard in [ADX](https://dataexplorer.azure.com/dashboards).
-
-  ![Screenshot showing the dashboard with all freezers](./img/adx_freezer_dashboard_default.png)
-
-- The charts are quite busy so let's make it easier to see the problem in Chicago by filtering the dashboard to show only data for the __Chicago__ store.
-
-  ![Screenshot showing filtering for Chicago](./img/adx_freezer_dashboard_select_chicago.png)
-
-- The store manager didn't tell you which freezer was having problems, but if you look at the dashboard below it is obvious that Freezer-2 (aka _device-id:Freezer-2-Chicago:Temperature_F_) is regularly exceeding the safe threshold of 20°F as indicated by the green dashed line. You can send this information to the store manager via a screenshot, or you can show the manager how she can use the Grafana dashboard to see see the same data.
-
-  ![Screenshot showing only Chicago freezers](./img/adx_freezer_dashboard_show_chicago.png)
-
-- While you're viewing the dashboard, take a look at the Seattle store to see if there are any issues that should be reported to that store manager.
-
-#### View the store data in Grafana
-
-From the Client VM:
-
-- Open the Edge browser, expand Grafana in the Favorites Bar, and select __Grafana Prod__.
-
-- Login with the username _admin_ and the Windows Administrator password provided when you created the deployment.
-
-- Click the hamburger menu next to __Home__ then click __Dashboards__.
-
-  ![Screenshot showing the Grafana Dashboards menu](./img/grafana_click_dashboards.png)
-
-- Click __General__ to see the list of dashboards then click __Chicago - Freezer Monitoring__ to open the dashboard for Chicago.
-
-  ![Screenshot showing the list Grafana of Dashboards](./img/grafana_click_chicago.png)
-
-  - Notice that __freezer2__ is showing significant variability and frequently exceeding the safe threshold of 20°F.
-
-    ![Screenshot showing Grafana with the Chicago dashboard](./img/grafana_chicago_dashboard.png)
-
-- The manager can use this dashboard directly when talking to the technician about the freezer.
-
-### Scenario 2: Send alert when freezer is too warm
-
-As the manager of the Chicago store, you can use the Grafana dashboard to see the current temperature. While taking care of other store activities, you want to be notified when the temperature exceeds the safe threshold of 15°F so you can take action immediately.
-
-__NOTE: This won't really send you an email because the server is not configured to send Simple Mail Transfer Protocol (SMTP) messages. However, it will help you understand the potential options available to a store manager.__
-
-- In the Grafana dashboard, click the hamburger menu next to __Home__ then __Alerting__.
-
-  ![Screenshot showing the Grafana Alerting menu](./img/grafana_click_alerting.png)
-
-- Add a Contact point
-
-  - Click __Contact points__ in the navigation menu on the left.
-
-    ![Screenshot showing the Grafana Contact points menu](./img/grafana_click_contact_points.png)
-
-  - Click the __Add contact point__ button.
-
-    ![Screenshot showing the Grafana Add contact point button](./img/grafana_click_add_contact_point.png)
-
-  - Enter _Chicago Store Manager_ as the __Name__ and _chicago@contoso.com_ in the __Addresses__ field then click __Save contact point__
-
-    ![Screenshot showing the Grafana Add contact point form](./img/grafana_add_contact_point.png)
-
-- Add an Alert rule
-
-  - Click __Alert rules__ in the navigation menu.
-
-    ![Screenshot showing tge Grafana Alert rules menu](./img/grafana_click_alert_rules.png)
-
-  - Click __Create alert rule__.
-
-    ![Screenshot showing the Grafana Create alert rule button](./img/grafana_click_create_alert_rule.png)
-
-  - Section 1
-
-    - Enter _Freezer too warm - food at risk_ as the __Rule name__.
-
-      ![Screenshot showing the Grafana Add alert rule form](./img/grafana_add_alert_rule_name.png)
-
-  - Section 2
-
-    - Select __chicago__ as the data source in query __A__.
-
-    - Select __temperature__ as the Metric in query __A__.
-
-    - Enter _15_ as the Threshold in expression __C__.
-
-    - Click __Preview__.
-
-      ![Screenshot showing the Grafana Add alert rule form](./img/grafana_add_alert_rule_config.png)
-
-    - View the preview.
-
-      ![Screenshot showing the Grafana Add alert preview](./img/grafana_add_alert_rule_preview.png)
-
-    - Since it is difficult to determine which series is which, let's fix the series names.
-
-      - Click __Options__.
-
-      - Under __Legend__ select __Custom__ then enter _{{sensor_type}}_.
-
-      - Click away from the 'Legend' box, then back into it for the series names to update.
-
-        ![Screenshot showing the Grafana preview legend options](./img/grafana_add_alert_rule_preview_legend.png)
-
-    - Notice in the chart the times where freezer2 exceeds the threshold and would trigger an alert.
-
-  - Section 3
-
-    - Under __Folder__ type _Alerts_ and press __Enter__.
-
-    - Under __Evaluation group__ type _Alert Group_ and press __Enter__.
-
-      ![Screenshot showing the Grafana Folder selection](./img/grafana_add_alert_rule_folder.png)
-
-  - Scroll to the top of the page and click __Save and exit__.
-
-    ![Screenshot showing the Grafana Save and exit button](./img/grafana_add_alert_rule_save.png)
-
-- View your alert
-
-  - Back on the __Alert rules__ page, type _freezer_ in the __Search__ box and press __Enter__.
-
-  - Expand the __Alerts > Alert Group__ folder to see your __Freezer too warm - food at risk__ alert.
-
-  - Expand the alert to view to __Silence__ it, __Show state history__, or quickly __edit__ or __delete__ the alert.
-
-    ![Screenshot showing the Grafana new alert rule](./img/grafana_new_alert_rule.png)
-
-### Scenario 3: Follow the data from the freezer to the dashboards
-
-In order to troubleshoot problems with the IoT data flow, it is important to understand the components involved. Take a look at how the data flows from a simulated freezer to the dashboards in ADX and Grafana.
-
-#### MQTT Simulator
-
-The first component that generates the data for both dashboards is the MQTT Simulator. The simulator is based on a Python script that runs in each AKS Edge Essentials cluster and the AKS cluster. It generates simulated temperature and humidity data for two freezers in each environment and sends the data via the MQTT protocol to the MQTT Broker.
-
-To see data being produced by the MQTT Simulator, from the Client VM:
-
-- Open __Visual Studio Code__ and click on the __Kubernetes__ icon in the Activity Bar on the left.
-
-  ![Screenshot showing the Visual Studio Code Kubernetes icon](./img/vscode_kubernetes_icon.png)
-
-- Right-click on the __Chicago__ cluster and select __Set as Current Cluster__.
-
-  ![Screenshot showing the Visual Studio Code Set as Current Cluster menu](./img/vscode_set_as_current_cluster.png)
-
-- Expand __Chicago__ > __Namespaces__, right-click on __sensor-monitor__ and select __Use Namespace__.
-
-  ![Screenshot showing the Visual Studio Code Use Namespace menu](./img/vscode_use_namespace.png)
-
-- Expand __Chicago__ > __Workloads__ > __Pods__ then right-click on the 'sensor-monitor-simulator-xxx' pod and select 'Logs'.
-
-  ![Screenshot showing the Visual Studio Code Logs menu](./img/vscode_simulator_logs_menu.png)
-
-- In the Logs view click __Run__ to see the logs.
-
-  ![Screenshot showing the Visual Studio Code Logs window](./img/vscode_simulator_logs_run.png)
-
-- This won't show you the values being produced, but it will show you that data is being published to the MQTT Broker.
-
-  ![Screenshot showing the Visual Studio Code Simulator logs](./img/vscode_simulator_logs.png)
-
-#### MQTT Broker
-
-The MQTT Broker is a container running Mosquitto in each AKS Edge Essentials cluster and the AKS cluster. It receives the data from the simulator and sends it to the Azure IoT Hub. It also makes the data available for a third service, MQTT2Prometheus, and is explained below.
-
-Assuming you have completed the steps to view the MQTT Simulator logs above:
-
-- Expand __Chicago__ > __Workloads__ > __Pods__ then right-click on the 'sensor-monitor-simulator-xxx' pod and select 'Logs'.
-
-  ![Screenshot showing the Visual Studio Code Logs menu](./img/vscode_broker_logs_menu.png)
-
-- In the Logs view click __Run__ to see the logs.
-
-  ![Screenshot showing the Visual Studio Code Logs window](./img/vscode_broker_logs_run.png)
-
-- This won't show you the values being received or forwarded, but it will show you the connections from the two simulated freezer devices to the MQTT broker, as well as the connections from the MQTT broker to Azure IoT Hub for each freezer device. Finally, it shows the connection from __sensor-monitor-mqtt2prom__ which subscribes to the freezer data on the MQTT broker and makes it available to Prometheus and is explained in the sections below.
-
-  ![Screenshot showing the Visual Studio Code Simulator logs](./img/vscode_broker_logs.png)
-
-#### Azure IoT Hub
-
-From the MQTT Broker, the data is sent to Azure IoT Hub, which is a managed service hosted in the cloud that acts as a central message hub for bi-directional communication between your IoT application and the devices it manages. You can use IoT Hub to build IoT solutions with reliable and secure communications between millions of IoT devices and a cloud-hosted solution backend. You can connect virtually any device to the IoT Hub.
-
-To see whether data is being received by Azure IoT Hub for your devices, from your local machine:
-
-- Open Resource Groups in the [Azure Portal](https://ms.portal.azure.com/#browse/resourcegroups).
-
-- Click the new resource group you created for __Jumpstart Agora__.
-
-- Click __Ag-IotHub-xxxxx__ to open the IoT Hub.
-
-  ![Screenshot showing the Azure Portal IoT Hub](./img/azure_portal_iot_hub.png)
-
-- Click __Queries__ in the left navigation menu.
-
-  ![Screenshot showing the Azure Portal IoT Hub Queries](./img/azure_portal_iot_hub_queries.png)
-
-- Click __Run query__.
-
-  ![Screenshot showing the Azure Portal IoT Hub Run query button](./img/azure_portal_iot_hub_queries_run.png)
-
-- Scroll down to where you see __"deviceId": "Freezer-1-Chicago"__.
-
-- Review the __"connectionState"__ and __"lastActivityTime"__ values to see if the device is connected and sending data.
-
-  ![Screenshot showing the Azure Portal IoT Hub Run query results](./img/azure_portal_iot_hub_queries_results.png)
-
-#### Azure Data Explorer (ADX)
-
-ADX is a cloud service that ingests, stores, and analyzes diverse data from any data source. It is a fast, fully managed data analytics service for real-time analysis of large volumes of data streaming (i.e. log and telemetry data) from applications, websites, IoT devices, and more. ADX is a great choice for analyzing data from IoT devices because it can ingest data from a variety of sources, including the IoT Hub, which is how we're getting the data from the MQTT Broker.
-
-To see the ADX dashboard, review the steps from ["Scenario 1: View the data in Azure Data Explorer"](#scenario-1-identifying-the-broken-freezer).
-
-## Next steps
-
-Now that you have seen how the data flows in the various Contoso Supermarket scenarios, you can now explore how to [enable AI at the edge and experiment with software configurations rollout using basic GitOps flow](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/ai/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/k8s_infra_observability/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/k8s_infra_observability/_index.md
deleted file mode 100644
index ccbfc6eed4..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/k8s_infra_observability/_index.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Infrastructure observability for Kubernetes and Arc-enabled Kubernetes
-
-## Overview
-
-Infrastructure observability plays a crucial role in the success of Contoso Supermarket's cloud to edge strategy. By implementing infrastructure observability, Contoso gains comprehensive monitoring and visualization capabilities for their Kubernetes and Arc-enabled Kubernetes environments. This empowers them to proactively monitor the health and performance of their infrastructure, identify potential issues, and make data-driven decisions to optimize their operations. With infrastructure observability, Contoso can ensure that their cloud and edge infrastructure remain reliable, efficient, and resilient, enabling them to deliver exceptional customer experiences.
-
-[Prometheus](https://prometheus.io/) is a highly efficient open-source monitoring system that collects and stores metrics from various sources in real-time. It provides a flexible query language for analyzing the collected metrics and offers robust alerting capabilities. On the other hand, [Grafana](https://grafana.com/) is a powerful open-source data visualization and analytics platform. It allows users to create interactive and customizable dashboards to visualize the collected metrics in real-time.
-
-By leveraging Prometheus and Grafana for infrastructure observability, Contoso enjoys several advantages. Firstly, Prometheus's efficient data collection ensures that Contoso can monitor crucial performance indicators and resource utilization in real-time. Secondly, Grafana provides a user-friendly interface for visualizing the collected metrics, enabling Contoso to create interactive and customizable dashboards. These dashboards allow them to gain valuable insights into their infrastructure's health and performance, identify trends, and make informed decisions. Lastly, the combination of Prometheus and Grafana supports troubleshooting and root cause analysis.
-
-## Architecture
-
-The observability infrastructure stack architecture for Staging, Dev, and Prod environments leverages the [Kube Prometheus Stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack). This stack is a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules that are used to set up and configure monitoring for Kubernetes clusters.
-
-The Dev and Staging environments are configured with individual Prometheus and Grafana instances, while the Prod environment is configured with a central Grafana instance. This architecture allows for more granular monitoring and troubleshooting in the Dev and Staging environments, while still providing a centralized view of the infrastructure's health and performance in the Prod environment.
-
-![Screenshot showing Observability infrastructure stack architecture](./img/technology_stack.png)
-
-## Grafana dashboards
-
-Grafana's dashboards in Contoso's implementation provide a visually appealing and customizable interface for monitoring their infrastructure. With Grafana, they can create intuitive and interactive dashboards that display key metrics and insights, empowering them to make data-driven decisions and quickly identify any issues or trends within their cloud to edge infrastructure. The following Grafana dashboards are automatically deployed as part of advanced automation to the Dev, Staging, and Prod environments:
-
-- __Kubernetes / Views / Global__: The Kubernetes Global Dashboard in Grafana offers a concise overview of your Kubernetes cluster, allowing you to quickly assess its overall health and performance. The dashboard includes panels that highlight key metrics, such as total cluster CPU, RAM, and network utilization, as well as resource usage across namespaces and nodes. Additionally, it tracks the number of resource types used in the cluster and helps detect misconfigured application resources by comparing real usage with requested and limited resources.
-
-- __Node Exporter Full__: The Kubernetes Nodes Dashboard in Grafana provides a detailed view of node-level metrics and resources in your Kubernetes cluster. It enables you to monitor CPU and RAM usage, track pods running on each node, and identify any resource anomalies or performance issues. The dashboard also offers system-level metrics such as system load, context switches, and file descriptors, allowing for troubleshooting and optimization. Additionally, it provides insights into storage capacity, volumes, and I/O operations on the nodes, aiding in the effective management of storage resources.
-
-- __Freezer Monitoring__: The Freezer Monitoring dashboard in Grafana provides the current temperature of the freezers and the temperature history for the last 24 hours. You can also set up alerts to notify you when the temperature exceeds a certain threshold. This allows you to proactively monitor the freezer's health and performance and take corrective actions to prevent any issues. This would be covered in more detail in the ["Data pipeline and reporting across cloud and edge for sensor telemetry" guide.](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/freezer_monitor/)
-
-> __Grafana Dashboard Credits:__
-> The Kubernetes dashboards included in this guide are based on the work of publicly available dashboards. We would like to express our appreciation for Author's efforts in creating this insightful dashboard that enhances our monitoring capabilities for Kubernetes.
-> The original dashboards can be found at:
-> - [Node Exporter Full](https://grafana.com/grafana/dashboards/1860-node-exporter-full)
-> - [Grafana Dashboards Kubernetes](https://github.com/dotdc/grafana-dashboards-kubernetes)
-
-## Access the dashboards
-
-As an Operations team member at Contoso, you will have access to the Grafana dashboards for infrastructure observability. These dashboards provide a comprehensive view of the health, performance, and metrics of the cloud to edge infrastructure. To access the Grafana dashboards follow the below steps.
-
-- Connect to the Client VM _Ag-VM-Client_ using the instructions in the [deployment guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/#connecting-to-the-agora-client-virtual-machine).
-
-### Production stores
-
-- Open the Edge browser, expand Grafana in the Favorites Bar and select `Grafana Prod`.
-
-    ![Screenshot showing accessing Grafana Prod](./img/grafana_prod.png)
-
-- Login using the Windows Admin Username and Password you provided when you created your deployment.
-
-    ![Screenshot showing Login for Grafana Prod](./img/grafana_prod_login.png)
-
-- Click `Chicago - Kubernetes / Views / Global` dashboard to review the overall health of the cluster.
-
-    ![Screenshot showing Grafana Prod dashboards](./img/grafana_prod_dashboard_global.png)
-
-    ![Screenshot showing Grafana Prod Cluster dashboard](./img/grafana_prod_db_global01.png)
-
-- Review the different panels in the dashboard to see the metrics collected from the Kubernetes cluster.
-
-    ![Screenshot showing Grafana Prod Cluster dashboard panels CPU](./img/grafana_prod_db_global02.png)
-
-    ![Screenshot showing Grafana Prod Cluster dashboard panels Network](./img/grafana_prod_db_global03.png)
-
-- Click `Home` to go back to the home page and review the other dashboards available.
-
-    ![Screenshot showing Grafana Prod Home page](./img/grafana_prod_dashboard_home.png)
-
-- Click `Chicago - Node Exporter Full` dashboard to review the Chicago store node metrics.
-
-    ![Screenshot showing Grafana Prod Node Exporter dashboard](./img/grafana_prod_dashboard_node.png)
-
-    ![Screenshot showing Grafana Prod Node Exporter dashboard overview](./img/grafana_prod_db_node01.png)
-
-- Review the different panels in the dashboard to see the metrics collected from the Kubernetes cluster.
-
-    ![Screenshot showing Grafana Prod Node Exporter dashboard panels CPU](./img/grafana_prod_db_node02.png)
-
-    ![Screenshot showing Grafana Prod Node Exporter dashboard panels Memory](./img/grafana_prod_db_node03.png)
-
-    ![Screenshot showing Grafana Prod Node Exporter dashboard panels Storage](./img/grafana_prod_db_node04.png)
-
-- Repeat the same steps to access the `Seattle Store` dashboards and review the cluster and node metrics.
-
-    ![Screenshot showing Grafana Prod Seattle Store Dashboards](./img/grafana_prod_dashboard_seattle.png)
-
-### Staging store
-
-- Open the Edge browser, expand Grafana in the Favorites Bar and select `Grafana Staging`.
-
-    ![Screenshot showing accessing Grafana Staging](./img/grafana_staging.png)
-
-- Login using the Windows Admin Username and Password you provided when you created your deployment. Review the available dashboards.
-
-    ![Screenshot showing Login Grafana Staging](./img/grafana_staging_dashboard_home.png)
-
-- Review `Staging - Kubernetes / Views / Global` dashboard to check the overall health of the cluster.
-
-    ![Screenshot showing Grafana Staging Cluster dashboard](./img/grafana_staging_dashboard_global.png)
-
-- Review `Staging - Node Exporter Full` dashboard to check the Chicago store node metrics.
-
-    ![Screenshot showing Grafana Staging Node Exporter dashboard](./img/grafana_staging_dashboard_node.png)
-
-### Dev store
-
-- Open the Edge browser, expand Grafana in the Favorites Bar and select `Grafana Dev`.
-
-    ![Screenshot showing accessing Grafana Dev](./img/grafana_dev.png)
-
-- Login using the Windows Admin Username and Password you provided when you created your deployment. Review the available dashboards.
-
-    ![Screenshot showing Login Grafana Dev](./img/grafana_dev_dashboard_home.png)
-
-- Review `Dev - Kubernetes / Views / Global` dashboard to check the overall health of the cluster.
-
-    ![Screenshot showing Grafana Dev Cluster dashboard](./img/grafana_dev_dashboard_global.png)
-
-- Review `Dev - Node Exporter Full` dashboard to check the Dev store node metrics.
-
-    ![Screenshot showing Grafana Dev Node Exporter dashboard](./img/grafana_dev_dashboard_node.png)
-
-## Next steps
-
-Continuing with the next Contoso Supermarket scenario, you can now proceed to the next guide to learn about [infrastructure observability for Azure Arc-enabled servers using Azure Monitor](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/arc_monitoring_servers/).
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/troubleshooting/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/troubleshooting/_index.md
deleted file mode 100644
index 701efb5c5c..0000000000
--- a/docs/azure_jumpstart_ag/contoso_supermarket/troubleshooting/_index.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Jumpstart Agora - Contoso Supermarket scenario troubleshooting
-
-## Basic troubleshooting
-
-Occasionally deployments of the Jumpstart Agora Contoso Supermarket scenario may fail at various stages. Common reasons for failed deployments include:
-
-- Invalid Azure service principal id, service principal secret, or service principal Azure tenant ID provided in _azuredeploy.parameters.json_ file.
-
-- Invalid SSH public key provided in _azuredeploy.parameters.json_ file.
-  - An example SSH public key is shown here. Note that the public key includes "ssh-rsa" at the beginning. The entire value should be included in your _main.parameters.json_ file.
-
-    ![Screenshot showing SSH public key example](./img/ssh_example.png)
-
-- User has not forked the [_jumpstart-agora-apps_ GitHub repository](https://github.com/microsoft/jumpstart-agora-apps). To simulate the developer experience, you must first fork the sample apps repo so that you have your own version of the underlying source code to work with. Instructions on how to fork this repo are included in the [deployment guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/).
-
-- Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 40 available vCPU.
-  - You can use the command ```az vm list-usage --location <your location> --output table``` to check your available vCPU quota.
-
-    ![Screenshot showing az vm list-usage](./img/az_vm_list_usage.png)
-
-- Target Azure region does not support all required Azure services - ensure you are running Agora in one of the supported regions listed in the [deployment guide](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/deployment/).
-
-- Not enough Azure Active Directory quota to create additional service principals. You may receive a message stating "The directory object quota limit for the Principal has been exceeded. Please ask your administrator to increase the quota limit or delete objects to reduce the used quota."
-  - If this occurs, you must delete some of your unused service principals and try the deployment again.
-
-    ![Screenshot showing not enough AAD quota for new service principals](./img/aad_quota_exceeded.png)
-
-### Exploring logs from the _Ag-VM-Client_ virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _Ag-VM-Client_ virtual machine in case of deployment failures. To make troubleshooting easier, the Agora deployment scripts collect all relevant logs in the _C:\Ag\Logs_ folder on _Ag-VM-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\Ag\Logs\AgLogonScript.log_ | Output from the primary PowerShell script that drives most of the automation tasks. |
-| _C:\Ag\Logs\ArcConnectivity.log_ | Output from the tasks that onboard servers and Kubernetes clusters to Azure Arc. |
-| _C:\Ag\Logs\AzCLI.log_ | Output from Az CLI login. |
-| _C:\Ag\Logs\AzPowerShell.log_ | Output from the installation of PowerShell modules. |
-| _C:\Ag\Logs\Bookmarks.log_ | Output from the configuration of Microsoft Edge bookmarks. |
-| _C:\Ag\Logs\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _Ag-VM-Client_. |
-| _C:\Ag\Logs\ClusterSecrets.log_ | Output of secret creation on Kubernetes clusters. |
-| _C:\Ag\Logs\GitOps-Ag-*.log_ | Output of scripts that collect GitOps logs on the remote Kubernetes clusters. |
-| _C:\Ag\Logs\IoT.log_ | Output of automation tasks that configure Azure IoT services. |
-| _C:\Ag\Logs\L1AKSInfra.log_ | Output of scripts that configure AKS Edge Essentials clusters on the nested virtual machines. |
-| _C:\Ag\Logs\Nginx.log_ | Output from the script that configures Nginx load balancing on the Kubernetes clusters. |
-| _C:\Ag\Logs\Observability.log_ | Output from the script that configures observability components of the solution. |
-| _C:\Ag\Logs\Tools.log_ | Output from the tasks that set up developer tools on _Ag-VM-Client_. |
-
-  ![Screenshot showing Agora logs folder on AG-Client](./img/logs_folder.png)
-
-### Accessing the Kubernetes resources on the clusters
-
-After deploying Agora, if you try to access the Kubernetes resources on the clusters, you will see the following error message. This is expected as you must have access/permissions to the cluster, the Kubernetes API, and the Kubernetes objects. You must grant yourself the appropriate RBAC permission to view those resources.
-
-  ![Screenshot showing an error message when accessing Kubernetes resources on the AKS cluster](./img/aks_resources_access.png)
-
-- To able to access the Kubernetes resources on the AKS cluster from the Azure portal, follow the guidance mentioned in [this article](https://learn.microsoft.com/azure/aks/kubernetes-portal?tabs=azure-cli#unauthorized-access).
-- To able to access the Kubernetes resources on the AKS Edge Essentials clusters from the Azure Portal, follow the guidance mentioned in [this article](https://learn.microsoft.com/azure/azure-arc/kubernetes/cluster-connect).
-
-### User principal is not authorized to read database Orders
-
-Depending on the type of user account being used to access ADX dashboards, you might have issues accessing data in the _Orders_ database in the ADX cluster. Microsoft Accounts (MSAs) are all of the Microsoft-managed non-organizational user accounts. For example, **_hotmail.com, live.com, outlook.com_**. These MSAs require special syntax to grant database access permissions in the ADX cluster. Refer to [Referencing security principals](https://learn.microsoft.com/azure/data-explorer/kusto/management/referencing-security-principals#microsoft-accounts-msas) to use the correct syntax to grant user permissions to the ADX database.
-
-The screenshot below shows a permissions error when using MSAs.
-
-  ![Screenshot showing the principal not authorized to read database error](./img/adx-principal-not-authorized.png)
-
-Follow the below steps to address this permissions error.
-
-- In the [Azure portal](https://portal.azure.com/), locate the ADX cluster deployed in the resource group and open.
-- Click on _Query_ under Data, select the _Orders_ database, and enter the Kusto query as shown below to grant user access to the _Orders_ database. Replace the user principal with the correct principal to grant permissions.
-
-  ```shell
-  .add database Orders users ('msauser=xyz@hotmail.com') 'XYZ (hotmail.com)'
-  ```
-
-- Click _Run_ to execute the Kusto query to grant permissions.
-
-  ![Screenshot showing how to grant user permissions](./img/adx-database-grant-user-access.png)
-
-- Once user permission is granted go to [ADX dashboards](https://dataexplorer.azure.com/dashboards) and refresh the dashboard report to view _Orders_ data.
diff --git a/docs/azure_jumpstart_ag/faq/_index.md b/docs/azure_jumpstart_ag/faq/_index.md
deleted file mode 100644
index c59ddb1ec8..0000000000
--- a/docs/azure_jumpstart_ag/faq/_index.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-type: docs
-linkTitle: "Agora FAQ"
-weight: 2
----
-
-# Jumpstart Agora Frequently Asked Questions (FAQ)
-
-## What is Jumpstart Agora?
-
-Jumpstart Agora is a marketplace of various “cloud to edge” industry scenarios, designed to provide an end-to-end user experience. The word "Agora" comes from the ancient Greek term for a public gathering place or assembly, and it has come to be used more broadly to refer to any place or forum where people come together for discussion or exchange. Our mission is to create a rich marketplace of applications that can leverage Hybrid Cloud, Internet of Things (IoT), and artificial intelligence (AI) technologies and make those accessible for enablement and educational purposes via the Jumpstart automation mechanisms.
-
-> __NOTE: For general questions about Azure Arc Jumpstart please check the [main Jumpstart FAQ](https://azurearcjumpstart.io/faq/).__
-
-## What industry scenarios are available in Jumpstart Agora?
-
-Currently, Agora offers the [Contoso Supermarket](https://azurearcjumpstart.io/azure_jumpstart_ag/contoso_supermarket/) retail industry experience. Contoso Supermarket includes everything needed to deploy, configure and use a realistic sample point-of-sale application including CI/CD, observability, security, and more.
-
-## What is required to deploy Agora?
-
-Agora deployment requires an Azure service principal with Contributor or Owner role-based access control (RBAC) on an Azure subscription and resource group. You can deploy Agora using Azure Bicep or the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/overview). The service principal is required to run the automation scripts that deploy and configure Agora features. You can view how the service principal is used by exploring the Agora code on our [public GitHub repository](https://github.com/microsoft/azure_arc).
-
-## What Azure regions can Agora be deployed to?
-
-Agora can be deployed to the following regions:
-
-- East US
-- East US 2
-- West US 2
-- North Europe
-- West Europe
-
-## What are the costs of using Agora?
-
-Agora incurs normal Azure consumption charges for various Azure resources such as virtual machines and storage. Each industry scenario in Agora may use a different combination of Azure resources and therefore costs vary depending on the industry scenario used. You can view example estimates of Agora costs by clicking the links below.
-
-- [Agora Contoso Supermarket cost estimate](https://aka.ms/AgoraContosoSupermarketCostEstimate)
-
-## Where can I go if I have trouble deploying or using Agora?
-
-Agora has a [dedicated page for troubleshooting](https://aka.ms/AgoraTroubleshooting) that you can review for common issues.
-
-If you're still stuck, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on our GitHub repository and the Jumpstart team will try to assist you.
diff --git a/docs/azure_jumpstart_arcbox/DataOps/_index.md b/docs/azure_jumpstart_arcbox/DataOps/_index.md
deleted file mode 100644
index cf7e2273f7..0000000000
--- a/docs/azure_jumpstart_arcbox/DataOps/_index.md
+++ /dev/null
@@ -1,902 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart ArcBox for DataOps"
-weight: 4
----
-
-
-## Jumpstart ArcBox for DataOps
-
-ArcBox for DataOps is a special "flavor" of ArcBox that is intended for users who want to experience Azure Arc-enabled SQL Managed Instance capabilities in a sandbox environment.
-
-![ArcBox architecture diagram](./arc_dataops.png)
-
-### Use cases
-
-- Sandbox environment for getting hands-on with Azure Arc technologies and [Azure Arc-enabled SQL Managed Instance landing zone accelerator](https://aka.ms/ArcLZAcceleratorReady)
-- Accelerator for Proof-of-concepts or pilots
-- Training solution for Azure Arc skills development
-- Demo environment for customer presentations or events
-- Rapid integration testing platform
-- Infrastructure-as-code and automation template library for building hybrid cloud management solutions
-
-## Azure Arc capabilities available in ArcBox for DataOps
-
-### Azure Arc-enabled Kubernetes
-
-ArcBox for DataOps deploys three Kubernetes clusters to give you multiple options for exploring Azure Arc-enabled Kubernetes capabilities and potential integrations.
-
-- _**ArcBox-CAPI-Data-xxxx**_ - A single-node Rancher K3s cluster which is then transformed to a [Cluster API](https://cluster-api.sigs.k8s.io/user/concepts.html) management cluster using the Cluster API Provider for Azure (CAPZ), and a workload cluster (_ArcBox-CAPI-Data_) is deployed onto the management cluster. The workload cluster is onboarded as an Azure Arc-enabled Kubernetes resource. ArcBox automatically deploys an Azure Arc Data Controller, an Active Directory connector and an Azure Arc-enabled SQL Managed Instance on top of the connected cluster.
-- _**ArcBox-AKS-Data-xxxx**_ - An AKS cluster that is connected to Azure as an Azure Arc-enabled Kubernetes resource. ArcBox automatically deploys an Azure Arc Data Controller, an Active Directory connector and an Azure Arc-enabled SQL Managed Instance on top of the connected cluster.
-- _**ArcBox-AKS-DR-Data-xxxx**_ - An AKS cluster that is deployed in a separate virtual network, designating a disaster recovery site. This cluster is then connected to Azure as an Azure Arc-enabled Kubernetes resource. ArcBox automatically deploys an Azure Arc Data Controller, an Active Directory connector and an Azure Arc-enabled SQL Managed Instance on top of the connected cluster. This cluster is then configured with _ArcBox-CAPI-Data-xxxx_ to be part of a distributed availability group for disaster recovery.
-
-### Sample applications
-
-ArcBox for DataOps deploys two sample applications on the _ArcBox-CAPI-Data-xxxx_ and the _ArcBox-AKS-DR-Data-xxxx_ clusters.
-
-The sample applications included in ArcBox are:
-
-- **The Bookstore Application** - An MVC web application. ArcBox will deploy **one Kubernetes pod replica** of the _Bookstore_ application in the _arc_ namespace onto the _ArcBox-CAPI-Data-xxxx_ and the _ArcBox-AKS-DR-Data-xxxx_ clusters.
-
-- **DB Connection Application** - An MVC application. ArcBox will deploy **one Kubernetes pod replica** as part of the DB connection app and an Ingress controller to demonstrate the active connections to the different Azure Arc-enabled SQL Managed Instances replicas.
-
-### Azure Monitor integration
-
-ArcBox deploys metrics and logs upload to Azure Monitor for the deployed data services, in addition to the out-of-the-box Grafana and Kibana dashboards that get deployed as part of Arc-enabled Data services.
-
-### Hybrid Unified Operations
-
-ArcBox allows you to experience various Azure Arc-enabled SQL Managed Instance unified operations like Point-in-Time restore, disaster recovery, high availability, monitoring and migration. Once deployed, you will be able to connect to the SQL instances deployed on the three clusters and test different operations with the aid of a bookstore application.
-
-## ArcBox Azure Consumption Costs
-
-ArcBox resources generate Azure consumption charges from the underlying Azure resources including core compute, storage, networking, and auxiliary services. Note that Azure consumption costs vary depending on the region where ArcBox is deployed. Be mindful of your ArcBox deployments and ensure that you disable or delete ArcBox resources when not in use to avoid unwanted charges. Please see the [Jumpstart FAQ](https://aka.ms/Jumpstart-FAQ) for more information on consumption costs.
-
-## Deployment Options and Automation Flow
-
-ArcBox provides multiple paths for deploying and configuring ArcBox resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-- Azure Bicep
-- HashiCorp Terraform
-
-![Deployment flow diagram for ARM-based deployments](./deployment_flow.png)
-
-![Deployment flow diagram for Terraform-based deployments](./deployment_flow_tf.png)
-
-ArcBox uses an advanced automation flow to deploy and configure all necessary resources with minimal user interaction. The previous diagrams provide an overview of the deployment flow. A high-level summary of the deployment is:
-
-- User deploys the primary ARM template (_azuredeploy.json_), Bicep file (_main.bicep_), or Terraform plan (_main.tf_). These objects contain several nested objects that will run simultaneously.
-  - Client virtual machine ARM template/plan - deploys a domain-joined Client Windows VM. This is a Windows Server VM that comes preconfigured with kubeconfig files to work with the three Kubernetes clusters, as well multiple tools such as VSCode, Azure Data Studio and SQL Server Management Studio to make working with ArcBox simple and easy.
-  - Storage account template/plan - used for staging files in automation scripts.
-  - Management artifacts template/plan - deploys Azure Log Analytics workspace, its required Solutions, a domain controller and two virtual networks.
-- User remotes into the Client Windows VM using domain credentials, which automatically kicks off multiple scripts that:
-  - Onboards the AKS clusters to Azure Arc as Arc-enabled Kubernetes clusters.
-  - Deploys a data controller, AD connector and an Azure Arc-enabled SQL Managed Instance on each cluster.
-  - Creates the necessary DNS records for the Azure Arc-enabled SQL Managed Instance's endpoints.
-  - Configures a distributed availability group between the Azure Arc-enabled SQL Managed Instances deployed on the _ArcBox-CAPI-Data-xxxx_ and the _ArcBox-AKS-DR-Data-xxxx_ clusters.
-  - Deploys the _Bookstore_ application on the _ArcBox-CAPI-Data-xxxx_ and the _ArcBox-AKS-DR-Data-xxxx_ clusters.
-  - Deploy an Azure Monitor workbook that provides example reports and metrics for monitoring and visualizing ArcBox's various components.
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.40.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy ArcBox to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- ArcBox must be deployed to one of the following regions. **Deploying ArcBox outside of these regions may result in unexpected behavior or deployment errors.**
-
-  - East US
-  - East US 2
-  - Central US
-  - West US 2
-  - North Europe
-  - West Europe
-  - France Central
-  - UK South
-  - Australia East
-  - Japan East
-  - Korea Central
-  - Southeast Asia
-
-- **ArcBox DataOps requires 42 B-series vCPUs and 56 DSv4 vCPUs** when deploying with default parameters such as VM series/size. Ensure you have sufficient vCPU quota available in your Azure subscription and the region where you plan to deploy ArcBox. You can use the below Az CLI command to check your vCPU utilization.
-
-  ```shell
-  az vm list-usage --location <your location> --output table
-  ```
-
-  ![Screenshot showing az vm list-usage](./az_vm_list_usage.png)
-
-- Some Azure subscriptions may also have SKU restrictions that prevent deployment of specific Azure VM sizes. You can check for SKU restrictions used by ArcBox by using the below command:
-
-  ```shell
-  az vm list-skus --location <your location> --size Standard_D2s --all --output table
-  az vm list-skus --location <your location> --size Standard_D4s --all --output table
-  ```
-
-  In the screenshots below, the first screenshot shows a subscription with no SKU restrictions in West US 2. The second shows a subscription with SKU restrictions on D4s_v4 in the East US 2 region. In this case, ArcBox will not be able to deploy due to the restriction.
-
-  ![Screenshot showing az vm list-skus with no restrictions](./list_skus_unrestricted.png)
-
-  ![Screenshot showing az vm list-skus with restrictions](./list_skus.png)
-  
-- Register necessary Azure resource providers by running the following commands.
-
-    ```shell
-    az provider register --namespace Microsoft.Kubernetes --wait
-    az provider register --namespace Microsoft.KubernetesConfiguration --wait
-    az provider register --namespace Microsoft.ExtendedLocation --wait
-    az provider register --namespace Microsoft.AzureArcData --wait
-    az provider register --namespace Microsoft.OperationsManagement --wait
-    ```
-
-- Create Azure service principal (SP). To deploy ArcBox, an Azure service principal assigned with the _Owner_ role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcBoxSPN" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcBox",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-  
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install or update Azure PowerShell to version 10.4.0 or above.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "JumpstartArcBoxSPN" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    Output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./create_spn_powershell.png)
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.**
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client). The SSH key is used to configure secure access to the Linux virtual machines that are used to run the Kubernetes clusters.
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_jumpstart_arcbox%2FARM%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portal_deploy01.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portal_deploy02.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portal_deploy03.png)
-  
-    > **NOTE: The deployment can take up to 45 minutes. If it keeps running for more than that, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/dataops/#basic-troubleshooting).**
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [azuredeploy.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/ARM/azuredeploy.parameters.json) ARM template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long
-  - _`logAnalyticsWorkspaceName`_ - Name for the ArcBox Log Analytics workspace that will be created
-  - _`flavor`_ - Use the value "DataOps" to specify that you want to deploy the DataOps flavor of ArcBox
-  - _`deployBastion`_ - Set to true if you want to use Azure Bastion to connect to _ArcBox-Client_
-
-  ![Screenshot showing example parameters](./parameters.png)
-
-- Now you will deploy the ARM template. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --template-file azuredeploy.json \
-  --parameters azuredeploy.parameters.json 
-  ```
-
-  ![Screenshot showing az group create](./az_group_create.png)
-
-  ![Screenshot showing az deployment group create](./az_deploy.png)
-  
-  > **NOTE: The deployment can take up to 45 minutes. If it keeps running for more than that, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/dataops/#basic-troubleshooting).**
-
-## Deployment Option 3: Azure Bicep deployment via Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Upgrade to latest Bicep version
-
-  ```shell
-  az bicep upgrade
-  ```
-
-- Edit the [main.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/bicep/main.parameters.json) template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long
-  - _`logAnalyticsWorkspaceName`_ - Name for the ArcBox Log Analytics workspace that will be created
-  - _`flavor`_ - Use the value "DataOps" to specify that you want to deploy the DataOps flavor of ArcBox
-  - _`deployBastion`_ - Set to true if you want to use Azure Bastion to connect to _ArcBox-Client_
-
-  ![Screenshot showing example parameters](./parameters.png)
-
-- Now you will deploy the Bicep file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/bicep) and run the below command:
-
-  ```shell
-  az login
-  az group create --name "<resource-group-name>"  --location "<preferred-location>"
-  az deployment group create -g "<resource-group-name>" -f "main.bicep" -p "main.parameters.json"
-  ```
-  
-  > **NOTE: The deployment can take up to 45 minutes. If it keeps running for more than that, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/dataops/#basic-troubleshooting).**
-
-## Deployment Option 4: HashiCorp Terraform Deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Download and install the latest version of Terraform [here](https://www.terraform.io/downloads.html)
-
-  > **NOTE: Terraform 1.x or higher is supported for this deployment. Tested with Terraform v1.0.9+.**
-
-- Create a `terraform.tfvars` file in the root of the terraform folder and supply some values for your environment.
-
-  ```HCL
-  azure_location      = "westus2"
-  resource_group_name = "ArcBoxDataOps"
-  spn_client_id       = "1414133c-9786-53a4-b231-f87c143ebdb1"
-  spn_client_secret   = "fakeSecretValue123458125712ahjeacjh"
-  spn_tenant_id       = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-  client_admin_ssh    = "C:/Temp/rsa.pub"
-  deployment_flavor   = "DataOps"
-  deploy_bastion      = false
-  ```
-
-- Variable Reference:
-  - **_`azure_location`_** - Azure location code (e.g. 'eastus', 'westus2', etc.)
-  - **_`resource_group_name`_** - Resource group which will contain all of the ArcBox artifacts
-  - **_`spn_client_id`_** - Your Azure service principal id
-  - **_`spn_client_secret`_** - Your Azure service principal secret
-  - **_`spn_tenant_id`_** - Your Azure tenant id
-  - **_`client_admin_ssh`_** - SSH public key path, used for Linux VMs
-  - **_`deployment_flavor`_** - Use the value "DataOps" to specify that you want to deploy the DataOps flavor of ArcBox
-  - _`deployBastion`_ - Set to true if you want to use Azure Bastion to connect to _ArcBox-Client_
-  - _`client_admin_username`_ - Admin username for Windows & Linux VMs
-  - _`client_admin_password`_ - Admin password for Windows VMs. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - **_`workspace_name`_** - Unique name for the ArcBox Log Analytics workspace that will be created
-
-  > **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-- Now you will deploy the Terraform file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/bicep) and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-  
-- Example output from `terraform init`:
-
-  ![terraform init](./terraform_init.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![terraform plan](./terraform_plan.png)
-
-- Example output from `terraform apply "infra.out"`:
-
-  ![terraform plan](./terraform_apply.png)
-  
-  > **NOTE: The deployment can take up to 45 minutes. If it keeps running for more than that, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/dataops/#basic-troubleshooting).**
-
-## Start post-deployment automation
-
-Once your deployment is complete, you can open the Azure portal and see the ArcBox resources inside your resource group. You will be using the _ArcBox-Client_ Azure virtual machine to explore various capabilities of ArcBox such as GitOps configurations and Key Vault integration. You will need to remotely access _ArcBox-Client_.
-
-  ![Screenshot showing all deployed resources in the resource group](./deployed_resources.png)
-
-   > **NOTE: For enhanced ArcBox security posture, RDP (3389) and SSH (22) ports are not open by default in ArcBox deployments. You will need to create a network security group (NSG) rule to allow network access to port 3389, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.**
-
-### Connecting to the ArcBox Client virtual machine
-
-Various options are available to connect to _ArcBox-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _ArcBox-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-#### Connecting directly with RDP
-
-By design, ArcBox does not open port 3389 on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _ArcBox-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing ArcBox-Client NSG with blocked RDP](./rdp_nsg_blocked.png)
-
-  ![Screenshot showing adding a new inbound security rule](./nsg_add_rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  <img src="./nsg_add_rdp_rule.png" alt="Screenshot showing adding a new allow RDP inbound security rule" width="400">
-
-  ![Screenshot showing all inbound security rule](./rdp_nsg_all_rules.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-#### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./bastion_connect.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _ArcBox-Client_ with Azure Bastion.**
-
-#### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./jit_allowing_rdp.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./jit_connect_rdp.png)
-  
-#### Client VM credentials
-
-After configuring access to the Client VM, you have to connect using the UPN format whether you are connecting using RDP or Azure Bastion.
-Example:
-
-- Username: arcdemo@&#65279;jumpstart.local
-
-  ![Screenshot showing connecting to the VM using UPN format](./domain_login.png)
-
-  ![Screenshot showing connecting to the VM using UPN format in Bastion](./domain_login_bastion.png)
-
-> **Warning: Logging into the Client VM without the UPN format _username@&#65279;jumpstart.local_ will prevent the automation from running automatically.**
-
-#### The Logon scripts
-
-- Once you log into the _ArcBox-Client_ VM, multiple automated scripts will open and start running. These scripts usually take up to 60 minutes to finish, and once completed, the script windows will close automatically. At this point, the deployment is complete.
-
-  ![Screenshot showing ArcBox-Client](./automation.png)
-
-- Deployment is complete! Let's begin exploring the features of Azure Arc-enabled Kubernetes with ArcBox for DataOps!
-
-  ![Screenshot showing complete deployment](./arcbox_complete.png)
-
-  ![Screenshot showing ArcBox resources in Azure portal](./rg_arc.png)
-
-## Using ArcBox
-
-After deployment is complete, it's time to start exploring ArcBox. Most interactions with ArcBox will take place either from Azure itself (Azure portal, CLI, or similar) or from inside the _ArcBox-Client_ virtual machine using Azure Data Studio or SQL Server Management Studio. When remoted into the VM, here are some things to try:
-
-### Azure Arc-enabled SQL Managed Instance stress simulation
-
-Included in ArcBox, is a dedicated SQL stress simulation tool named SqlQueryStress automatically installed for you on the Client VM. SqlQueryStress will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-- To start with, open the SqlQueryStress desktop shortcut and connect to the CAPI SQL Managed Instance primary endpoint Ip address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was created for you. Or you can get the primary endpoint from the Azure portal.
-
-  ![Screenshot showing SQL Stress application](./sql_stress_start.png)
-
-  ![Screenshot showing SQL Managed Instance endpoints file](./sqlmi-endpoint_file.png)
-
-  ![Screenshot showing SQL Managed Instance endpoints in the Azure portal](./sqlmi_connection_portal.png)
-
-- To connect, use "Integrated Authentication" and select the deployed sample AdventureWorks database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SQL Managed Instance connection](./sql_stress_connection.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while. Click on Go to start generating load.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SQLstress stored procedure](./sql_stress_sp.png)
-
-  ![Screenshot showing SQLstress running](./sql_stress_running.png)
-
-### Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled SQL Managed Instance, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring.
-
-- Now that you have the SqlQueryStress stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Screenshot showing Grafana desktop shortcut](./grafana_icon.png)
-
-- [Optional] The IP address for this instance represents the Kubernetes LoadBalancer external IP that was provision as part of Azure Arc-enabled data services. Use the _kubectl get svc -n arc_ command to view the metricsui external service IP address.
-
-  ![Screenshot showing Grafana Ip address](./grafana_ip_address.png)
-
-- To log in, use the same username and password that is in the SQLMI Endpoints text file desktop shortcut
-
-  ![Screenshot showing Grafana login page](./grafana_login_page.png)
-
-- Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Screenshot showing Grafana metrics page](./grafana_metrics_dashboard.png)
-
-  ![Screenshot showing Grafana metrics page](./grafana_sql_mi_metrics.png)
-
-- Change the dashboard time range to "Last 5 minutes" and re-run the stress test using SqlQueryStress (in case it was already finished).
-
-  ![Screenshot showing changing time frame to last 5 minutes in grafana dashboard](./grafana_time_range.png)
-
-- You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Screenshot showing changing increased CPU and memory activity in grafana dashboard](./grafana_increased_activity.png)
-
-  ![Screenshot showing changing increased database activity in grafana dashboard](./grafana_database_activity.png)
-
-### Application
-
-ArcBox deploys bookstore application on the _ArcBox-CAPI-Data_ workload cluster.
-
-- Click on the _Bookstore_ icon on the desktop to open _Bookstore_ application.
-
-  ![Screenshot showing bookstore icon](./capi_bookstore01.png)
-
-  ![Screenshot showing bookstore app](./capi_bookstore02.png)
-
-- The App creates a new Database _demo_ and inserts 4 records. Click on the books tab to review the records.
-
-  ![Screenshot showing bookstore app records](./capi_bookstore03.png)
-
-- Open _Azure Data Studio_ and query the _demo_ DB to review the records inserted in the database.
-
-  ![Screenshot showing Azure Data Studio](./capi_bookstore04.png)
-
-  ![Screenshot showing Azure Data Studio records](./capi_bookstore05.png)
-
-  ![Screenshot showing Azure Data Studio records query](./capi_bookstore06.png)
-
-- ArcBox deploys the Bookstore application's service, creates the Ingress and creates a DNS record to resolve to CAPI cluster Ingress IP. Open PowerShell and run below commands to validate.
-
-  ```shell
-  kubectx capi
-  kubectl --namespace arc get ingress
-  nslookup jumpstartbooks.jumpstart.local
-  ```
-
-  ![Screenshot showing bookstore app DNS record](./capi_bookstore07.png)
-
-### High availability
-
-When deploying Azure Arc-enabled SQL Managed Instance in the Business Critical tier, up to three SQL pods replicas will be deployed to assemble an availability group. The availability group includes three Kubernetes replicas with a primary instance and two secondary instances that can be configured to be readable secondaries. This availability groups managed the failover process to achieve high availability.
-
-  ![Screenshot showing SQL Managed Instance pods](./capi_bookstore08.png)
-
-- Right click and run the _DataOpsTestAppScript.ps1_ script placed under _C:\ArcBox\DataOps_. The script will deploy the DB Connection App.
-
-  ![Screenshot showing DB Connection App script](./capi_bookstore09.png)
-
-- DB Connection App connects to the primary SQL Managed Instance and inserts new book every second, and logs information of server it is connected to. Open PowerShell and run the below commands and follow the logs.
-
-  ```shell
-  $pod=kubectl --namespace arc get pods --selector=app=dbconnecttest --output="jsonpath={.items..metadata.name}"
-  kubectl --namespace arc logs $pod -f
-  ```
-  
-  ![Screenshot showing DB Connection App logs 01](./capi_bookstore10.png)
-  
-  ![Screenshot showing DB Connection App logs 02](./capi_bookstore11.png)
-
-- To test failover between the replicas, we will simulate a "crash" that will trigger an HA event and will force one of the secondary replicas to get promoted to a primary replica. Open two side-by-side PowerShell sessions. On the left side session review the deployed pods. The right-side session will be used to follow the DB Connection App logs. Delete the Primary replica by running below commands.
-
-  ```shell
-  kubectl --namespace arc get pods
-  kubectl --namespace arc delete pod capi-sql-0
-  ```
-
-- On the right-side session, you can see some failures once the pod is deleted simulating a primary replica crash. In that time one of the secondary replicas is being promoted to secondary to start receiving requests from the application.
-
-  ![Screenshot showing SQL Managed Instance failover 01](./capi_bookstore12.png)
-
-- It might take a few minutes for the availability group to return to an healthy state. The secondary replica and _capi-sql-1_ was promoted to primary and DB Connection App is able to insert new records in the database.
-
-  ![Screenshot showing SQL Managed Instance failover 02](./capi_bookstore13.png)
-
-- Open _Azure Data Studio_ and query the _demo_ DB to review the records inserted in the database. Also,review the data inserted in App browser.
-
-  ![Screenshot showing bookstore app DB records](./capi_bookstore14.png)
-
-  ![Screenshot showing bookstore app](./capi_bookstore15.png)
-
-### Point-in-time restore
-
-Arc-enabled SQL Managed Instance is deployed as part of ArcBox deployment. By default [automatic backups](https://learn.microsoft.com/azure/azure-arc/data/point-in-time-restore#automatic-backups) of the databases are enabled in Arc-enabled SQL Managed Instances. Full backup is performed when a new database is created or restored and subsequent full backups are performed weekly. Differential backups are taken every 12 hours and transaction log backups every 5 minutes. Default retention period of these backups is 7 days and is [configurable](https://learn.microsoft.com/azure/azure-arc/data/point-in-time-restore#configure-retention-period).
-
-This section provides instructions on how to perform point in time restore from the automatic backups available in Arc-enabled SQL Managed Instance to recover lost or corrupted data.
-
-To view backups of full, differential, and transaction logs wait for more than 12 hours after deploying the ArcBox DataOps flavor. Once these backups are available follow instructions below to perform a point in time restore of database. If you would like to test this feature immediately, you can simply use the latest backup set when restoring.
-
-- Once you login to the ArcBox-Client VM using RDP or bastion host, locate Azure Data Studio icon on the desktop and open.
-
-![Open Azure Data Studio](./sqlmi-pitr-azdatastudio.png)
-
-- Click on _ArcBoxDAG_ to connect to the **capi-sql** Arc-enabled SQL Managed Instance and view databases. Right click and select **Manage** to view databases. Alternatively you can expand _ArcBoxDAG_ connection to view databases.
-
-![View Arc-enabled SQL Managed Instance databases](./sqlmi-pitr-azdatastudio-capisql.png)
-
-![View Arc-enabled SQL Managed Instance databases](./sqlmi-pitr-databases.png)
-
-- In order to restore database you need to find the last well known backup copy that you would like to restore. You can list all the available backups by running the following SQL query in **msdb** database.
-
-```sql
-SELECT TOP (1000) [backup_set_id]
-      ,[database_name]
-      ,[backup_start_date]
-      ,[backup_finish_date]
-      ,[type]
-      ,[backup_size]
-      ,[server_name]
-      ,[machine_name]
-      ,[last_valid_restore_time]
-  FROM [msdb].[dbo].[backupset]
-  WHERE database_name = 'AdventureWorks2019'
-```
-
-- Run this query in Azure Data Studio to display available backups. Right click **msdb**, select New Query and copy paste above query in the query editor and click Run.
-
-![View Arc-enabled SQL Managed Instance databases](./sqlmi-pitr-backuplist.png)
-
-- Identify the backup set that you would like to restore and make note of the **backup_finish_date** value to use in the restore step. Modify the date format as **2022-09-20T23:14:13.000000Z**
-
-- Connect to the Arc Data Controller to restore database using Azure Data Studio. Click on the Connect controller button under Azure Arc Controllers to connecting to an existing data controller.
-
-![Connect to Azure Arc Data Controller](./sqlmi-pitr-connect-datacontroller.png)
-
-- Specify **arc** as the namespace, leave the default values (leave **Name** as empty) and click on Connect
-
-![Connect to Azure Arc Data Controller details](./sqlmi-pitr-connect-datacontroller-details.png)
-
-- Once connection is successful, expand Azure Arc Controllers, expand _arcbox-capi-dc_ to view Arc-enabled SQL Managed Instance
-
-![Azure Arc Data Controller](./sqlmi-pitr-datacontroller.png)
-
-- Right-click on the _capi-sql_ Arc-enabled SQL Managed Instance and select Manage.
-
-![Azure Arc Data Controller Manage SQL Managed Instance](./sqlmi-pitr-connect-datacontroller-manage.png)
-
-- Click on "Connect to Server" and enter database username and password to connect to the SQL Managed Instance to view the databases. It can take about a minute to start populating the databases.
-
-![Azure Arc Data Controller Manage SQL Managed Instance](./sqlmi-pitr-connect-to-sqlmi.png)
-
-- Click on "Backups" to view databases and available backups to restore
-
-![Azure Arc-enabled SQL Managed Instance databases](./sqlmi-pitr-database-list.png)
-
-- Click on the "Restore" link as shown below to restore the _AdventureWorks2019_ database.
-
-![Azure Arc-enabled SQL Managed InstanceI database restore](./sqlmi-pitr-database-select-restore.png)
-
-- Specify target database name to restore and backup set datetime that is noted down in the previous steps and click on Restore.
-
-![Azure Arc-enabled SQL Managed Instance target database restore](./sqlmi-pitr-targetdb.png)
-
-- Wait until database restore operation is complete and refresh the _ArcBoxDAG_ connection to refresh and view restored database.
-
-![Azure Arc-enabled SQL Managed Instance restored database](./sqlmi-pitr-restored-database.png)
-
-### Disaster Recovery
-
-The _ArcBox-CAPI-Data-xxxx_ and the _ArcBox-AKS-DR-Data-xxxx_ clusters are deployed into a distributed availability group to simulate two different sites. Use the _az sql instance-failover-group-arc_ command to initiate a failover from the primary SQL instance to the secondary DR instance.
-
-- Open PowerShell and run below commands to initiate the failover.
-
-  ```shell
-  kubectx capi
-  az sql instance-failover-group-arc update --name primarycr --role secondary --k8s-namespace arc --use-k8s
-  ```
-
-  ![Screenshot showing bookstore app](./aksdr_bookstore01.png)
-
-- Right click and run the _DataOpsAppDRScript.ps1_ script placed under _C:\ArcBox\DataOps_ to deploy the Bookstore application on the DR cluster to simulate application failover.
-
-  ![Screenshot showing bookstore app](./aksdr_bookstore02.png)
-
-- The DR script deploys the Bookstore app service, creates the Ingress and creates a DNS record to resolve to AKS DR cluster Ingress IP. Open PowerShell and run below commands to validate.
-
-  ```shell
-  kubectx aks-dr
-  kubectl --namespace arc get ingress
-  nslookup dataops.jumpstart.local
-  ```
-
-  ![Screenshot showing bookstore app records](./aksdr_bookstore03.png)
-
-- Now that we perform a successful failover, we can re-validate and make sure replication still works as expected.
-
-  ![Screenshot showing bookstore app records](./aksdr_bookstore04.png)
-
-### Additional optional scenarios on the _ArcBox-AKS-Data-xxxx_ cluster
-
-#### Migration to Azure Arc-enabled SQL Managed Instance
-
-As part of ArcBox, a SQL Server is deployed in a nested VM on the Client VM to allow you to test migrating a database to Azure Arc-enabled SQL Managed Instance.
-
-- To connect to the nested SQL Server instance, you can find the connection details in the Azure Data Studio.
-
-  ![Screenshot showing the nested SQL Server in Azure Data Studio](./sql_server_azure_data_studio.png)
-
-  ![Screenshot showing the nested SQL Server connection in Azure Data Studio](./sql_server_azure_data_studio_connection.png)
-
-- You can also connect using Microsoft SQL Server Management Studio (SSMS).
-
-  ![Screenshot showing Microsoft SQL Server Management Studio (SSMS)](./ssms_start.png)
-
-- Connect to the AKS primary SQL Managed Instance's endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut and select the authentication to be _Windows Authentication_.
-
-  ![Screenshot showing connection details of the AKS SQL Managed Instance in the endpoints file](./ssms_aks_endpoints_file.png)
-
-  ![Screenshot showing connection to AKS SQL Managed Instance using Microsoft SQL Server Management Studio (SSMS)](./ssms_aks_connection.png)
-
-- Connect also to the nested SQL server using the details you got from Azure Data Studio. Use the password you entered when provisioning ArcBox.
-
-  ![Screenshot showing opening a new connection on the SQL server using Microsoft SQL Server Management Studio (SSMS)](./ssms_connect.png)
-
-  ![Screenshot showing connection to the nested SQL server using Microsoft SQL Server Management Studio (SSMS)](./ssms_nested_sql.png)
-
-- You can see that _AdventureWorks_ database is only available in the nested SQL Server.
-
-  ![Screenshot showing the databases view for both servers in the Microsoft SQL Server Management Studio (SSMS)](./ssms_db_comparison.png)
-
-- Expand the nested SQL Server instance and navigate to the AdventureWorks database and execute the following query, use the same username and password as the previous step.
-
-  ```sql
-  BACKUP DATABASE AdventureWorksLT2019
-  TO DISK = 'C:\temp\AdventureWorksLT2019.bak'
-  WITH FORMAT, MEDIANAME = 'AdventureWorksLT2019' ;
-  GO
-  ```
-
-  ![Screenshot showing a new in the Microsoft SQL Server Management Studio (SSMS)](./ssms_new_query.png)
-
-  ![Screenshot showing running a backup query in the Microsoft SQL Server Management Studio (SSMS)](./ssms_db_backup_complete.png)
-
-- To migrate the backup created to the Arc-enabled SQL Managed Instance, open a new PowerShell session and use the following PowerShell snippet to:
-  - Copy the created backup to the client VM from the nested SQL Server instance
-  - Copy the backup to the Azure Arc-enabled SQL Managed Instance pod
-Initiate the backup restore process
-
-  ```powershell
-  Set-Location -Path c:\temp
-  #Connecting to the nested Windows Server VM
-  $nestedWindowsUsername = "Administrator"
-  $nestedWindowsPassword = "ArcDemo123!!"
-  $secWindowsPassword = ConvertTo-SecureString $nestedWindowsPassword -AsPlainText -Force
-  $winCreds = New-Object System.Management.Automation.PSCredential ($nestedWindowsUsername, $secWindowsPassword)
-  $session = New-PSSession -VMName Arcbox-SQL -Credential $winCreds
-  #Copying the database backup to the Client VM
-  Copy-Item -FromSession $session -Path C:\temp\AdventureWorksLT2019.bak -Destination C:\Temp\AdventureWorksLT2019.bak
-  #Copying the database to the AKS SQL Managed Instance
-  kubectx aks
-  kubectl cp ./AdventureWorksLT2019.bak aks-sql-0:var/opt/mssql/data/AdventureWorksLT2019.bak -n arc -c arc-sqlmi
-  #Initiating restore on the AKS SQL Managed Instance
-  kubectl exec aks-sql-0 -n arc -c arc-sqlmi -- /opt/mssql-tools/bin/sqlcmd -S localhost -U $Env:AZDATA_USERNAME -P $Env:AZDATA_PASSWORD -Q "RESTORE DATABASE AdventureWorksLT2019 FROM  DISK = N'/var/opt/mssql/data/AdventureWorksLT2019.bak' WITH MOVE 'AdventureWorksLT2012_Data' TO '/var/opt/mssql/data/AdventureWorksLT2012.mdf', MOVE 'AdventureWorksLT2012_Log' TO '/var/opt/mssql/data/AdventureWorksLT2012_log.ldf'"
-  ```
-
-  ![Screenshot showing a PowerShell command to copy and restore the database backup to SQL Managed Instance](./powershell_db_restore.png)
-
-- Navigate to the Azure Arc-enabled SQL Managed Instance in the Microsoft SQL Server Management Studio (SSMS) and you can see that the _AdventureWorks_ database has been restored successfully.
-
-  ![Screenshot showing the restored DB on SQL Managed Instance](./ssms_db_restore_complete.png)
-
-### ArcBox Azure Monitor workbook
-
-Open the [ArcBox Azure Monitor workbook documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/workbook/flavors/DataOps) and explore the visualizations and reports of hybrid cloud resources.
-
-  ![Screenshot showing Azure Monitor workbook usage](./workbook.png)
-
-### Arc-enabled SQL Server - Best practices assessment
-
-As part of the ArcBox deployment, SQL Server best practices assessment is configured and run. Open _ArcBox-SQL_ Arc-enabled SQL Server resource from the resource group deployed or Azure Arc service blade to view SQL Server best practice assessment results.
-
-- The following screenshot shows the SQL Server best practices assessment page and the scheduled and previously ran assessments. If this page does not show assessment results click on the Refresh button to show assessments. Once displayed the assessments and results click on _View assessment_ results to see results.
-
-  ![Screenshot showing SQL Server best practices assessment configuration](./sql-pba-view-results.png)
-
-  ![Screenshot showing SQL Server best practices assessment results part 1](./sql-bpa-results-1.png)
-
-  ![Screenshot showing SQL Server best practices assessment results part 2](./sql-bpa-results-2.png)
-
-### Microsoft Defender for Cloud - SQL servers on machines
-
-This section guides you through different settings for enabling Microsoft Defender for Cloud - SQL servers on machines. Most of these settings are already enabled during the logon script execution when login to _ArcBox-Client_ Azure VM. Even though these are pre-configured there might be delays in showing them in the Azure portal.
-
-- Following are the settings of Microsoft Defender for Cloud - SQL servers on machines configured using automation scripts and can be reviewed in the Azure portal.
-
-  ![Screenshot showing Microsoft Defender for Cloud plans](./microsoft-defender-plans.png)
-
-  ![Screenshot showing Microsoft Defender for Cloud SQL enabled](./defender-sql-plan.png)
-
-- The below screenshots show Arc-enabled SQL Server Defender for Cloud enablement and protection status. Defender for Cloud for SQL Server is enabled at the subscription level, but the protection status is still showing as not enabled.
-
-Please note it may take some time to show this status in the Azure portal, but still able to detect SQL threats generated by the test scripts.
-
-  ![Screenshot showing Microsoft Defender for Cloud - Arc-enabled SQL server status](./sql-defender-status.png)
-
-- The below screenshot shows the SQL threats detected by Microsoft Defender for Cloud.
-
-  ![Screenshot showing Defender for SQL security incidents and alerts](./sql-defender-incidents.png)
-
-   > **NOTE: Once in a while executing Defender for SQL test script (_testDefenderForSQL.ps1_) may fail due to delays in deploying SQLAdvancedThreatProtection Log Analytics solution and may not generate security incidents and alerts. If you do not find these security incidents and alerts, log in to nested SQL server VM _ArcBox-SQL_ in Hyper-V and execute the test script manually as shown below.**
-
-- The below screenshot shows the test script used to generate SQL threats, detect, and alert using Defender for Cloud for SQL servers. This script is copied on the nested _ArcBox-SQL_ Hyper-V virtual machine and can be used to run additional tests to generate security incidents and alerts.
-
-  ![Screenshot showing Defender for SQL test scripts](./sql-defender-testing-script.png)
-
-- Open PowerShell window and change the directory to _C:\ArcBox\agentScript_ folder and run _testDefenderForSQL.ps1_ PowerShell script to generate Defender for SQL incidents and alerts.
-
-  ![Screenshot showing manual execution of the test scripts](./manual-brute-force-test.png)
-
-- The below screenshot shows an email alert sent by Defender for Cloud when a SQL threat is detected. By default, this email is sent to the registered contact email at the subscription level.
-  ![Screenshot showing test script results](./brute-force-attack-alert.png)
-
-### Included tools
-
-The following tools are including on the _ArcBox-Client_ VM.
-
-- kubectl, kubectx, helm
-- Chocolatey
-- Visual Studio Code
-- Microsoft SQL Server Management Studio
-- Azure Data Studio
-- SQL StressTest application
-- Putty
-- 7zip
-- Terraform
-- Git
-- ZoomIt
-
-### Next steps
-
-ArcBox is a sandbox that can be used for a large variety of use cases, such as an environment for testing and training or a kickstarter for proof of concept projects. Ultimately, you are free to do whatever you wish with ArcBox. Some suggested next steps for you to try in your ArcBox are:
-
-- Use the included kubectx to switch contexts between the three Kubernetes clusters
-- Explore the different visualizations in Grafana
-- Scale the SQL Managed Instance's cores and memory up and down
-- Test failover and failback  scenarios to and from the DR instance
-
-## Clean up the deployment
-
-To clean up your deployment, simply delete the resource group using Azure CLI or Azure portal.
-
-```shell
-az group delete -n <name of your resource group>
-```
-
-![Screenshot showing group delete from Azure portal](./portal_delete.png)
-
-## Basic Troubleshooting
-
-Occasionally deployments of ArcBox may fail at various stages. Common reasons for failed deployments include:
-
-- Automation scripts do not start after login - this is usually caused by logging into the client VM with wrong format of the username. Login needs to be done using domain credentials in UPN format _username@jumpstart.local_.
-- "User disabled" error message appears when you try to RDP or connect using Bastion to the Client VM - this is caused by logging into the client VM with wrong format of the username. Login needs to be done using domain credentials in UPN format _username@jumpstart.local_.
-- Invalid service principal id, service principal secret or service principal Azure tenant ID provided in _azuredeploy.parameters.json_ file.
-- Invalid SSH public key provided in _azuredeploy.parameters.json_ file.
-  - An example SSH public key is shown here. Note that the public key includes "ssh-rsa" at the beginning. The entire value should be included in your _azuredeploy.parameters.json_ file.
-
-      ![Screenshot showing SSH public key example](./ssh_example.png)
-
-- Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 98 available. See the [prerequisites](#prerequisites) section for more details.
-- Target Azure region does not support all required Azure services - ensure you are running ArcBox in one of the supported regions listed in the above section "ArcBox Azure Region Compatibility".
-
-### Exploring logs from the _ArcBox-Client_ virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _ArcBox-Client_ and the _ArcBox-CAPI-MGMT_ virtual machines in case of deployment failures. To make troubleshooting easier, the ArcBox deployment scripts collect all relevant logs in the _C:\ArcBox\Logs_ folder on _ArcBox-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\ArcBox\Logs\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _ArcBox-Client_. |
-| _C:\ArcBox\Logs\DataOpsLogonScript.log_ | Output of _DataOpsLogonScript.ps1_ which configures the Hyper-V host and guests and onboards the guests as Azure Arc-enabled servers. |
-| _C:\ArcBox\Logs\installCAPI.log_ | Output from the custom script extension which runs on _ArcBox-CAPI-MGMT_ and configures the Cluster API for Azure cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuCapi.json_ then review this log. |
-| _C:\ArcBox\Logs\MonitorWorkbookLogonScript.log_ | Output from _MonitorWorkbookLogonScript.ps1_ which deploys the Azure Monitor workbook. |
-|_C:\ArcBox\Logs\DeploySQLMIADAuth.log_ | Output from the _DeploySQLMIADAuth.ps1_ script which deploys the AD connector and the Arc-enabled SQL Managed Instances|
-| _C:\ArcBox\Logs\DataOpsAppScript.log_ | Output from the _DataOpsAppScript.ps1_ script which deploys the book store application |
-| _C:\ArcBox\Logs\NestedSqlLogonScript.log_ | Output from the ArcServersLogonScript deployment |
-| _C:\ArcBox\Logs\DataController-capi.log_ | Output from the CAPI cluster's Data Controller deployment |
-| _C:\ArcBox\Logs\DataController-aks.log_ | Output from the AKS cluster's Data Controller deployment |
-| _C:\ArcBox\Logs\DataController-aks-dr.log_ | Output from the AKS DR cluster's Data Controller deployment |
-| _C:\ArcBox\Logs\DataController-sqlmi-capi.log_ | Output from the CAPI cluster's Arc SQL Managed Instance deployment |
-| _C:\ArcBox\Logs\DataController-sqlmi-aks.log_ | Output from the AKS cluster's Arc SQL Managed Instance deployment |
-| _C:\ArcBox\Logs\DataController-sqlmi-aks-dr.log_ | Output from the AKS DR cluster's Arc SQL Managed Instance deployment |
-
-  ![Screenshot showing ArcBox logs folder on ArcBox-Client](./troubleshoot_logs.png)
-
-### Exploring installation logs from the Linux virtual machines
-
-In the case of a failed deployment, pointing to a failure in the _ubuntuCAPIDeployment_ Azure deployment, an easy way to explore the deployment logs is available directly from the associated virtual machine.
-
-- Connect using SSH to the associated virtual machine public IP:
-  - _ubuntuCAPIDeployment_ - _ArcBox-CAPI-MGMT_ virtual machine.
-
-    ![Screenshot showing ArcBox-CAPI-MGMT virtual machine public IP](./arcbox_capi_mgmt_vm_ip.png)
-
-    > **NOTE: Port 22 is not open by default in ArcBox deployments. You will need to [create an NSG rule](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps/#connecting-directly-with-rdp) to allow network access to port 22, or use Azure Bastion or JIT to connect to the VM.**
-
-- As described in the message of the day (motd), depending on which virtual machine you logged into, the installation log can be found in the _jumpstart_logs_ folder. This installation logs can help determine the root cause for the failed deployment.
-  - _ArcBox-CAPI-MGMT_ log path: _jumpstart_logs/installCAPI.log_
-
-      ![Screenshot showing login and the message of the day](./login_motd.png)
-
-- From the screenshot below, looking at _ArcBox-CAPI-MGMT_ virtual machine CAPI installation log using the `cat jumpstart_logs/installCAPI.log` command, we can see the _az login_ command failed due to bad service principal credentials.
-
-  ![Screenshot showing cat command for showing installation log](./cat_command.png)
-
-  ![Screenshot showing az login error](./az_login_error.png)
-
-- You might randomly get a similar error in the _InstallCAPI.log_ to `Error from server (InternalError): error when creating "template.yaml": Internal error occurred: failed calling webhook "default.azuremachinetemplate.infrastructure.cluster.x-k8s.io": failed to call webhook: Post "https://capz-webhook-service.capz-system.svc:443/mutate-infrastructure-cluster-x-k8s-io-v1beta1-azuremachinetemplate?timeout=10s": EOF` - this is an issue we are currently investigating. To resolve please redeploy ArcBox.
-
-If you are still having issues deploying ArcBox, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub and include a detailed description of your issue, the Azure region you are deploying to, the flavor of ArcBox you are trying to deploy. Inside the _C:\ArcBox\Logs_ folder you can also find instructions for uploading your logs to an Azure storage account for review by the Jumpstart team.
diff --git a/docs/azure_jumpstart_arcbox/DevOps/_index.md b/docs/azure_jumpstart_arcbox/DevOps/_index.md
deleted file mode 100644
index 6ff4fcef8e..0000000000
--- a/docs/azure_jumpstart_arcbox/DevOps/_index.md
+++ /dev/null
@@ -1,936 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart ArcBox for DevOps"
-weight: 3
----
-
-## Jumpstart ArcBox for DevOps
-
-ArcBox for DevOps is a special "flavor" of ArcBox that is intended for users who want to experience Azure Arc-enabled Kubernetes capabilities in a sandbox environment.
-
-![ArcBox architecture diagram](./arch_devops.png)
-
-### Use cases
-
-- Sandbox environment for getting hands-on with Azure Arc technologies and [Azure Arc-enabled Kubernetes landing zone accelerator](https://aka.ms/ArcK8sLZSandbox)
-- Accelerator for Proof-of-concepts or pilots
-- Training solution for Azure Arc skills development
-- Demo environment for customer presentations or events
-- Rapid integration testing platform
-- Infrastructure-as-code and automation template library for building hybrid cloud management solutions
-
-## Azure Arc capabilities available in ArcBox for DevOps
-
-### Azure Arc-enabled Kubernetes
-
-ArcBox for DevOps deploys two Kubernetes clusters to give you multiple options for exploring Azure Arc-enabled Kubernetes capabilities and potential integrations.
-
-- _**ArcBox-CAPI-Data**_ - A single-node Rancher K3s cluster which is then transformed to a [Cluster API](https://cluster-api.sigs.k8s.io/user/concepts.html) management cluster using the Cluster API Provider for Azure (CAPZ), and a workload cluster (_ArcBox-CAPI-Data_) is deployed onto the management cluster. The workload cluster is onboarded as an Azure Arc-enabled Kubernetes resource. ArcBox automatically deploys multiple [GitOps configurations](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#gitops-configurations) on this cluster for you, so you have an easy way to get started exploring GitOps capabilities.
-- _**ArcBox-K3s**_ - One single-node Rancher K3s cluster running on an Azure virtual machine. This cluster is then connected to Azure as an Azure Arc-enabled Kubernetes resource. ArcBox provides the user with [PowerShell scripts](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#additional-optional-scenarios-on-the-arcbox-k3s-cluster) that can be manually run to apply GitOps configurations on this cluster.
-
-### Sample applications
-
-ArcBox for DevOps deploys two sample applications on the _ArcBox-CAPI-Data_ cluster. The cluster has multiple [GitOps configurations](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-gitops-flux2) that deploy and configure the sample apps. You can use your own fork of the [sample applications GitHub repo](https://github.com/microsoft/azure-arc-jumpstart-apps) to experiment with GitOps configuration flows.
-
-The sample applications included in ArcBox are:
-
-- [Hello-Arc](https://github.com/microsoft/azure-arc-jumpstart-apps/tree/main/hello-arc) - A simple Node.js web application. ArcBox will deploy **three Kubernetes pod replicas** of the _Hello-Arc_ application in the _hello-arc_ namespace onto the _ArcBox-CAPI-Data_ cluster.
-
-- [Bookstore](https://release-v0-11.docs.openservicemesh.io/docs/getting_started/quickstart/manual_demo/) - A sample microservices Golang (Go) application. ArcBox will deploy the following **five different Kubernetes pods** as part of the Bookstore app.
-
-  - _bookbuyer_ is an HTTP client making requests to bookstore.
-  - _bookstore_ is a server, which responds to HTTP requests. It is also a client making requests to the _bookwarehouse_ service.
-  - _bookwarehouse_ is a server and should respond only to _bookstore_.
-  - _mysql_ is a MySQL database only reachable by _bookwarehouse_.
-  - _bookstore-v2_ - this is the same container as the first bookstore, but for [Open Service Mesh (OSM)](#open-service-mesh-integration) traffic split scenario we will assume that it is a new version of the app we need to upgrade to.
-
-The _bookbuyer_, _bookstore_, and _bookwarehouse_ pods will be in separate Kubernetes namespaces with the same names. _mysql_ will be in the _bookwarehouse_ namespace. _bookstore-v2_ will be in the _bookstore_ namespace.
-
-### Open Service Mesh (OSM) integration
-
-ArcBox deploys OSM by installing the [Open Service Mesh cluster extension](https://aka.ms/arc-osm-doc) on the _ArcBox-CAPI-Data_ cluster. Bookstore application namespaces will be added to OSM control plane. Each new pod in the service mesh will be injected with an Envoy sidecar container.
-
-[OSM](https://openservicemesh.io/) is a lightweight, extensible, cloud-native service mesh that allows users to uniformly manage, secure, and get out-of-the-box observability features for highly dynamic microservice environments.
-
-### GitOps
-
-GitOps on Azure Arc-enabled Kubernetes uses [Flux](https://fluxcd.io/docs/). Flux is deployed by installing the [Flux extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/conceptual-gitops-flux2#flux-cluster-extension) on the Kubernetes cluster. Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (such as Git repositories) and automating updates to the configuration when there is a new code to deploy. Flux provides support for common file sources (Git and Helm repositories, Buckets) and template types (YAML, Helm, and Kustomize).
-
-ArcBox deploys five GitOps configurations onto the _ArcBox-CAPI-Data_ cluster:
-
-- Cluster scope config to deploy [NGINX-ingress controller](https://kubernetes.github.io/ingress-nginx/).
-- Cluster scope config to deploy the "Bookstore" application.
-- Namespace scope config to deploy the "Bookstore" application Role-based access control (RBAC).
-- Namespace scope config to deploy the "Bookstore" application open service mesh traffic split policies.
-- Namespace scope config to deploy the "Hello-Arc" web application.
-
-### Key Vault integration
-
-The Azure Key Vault Provider for Secrets Store CSI Driver allows for the integration of Azure Key Vault as a secrets store with a Kubernetes cluster via a [CSI volume](https://kubernetes-csi.github.io/docs/).
-
-ArcBox deploys Azure Key Vault during the automation scripts that run after logging into _ArcBox-Client_ for the first time. The automation configures the _ArcBox-CAPI-Data_ cluster to Azure Key Vault by deploying the [Azure Key Vault Secrets Provider extension](https://docs.microsoft.com/azure/azure-arc/kubernetes/tutorial-akv-secrets-provider).  
-
-A self-signed certificate is synced from the Key Vault and configured as the secret for the Kubernetes ingress for the Bookstore and Hello-Arc applications.
-
-### Microsoft Defender for Cloud / k8s integration
-
-ArcBox deploys several management and operations services that work with ArcBox's Azure Arc resources. One of these services is Microsoft Defender for Cloud that is deployed by installing the [Defender extension](https://docs.microsoft.com/azure/defender-for-cloud/defender-for-containers-enable?tabs=aks-deploy-portal%2Ck8s-deploy-cli%2Ck8s-verify-cli%2Ck8s-remove-arc%2Caks-removeprofile-api#protect-arc-enabled-kubernetes-clusters) on your Kubernetes cluster in order to start collecting security related logs and telemetry.  
-
-### Hybrid Unified Operations
-
-ArcBox deploys several management and operations services that work with ArcBox's Azure Arc resources. These resources include an an Azure Automation account, an Azure Log Analytics workspace, an Azure Monitor workbook, Azure Policy assignments for deploying Kubernetes cluster monitoring and security extensions on the included clusters, Azure Policy assignment for adding tags to resources, and a storage account used for staging resources needed for the deployment automation.
-
-## ArcBox Azure Consumption Costs
-
-ArcBox resources generate Azure consumption charges from the underlying Azure resources including core compute, storage, networking, and auxiliary services. Note that Azure consumption costs vary depending on the region where ArcBox is deployed. Be mindful of your ArcBox deployments and ensure that you disable or delete ArcBox resources when not in use to avoid unwanted charges. Please see the [Jumpstart FAQ](https://aka.ms/Jumpstart-FAQ) for more information on consumption costs.
-
-## Deployment Options and Automation Flow
-
-ArcBox provides multiple paths for deploying and configuring ArcBox resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-- Azure Bicep
-- HashiCorp Terraform
-
-![Deployment flow diagram for ARM-based deployments](./deployment_flow.png)
-
-![Deployment flow diagram for Terraform-based deployments](./deployment_flow_tf.png)
-
-ArcBox uses an advanced automation flow to deploy and configure all necessary resources with minimal user interaction. The previous diagrams provide an overview of the deployment flow. A high-level summary of the deployment is:
-
-- User deploys the primary ARM template (_azuredeploy.json_), Bicep file (_main.bicep_), or Terraform plan (_main.tf_). These objects contain several nested objects that will run simultaneously.
-  - Client virtual machine ARM template/plan - deploys the Client Windows VM. This is a Windows Server VM that comes preconfigured with kubeconfig files to work with the two Kubernetes clusters, as well multiple tools such as VSCode to make working with ArcBox simple and easy.
-  - Storage account template/plan - used for staging files in automation scripts.
-  - Management artifacts template/plan - deploys Azure Log Analytics workspace, its required Solutions, and Azure Policy artifacts.
-- User remotes into Client Windows VM, which automatically kicks off multiple scripts that:
-  - Deploys OSM Extension on the _ArcBox-CAPI-Data_ cluster, create application namespaces and add namespaces to OSM control plane.
-  - Applies five GitOps configurations on the _ArcBox-CAPI-Data_ cluster to deploy nginx-ingress controller, Hello Arc web application, Bookstore application and Bookstore RBAC/OSM configurations.
-  - Creates certificate with DNS name _arcbox.devops.com_ and imports to Azure Key Vault.
-  - Deploys Azure Key Vault Secrets Provider extension on the _ArcBox-CAPI-Data_ cluster.
-  - Configures Ingress for Hello-Arc and Bookstore application with a self-signed TLS certificate from the Azure Key Vault.  
-  - Deploy an Azure Monitor workbook that provides example reports and metrics for monitoring and visualizing ArcBox's various components.
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.40.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy ArcBox to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- ArcBox must be deployed to one of the following regions. **Deploying ArcBox outside of these regions may result in unexpected behavior or deployment errors.**
-
-  - East US
-  - East US 2
-  - Central US
-  - West US 2
-  - North Europe
-  - West Europe
-  - France Central
-  - UK South
-  - Australia East
-  - Japan East
-  - Korea Central
-  - Southeast Asia
-
-- **ArcBox DevOps requires 30 B-series vCPUs** when deploying with default parameters such as VM series/size. Ensure you have sufficient vCPU quota available in your Azure subscription and the region where you plan to deploy ArcBox. You can use the below Az CLI command to check your vCPU utilization.
-
-  ```shell
-  az vm list-usage --location <your location> --output table
-  ```
-
-  ![Screenshot showing az vm list-usage](./az_vm_list_usage.png)
-
-- Some Azure subscriptions may also have SKU restrictions that prevent deployment of specific Azure VM sizes. You can check for SKU restrictions used by ArcBox by using the below command:
-
-  ```shell
-  az vm list-skus --location <your location> --size Standard_D2s --all --output table
-  az vm list-skus --location <your location> --size Standard_D4s --all --output table
-  ```
-
-  In the screenshots below, the first screenshot shows a subscription with no SKU restrictions in West US 2. The second shows a subscription with SKU restrictions on D4s_v4 in the East US 2 region. In this case, ArcBox will not be able to deploy due to the restriction.
-
-  ![Screenshot showing az vm list-skus with no restrictions](./list_skus_unrestricted.png)
-
-  ![Screenshot showing az vm list-skus with restrictions](./list_skus.png)
-
-- Fork the [sample applications GitHub repo](https://github.com/microsoft/azure-arc-jumpstart-apps) to your own GitHub account. You will use this forked repo to make changes to the sample apps that will be applied using GitOps configurations. The name of your GitHub account is passed as a parameter to the template files so take note of your GitHub user name.
-
-  ![Screenshot showing forking sample apps repo](./apps_fork01.png)
-
-  ![Screenshot showing forking sample apps repo](./apps_fork02.png)
-
-- The name of your GitHub account is passed as the _`githubUser`_ parameter to the template files so take note of your GitHub user name in your forked repo.
-
-  ![Screenshot showing forking sample apps repo](./apps_fork03.png)
-
-- Create Azure service principal (SP). To deploy ArcBox, an Azure service principal assigned with the _Owner_ role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcBoxSPN" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcBox",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-  
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install or update Azure PowerShell to version 10.4.0 or above.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "JumpstartArcBoxSPN" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    Output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./create_spn_powershell.png)
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.**
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client). The SSH key is used to configure secure access to the Linux virtual machines that are used to run the Kubernetes clusters.
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_jumpstart_arcbox%2FARM%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portal_deploy01.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portal_deploy02.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portal_deploy03.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/devops/#basic-troubleshooting).**
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [azuredeploy.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/ARM/azuredeploy.parameters.json) ARM template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Name for the ArcBox Log Analytics workspace
-  - _`flavor`_ - Use the value "DevOps" to specify that you want to deploy the DevOps flavor of ArcBox
-  - _`githubUser`_ - Specify the name of your GitHub account where you cloned the Sample Apps repo
-
-  ![Screenshot showing example parameters](./parameters.png)
-
-- Now you will deploy the ARM template. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --template-file azuredeploy.json \
-  --parameters azuredeploy.parameters.json 
-  ```
-
-  ![Screenshot showing az group create](./az_group_create.png)
-
-  ![Screenshot showing az deployment group create](./az_deploy.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/devops/#basic-troubleshooting).**
-
-## Deployment Option 3: Azure Bicep deployment via Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Upgrade to latest Bicep version
-
-  ```shell
-  az bicep upgrade
-  ```
-
-- Edit the [main.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/bicep/main.parameters.json) template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Name for the ArcBox Log Analytics workspace
-  - _`flavor`_ - Use the value "DevOps" to specify that you want to deploy the Devops flavor of ArcBox
-  - _`deployBastion`_ - Set to true if you want to use Azure Bastion to connect to _ArcBox-Client_
-  - _`githubUser`_ - Specify the name of your GitHub account where you cloned the Sample Apps repo
-
-  ![Screenshot showing example parameters](./parameters.png)
-
-- Now you will deploy the Bicep file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/bicep) and run the below command:
-
-  ```shell
-  az login
-  az group create --name "<resource-group-name>"  --location "<preferred-location>"
-  az deployment group create -g "<resource-group-name>" -f "main.bicep" -p "main.parameters.json"
-  ```
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/devops/#basic-troubleshooting).**
-
-## Deployment Option 4: HashiCorp Terraform Deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Download and install the latest version of Terraform [here](https://www.terraform.io/downloads.html)
-
-  > **NOTE: Terraform 1.x or higher is supported for this deployment. Tested with Terraform v1.0.9+.**
-
-- Create a `terraform.tfvars` file in the root of the terraform folder and supply some values for your environment.
-
-  ```HCL
-  azure_location      = "westus2"
-  resource_group_name = "ArcBoxDevOps"
-  spn_client_id       = "1414133c-9786-53a4-b231-f87c143ebdb1"
-  spn_client_secret   = "fakeSecretValue123458125712ahjeacjh"
-  spn_tenant_id       = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-  client_admin_ssh    = "C:/Temp/rsa.pub"
-  deployment_flavor   = "DevOps"
-  deploy_bastion      = false
-  github_username     = "GitHubUser"
-  ```
-
-- Variable Reference:
-  - **_`azure_location`_** - Azure location code (e.g. 'eastus', 'westus2', etc.)
-  - **_`resource_group_name`_** - Resource group which will contain all of the ArcBox artifacts
-  - **_`spn_client_id`_** - Your Azure service principal id
-  - **_`spn_client_secret`_** - Your Azure service principal secret
-  - **_`spn_tenant_id`_** - Your Azure tenant id
-  - **_`client_admin_ssh`_** - SSH public key path, used for Linux VMs
-  - **_`deployment_flavor`_** - Use the value "DevOps" to specify that you want to deploy the DevOps flavor of ArcBox
-  - _`deployBastion`_ - Set to true if you want to use Azure Bastion to connect to _ArcBox-Client_
-  - _`client_admin_username`_ - Admin username for Windows & Linux VMs
-  - _`client_admin_password`_ - Admin password for Windows VMs. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - **_`workspace_name`_** - Unique name for the ArcBox Log Analytics workspace
-  - _`github_username`_ - Specify the name of your GitHub account where you cloned the Sample Apps repo
-
-  > **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-- Now you will deploy the Terraform file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/bicep) and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-  
-- Example output from `terraform init`:
-
-  ![terraform init](./terraform_init.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![terraform plan](./terraform_plan.png)
-
-- Example output from `terraform apply "infra.out"`:
-
-  ![terraform plan](./terraform_apply.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/devops/#basic-troubleshooting).**
-
-## Start post-deployment automation
-
-Once your deployment is complete, you can open the Azure portal and see the ArcBox resources inside your resource group. You will be using the _ArcBox-Client_ Azure virtual machine to explore various capabilities of ArcBox such as GitOps configurations and Key Vault integration. You will need to remotely access _ArcBox-Client_.
-
-  ![Screenshot showing all deployed resources in the resource group](./deployed_resources.png)
-
-   > **NOTE: For enhanced ArcBox security posture, RDP (3389) and SSH (22) ports are not open by default in ArcBox deployments. You will need to create a network security group (NSG) rule to allow network access to port 3389, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.**
-
-### Connecting to the ArcBox Client virtual machine
-
-Various options are available to connect to _ArcBox-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _ArcBox-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-#### Connecting directly with RDP
-
-By design, ArcBox does not open port 3389 on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _ArcBox-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing ArcBox-Client NSG with blocked RDP](./rdp_nsg_blocked.png)
-
-  ![Screenshot showing adding a new inbound security rule](./nsg_add_rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  <img src="./nsg_add_rdp_rule.png" alt="Screenshot showing adding a new allow RDP inbound security rule" width="400">
-
-  ![Screenshot showing all inbound security rule](./rdp_nsg_all_rules.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-#### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./bastion_connect.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _ArcBox-Client_ with Azure Bastion.**
-
-#### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./jit_allowing_rdp.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./jit_connect_rdp.png)
-
-#### The Logon scripts
-
-- Once you log into the _ArcBox-Client_ VM, multiple automated scripts will open and start running. These scripts usually take 10-20 minutes to finish, and once completed, the script windows will close automatically. At this point, the deployment is complete.
-
-  ![Screenshot showing ArcBox-Client](./automation.png)
-
-- Deployment is complete! Let's begin exploring the features of Azure Arc-enabled Kubernetes with ArcBox for DevOps!
-
-  ![Screenshot showing complete deployment](./arcbox_complete.png)
-
-  ![Screenshot showing ArcBox resources in Azure portal](./rg_arc.png)
-
-## Using ArcBox
-
-After deployment is complete, it's time to start exploring ArcBox. Most interactions with ArcBox will take place either from Azure itself (Azure portal, CLI, or similar) or from inside the _ArcBox-Client_ virtual machine. When remoted into the VM, here are some things to try:
-
-### Key Vault integration
-
- ArcBox uses Azure Key Vault to store the TLS certificate used by the sample Hello-Arc and OSM applications. Here are some things to try to explore this integration with Key Vault further:
-
-- Configure Azure Key Vault to allow your access to certificates.
-
-  - Navigate to the deployed Key Vault in the Azure portal, open the "Access Policies" blade, and click on Create.
-
-    ![Screenshot showing Azure Arc extensions ](./capi_keyvault01.png)
-
-  - Under "Certificate Permissions" check the "Get" and "List" permissions. Click Next.
-
-    ![Screenshot showing Azure Arc extensions ](./capi_keyvault02.png)
-
-  - Search for your user name and select it. Click Next.
-
-    ![Screenshot showing Azure Arc extensions ](./capi_keyvault03.png)
-
-  - You can skip adding the Application. Click Next.
-
-    ![Screenshot showing Azure Arc extensions ](./capi_keyvault04.png)
-
-  - Review the configuration and click Create.
-
-    ![Screenshot showing Azure Arc extensions ](./capi_keyvault05.png)
-
-    ![Screenshot showing Azure Arc extensions ](./capi_keyvault06.png)
-
-- Open the extension tab section of the _ArcBox-CAPI-Data_ cluster resource in the Azure portal. You can now see that Azure Key Vault Secrets Provider, Flux (GitOps), and Open Service Mesh extensions are installed.
-
-  ![Screenshot showing Azure Arc extensions ](./capi_keyvault07.png)
-
-- Click on the _CAPI Hello-Arc_ icon on the desktop to open Hello-Arc application and validate the Ingress certificate _arcbox.devops.com_ used from the Key Vault.
-
-  ![Screenshot showing Hello-Arc desktop Icon](./capi_keyvault08.png)
-
-  ![Screenshot showing Hello-Arc App](./capi_keyvault09.png)
-
-- Validate that Key Vault certificate is being used by comparing the certificate thumbprint reported in the browser with your certificate thumbprint in Key Vault. Click on the lock icon and then select "Connection is secure".
-
-  ![Screenshot showing Hello-Arc certificate](./capi_keyvault10.png)
-
-- Click on the certificate icon to view the thumbprint of the certificate.
-
-  ![Screenshot showing Hello-Arc certificate](./capi_keyvault11.png)
-
-- Browse to the certificate "ingress-cert" in Key Vault to view and compare the thumbprint.
-
-  ![Screenshot showing Hello-Arc certificate](./capi_keyvault12.png)
-
-### GitOps configurations
-
-ArcBox deploys multiple GitOps configurations on the _ArcBox-CAPI-Data_ workload cluster. Click on the GitOps tab of the cluster to explore these configurations:
-
-- You can now see the five GitOps configurations on the _ArcBox-CAPI-Data_ cluster.
-
-  - config-nginx to deploy NGINX-ingress controller.
-  - config-bookstore to deploy the "Bookstore" application.
-  - config-bookstore-rbac to deploy the "Bookstore" application RBAC.
-  - config-bookstore-osm to deploy the "Bookstore" application open service mesh traffic split policy.
-  - config-helloarc to deploy the "Hello Arc" web application.
-
-  ![Screenshot showing Azure Arc GitOps configurations](./capi_gitops01.png)
-
-- We have installed the “Tab Auto Refresh” extension for the browser. This will help you to show the real-time changes on the application in an automated way. Open "CAPI Hello-Arc" application to configure the “Tab Auto Refresh” extension for the browser to refresh every 3 seconds.
-
-  ![Screenshot showing Hello-Arc app](./capi_gitops02.png)
-
-  ![Screenshot showing Tab Auto Refresh ](./capi_gitops03.png)
-
-- To show the GitOps flow for the Hello-Arc application open two side-by-side windows.
-
-  - A browser window with the open Hello-Arc application _`https://arcbox.devops.com/`_ URL.
-  - PowerShell running the command _`kubectl get pods -n hello-arc -w`_ command.
-  
-    The result should look like this:
-
-    ![Screenshot showing Hello-Arc app and shell](./capi_gitops04.png)
-
-- In your fork of the “Azure Arc Jumpstart Apps” GitHub repository, open the _`hello_arc.yaml`_ file (_`/hello-arc/yaml/hello_arc.yaml`_), change the text under the “MESSAGE” section and commit the change.
-  
-    ![Screenshot showing hello-arc repo](./capi_gitops05.png)
-  
-- Upon committing the changes, notice how the Kubernetes pods rolling upgrade will begin. Once the pods are up & running, refresh the browser, the new “Hello Arc” application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-  
-    ![Screenshot showing Hello-Arc app and shell GitOps](./capi_gitops06.png)
-
-### RBAC configurations
-
-ArcBox deploys Kubernetes RBAC configuration on the bookstore application for limiting access to deployed Kubernetes resources. You can explore this configuration by following these steps:
-
-- Show Kubernetes RBAC Role and Role binding applied using GitOps Configuration.
-
-  - Review the [RBAC configuration](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/k8s-rbac-sample/namespace/namespacerole.yaml) applied to the _ArcBox-CAPI-Data_ cluster.  
-  
-  - Show the bookstore namespace Role and Role Binding.
-  
-    ```shell
-    kubectl --namespace bookstore get role
-    kubectl --namespace bookstore get rolebindings.rbac.authorization.k8s.io
-    ```
-
-    ![Screenshot showing bookstore RBAC get Role](./capi_rbac01.png)
-
-  - Validate the RBAC role to get the pods as user "Jane".
-
-    ```shell
-    kubectl --namespace bookstore get pods --as=jane
-    ```
-
-    ![Screenshot showing bookstore RBAC get pods](./capi_rbac02.png)
-
-  - To test the RBAC role assignment, as user "Jane", try to delete the pods. As you can see, the operation fails since Jane is assigned with the role of "pod-reader".
-  
-    The "pod-reader" role only allows _get_, _watch_ and _list_ Kubernetes operations permissions in the _bookstore_ namespace but does not allow for _delete_ operations permissions.
-
-      ```shell
-      $pod=kubectl --namespace bookstore get pods --selector=app=bookstore --output="jsonpath={.items..metadata.name}"
-      kubectl --namespace bookstore delete pods $pod --as=jane
-      ```
-
-      ![Screenshot showing bookstore RBAC delete pods](./capi_rbac03.png)
-
-  - Optionally, you can test the access using [auth can-i](https://kubernetes.io/docs/reference/access-authn-authz/authorization/#checking-api-access) command to validate RBAC access.
-  
-    ```shell
-    kubectl --namespace bookstore auth can-i get pods --as=jane
-    kubectl --namespace bookstore auth can-i delete pods --as=jane
-    ```
-  
-    ![Screenshot showing bookstore RBAC auth can-i pods](./capi_rbac04.png)
-
-### OSM Traffic Split using GitOps
-
-ArcBox uses a GitOps configuration on the OSM bookstore application to split traffic to the bookstore APIs using weighted load balancing. Follow these steps to explore this capability further:
-
-  ![Diagram of OSM bookstore app architecture](./osm_bookstore_architecture.png)
-
-  ![Diagram of OSM bookstore app traffic split](./smi_traffic_split.png)
-
-- Review the [OSM Traffic Split Policy](https://github.com/microsoft/azure-arc-jumpstart-apps/blob/main/bookstore/osm-sample/traffic-split.yaml) applied to the _ArcBox-CAPI-Data_ cluster  
-
-- To show OSM traffic split, open below windows.
-
-  - PowerShell running the below commands to show the bookbuyer pod logs.
-  
-    ```powershell
-    $pod=kubectl --namespace bookbuyer get pods --selector=app=bookbuyer --output="jsonpath={.items..metadata.name}"
-    kubectl --namespace bookbuyer logs $pod bookbuyer -f | Select-String Identity:
-    ```
-
-  - Click on the _CAPI Bookstore_ icon on the desktop to open bookstore applications.
-
-    ![Screenshot showing Bookstore desktop Icon](./capi_osm01.png)
-
-    ![Screenshot showing Bookstore Apps](./capi_osm02.png)
-
-  - Move the browser tabs and PowerShell window, so the end result should look like this:
-  
-    ![Screenshot showing Bookstore Apps and shell 01](./capi_osm03.png)
-
-  - The count for the books sold from the bookstore-v2 browser window should remain at 0. This is because the current traffic split policy is configured as weighted 100 for bookstore as well because the bookbuyer client is sending traffic to the bookstore service and no application is sending requests to the bookstore-v2 service.
-
-    ![Screenshot showing Bookstore apps and shell 02](./capi_osm04.png)
-
-- In your fork of the “Azure Arc Jumpstart Apps” GitHub repository, open the _`traffic-split.yaml`_ file (_`/bookstore/osm-sample/traffic-split.yaml`_), update the bookstore weight to "75" and bookstore-v2 weight to "25" and commit the change.
-
-  ![Screenshot showing Bookstore repo Traffic split 01](./capi_osm05.png)
-
-- Wait for the changes to propagate and observe the counters increment for bookstore and bookstore-v2 as well.
-
-  We have updated the Service Mesh Interface (SMI) Traffic Split policy to direct 75 percent of the traffic sent to the root bookstore service and 25 percent to the bookstore-v2 service by modifying the weight fields for the bookstore-v2 backend. Also, observe the changes on the bookbuyer pod logs in the PowerShell window.
-
-  ![Screenshot showing Bookstore apps and shell GitOps and OSM 01](./capi_osm06.png)
-
-- You can verify the traffic split policy by running the below command and examine the Backends properties.
-
-  ```shell
-  kubectl describe trafficsplit bookstore-split -n bookstore
-  ```
-
-  ![Screenshot showing Bookstore repo Traffic split 02](./capi_osm07.png)
-
-- In your fork of the “Azure Arc Jumpstart Apps” GitHub repository, open the _`traffic-split.yaml`_ file (_`/bookstore/osm-sample/traffic-split.yaml`_), update the bookstore weight to "0" and bookstore weight to "100" and commit the change.
-
-  ![Screenshot showing Bookstore repo Traffic split 02](./capi_osm08.png)
-
-- Wait for the changes to propagate and observe the counters increment for bookstore-v2 and freeze for bookstore. Also, observe pod logs to validate bookbuyer is sending all the traffic to bookstore-v2.
-
-  ![Screenshot showing Bookstore apps and shell GitOps and OSM 02](./capi_osm09.png)
-
-- Optional, you may want to reset the traffic split demo to start over with the counters at zero. If so, follow the below steps to reset the bookstore counters.
-  
-  - Browse to the _ResetBookstore.ps1_ script placed under _C:\ArcBox\GitOps_. The script will:
-    - Connect to _ArcBox-CAPI-Data_ cluster
-    - Deploy a Kubernetes Ingress resource for each bookstore apps reset API
-    - Invoke bookstore apps rest API to reset the counter
-  
-  - Before we run the reset script, did you update the Traffic split on GitHub? In your fork of the “Azure Arc Jumpstart Apps” GitHub repository, open the _`traffic-split.yaml`_ file (_`/bookstore/osm-sample/traffic-split.yaml`_), update the bookstore weight to "100" and bookstore weight to "0" and commit the change.
-
-    ![Screenshot showing Bookstore repo Traffic split rest](./capi_osm10.png)
-
-  - Right click _ResetBookstore.ps1_ script and select Run with PowerShell to execute the script.
-  
-    ![Screenshot showing Script execution reset](./capi_osm11.png)
-
-  - Counters for Bookbuyer, Bookstore-v1, and Bookstore-v2 will reset.
-
-    ![Screenshot showing Bookstore apps and shell GitOps and OSM reset](./capi_osm12.png)
-
-### Microsoft Defender for Cloud
-
-After you have finished the deployment of ArcBox, you can verify that Microsoft Defender for Cloud is working properly and alerting on security threats by running the below command to simulate an alert on the _ArcBox-CAPI-Data_ workload cluster:
-
-  ```bash
-  kubectx arcbox-capi
-  kubectl get pods --namespace=asc-alerttest-662jfi039n
-  ```
-
-After a period of time (typically less than an hour), Microsoft Defender for Cloud will detect this event and trigger a security alert that you will see in the Azure portal under Microsoft Defender for Cloud's security alerts and also on the security tab of your Azure Arc-enabled Kubernetes cluster.
-
-![Screenshot security alert in Microsoft Defender for Cloud](./defender_alert01.png)
-
-![Screenshot security alert in Microsoft Defender for Cloud](./defender_alert02.png)
-
-![Screenshot security alert in Microsoft Defender for Cloud](./defender_alert03.png)
-
-> **NOTE: This feature requires Microsoft Defender for Cloud to be [enabled on your Azure subscription](https://docs.microsoft.com/azure/defender-for-cloud/enable-enhanced-security).**
-
-### Additional optional scenarios on the _ArcBox-K3s_ cluster
-
-Optionally, you can explore additional GitOps and RBAC scenarios in a manual fashion using the _ArcBox-K3s_ cluster. When remoted into the _ArcBox-Client_ virtual machine, here are some things to try:
-
-- Browse to the Azure portal and notice how currently there is no GitOps configuration and Flux extension installed on the _ArcBox-K3s_ cluster.
-  
-  ![Screenshot showing K3s cluster extensions](./k3s_gitops01.png)
-
-  ![Screenshot showing K3s cluster GitOps](./k3s_gitops02.png)
-
-- Deploy multiple GitOps configurations on the _ArcBox-K3s_ cluster.
-
-  - Browse to the _K3sGitOps.ps1_ script placed under _C:\ArcBox\GitOps_. The script will:
-    - Log in to your Azure subscription using your previously created service principal credentials
-    - Connect to _ArcBox-K3s_ cluster
-    - Create the GitOps configurations to install the Flux extension as well deploying the NGINX ingress controller and the “Hello Arc” application
-    - Create a certificate with _arcbox.k3sdevops.com_ DNS name and import to Azure Key Vault
-    - Deploy the Azure Key Vault k8s extension instance
-    - Create Kubernetes _SecretProviderClass_ to fetch the secrets from Azure Key Vault
-    - Deploy a Kubernetes Ingress resource referencing the Secret created by the CSI driver
-    - Create an icon for the Hello-Arc application on the desktop
-  
-  - Optionally, you can open the script with VSCode to review.
-  
-    ![Screenshot showing Script VSCode](./k3s_gitops03.png)
-
-    ![Screenshot showing Script VSCode](./k3s_gitops04.png)
-  
-  - Right click _K3sGitOps.ps1_ script and select Run with PowerShell to execute the script. This will take about 5-10 minutes to run.
-  
-    ![Screenshot showing Script execution](./k3s_gitops05.png)
-
-  - You can verify that Azure Key Vault Secrets Provider and the Flux (GitOps) extensions are now installed under the extension tab section of the _ArcBox-K3s_ cluster resource in the Azure portal.
-
-    ![Screenshot showing K3s cluster extensions](./k3s_gitops06.png)
-
-  - You can verify below GitOps configurations applied on the _ArcBox-K3s_ cluster.
-  
-    - config-nginx to deploy NGINX-ingress controller
-    - config-helloarc to deploy the "Hello Arc" web application
-  
-    ![Screenshot showing Azure Arc GitOps configurations](./k3s_gitops07.png)
-
-  - Click on the _K3s Hello-Arc_ icon on the desktop to open Hello-Arc application and validate the Ingress certificate _arcbox.k3sdevops.com_ used from Key Vault.
-  
-    ![Screenshot showing Hello-Arc App Icon](./k3s_gitops08.png)
-
-    ![Screenshot showing Hello-Arc App](./k3s_gitops09.png)
-  
-  - To show the GitOps flow for the Hello-Arc application open two side-by-side windows.
-
-    - A browser window with the open Hello-Arc application _`https://k3sdevops.devops.com/`_ URL.
-    - PowerShell running the command _`kubectl get pods -n hello-arc -w`_ command.
-  
-        ```shell
-        kubectx arcbox-k3s
-        kubectl get pods -n hello-arc -w
-        ```
-
-      The result should look like this:
-  
-      ![Screenshot showing Hello-Arc app and shell](./k3s_gitops10.png)
-  
-    - In your fork of the “Azure Arc Jumpstart Apps” GitHub repository, open the _`hello_arc.yaml`_ file (_`/hello-arc/yaml/hello_arc.yaml`_). Change the replica to 2 and text under the “MESSAGE” section and commit the change.
-
-      ![Screenshot showing hello-arc repo](./k3s_gitops11.png)
-
-    - Upon committing the changes, notice how the Kubernetes pods rolling upgrade will begin. Once the pods are up and running, refresh the browser, the new “Hello Arc” application version window will show the new message, showing the rolling upgrade is completed and the GitOps flow is successful.
-
-      ![Screenshot showing Hello-Arc app and shell GitOps](./k3s_gitops12.png)
-
-- Deploy Kubernetes RBAC configuration on the Hello-Arc application to limit access to deployed Kubernetes resources.
-
-  - Browse to the _K3sRBAC.ps1_ script placed under _C:\ArcBox\GitOps_. The script will:
-    - Log in to your Azure subscription using your previously created service principal credentials
-    - Connect to _ArcBox-K3s_ cluster
-    - Create the GitOps configurations to deploy the RBAC configurations for _hello-arc_ namespace and cluster scope
-
-  - Right click _K3sGitOps.ps1_ script and select Run with PowerShell to execute the script.
-  
-    ![Screenshot showing Hello-Arc App](./k3s_rbac01.png)
-
-  - You can can verify below GitOps configurations applied on the _ArcBox-K3s_ cluster.
-  
-    - _config-helloarc-rbac_ to deploy the _hello-arc_ namespace RBAC.
-  
-      ![Screenshot showing Azure Arc GitOps RBAC](./k3s_rbac02.png)
-
-  - Show the _hello-arc_ namespace Role and Role Binding.
-  
-    ```shell
-    kubectx arcbox-k3s
-    kubectl --namespace hello-arc get role
-    kubectl --namespace hello-arc get rolebindings.rbac.authorization.k8s.io
-    ```
-
-    ![Screenshot showing hello-arc RBAC get pods](./k3s_rbac03.png)
-
-  - Validate the namespace RBAC role to get the pods as user Jane.
-
-    ```shell
-    kubectl --namespace hello-arc get pods --as=jane
-    ```
-
-    ![Screenshot showing hello-arc RBAC get pods](./k3s_rbac04.png)
-
-  - To test the RBAC role assignment, as user "Jane", try to delete the pods. As you can see, the operation fails since Jane is assigned with the role of "pod-reader".
-
-    The "pod-reader" role only allows _get_, _watch_ and _list_ Kubernetes operations permissions in the _hello-arc_ namespace but does not allow for _delete_ operations permissions.
-
-    ```powershell
-    $pod=kubectl --namespace hello-arc get pods --selector=app=hello-arc --output="jsonpath={.items..metadata.name}"
-    kubectl --namespace hello-arc delete pods $pod --as=jane
-    ```
-
-    ![Screenshot showing hello-arc RBAC delete pods](./k3s_rbac05.png)
-
-  - Show the Cluster Role and Role Binding.
-  
-    ```shell
-    kubectl get clusterrole | Select-String secret-reader
-    kubectl get clusterrolebinding | Select-String read-secrets-global
-    ```
-
-    ![Screenshot showing hello-arc RBAC get pods](./k3s_rbac06.png)
-
-  - Validate the cluster role to get the secrets as user Dave.
-
-    ```shell
-    kubectl get secrets --as=dave
-    ```
-
-    ![Screenshot showing hello-arc RBAC get pods](./k3s_rbac07.png)
-
-  - Test the RBAC role assignment to check if Dave can create the secrets. The operation should fail, as the user Dave is assigned to the role of secret-reader. The secret-reader role only allows get, watch and list permissions.
-
-    ```shell
-    kubectl create secret generic arcbox-secret --from-literal=username=arcdemo --as=dave
-    ```
-
-    ![Screenshot showing hello-arc RBAC delete pods](./k3s_rbac08.png)
-
-### ArcBox Azure Monitor workbook
-
-Open the [ArcBox Azure Monitor workbook documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/workbook/flavors/DevOps) and explore the visualizations and reports of hybrid cloud resources.
-
-  ![Screenshot showing Azure Monitor workbook usage](./workbook.png)
-
-### Included tools
-
-The following tools are including on the _ArcBox-Client_ VM.
-
-- kubectl, kubectx, helm
-- Chocolatey
-- Visual Studio Code
-- Putty
-- 7zip
-- Terraform
-- Git
-- ZoomIt
-
-### Next steps
-  
-ArcBox is a sandbox that can be used for a large variety of use cases, such as an environment for testing and training or a kickstarter for proof of concept projects. Ultimately, you are free to do whatever you wish with ArcBox. Some suggested next steps for you to try in your ArcBox are:
-
-- Use the included kubectx to switch contexts between the two Kubernetes clusters
-- Deploy new GitOps configurations with Azure Arc-enabled Kubernetes
-- Build policy initiatives that apply to your Azure Arc-enabled resources
-- Write and test custom policies that apply to your Azure Arc-enabled resources
-- Incorporate your own tooling and automation into the existing automation framework
-- Build a certificate/secret/key management strategy with your Azure Arc resources
-
-## Clean up the deployment
-
-To clean up your deployment, simply delete the resource group using Azure CLI or Azure portal.
-
-```shell
-az group delete -n <name of your resource group>
-```
-
-![Screenshot showing az group delete](./az_delete.png)
-
-![Screenshot showing group delete from Azure portal](./portal_delete.png)
-
-## Basic Troubleshooting
-
-Occasionally deployments of ArcBox may fail at various stages. Common reasons for failed deployments include:
-
-- Invalid service principal id, service principal secret or service principal Azure tenant ID provided in _azuredeploy.parameters.json_ file.
-- Invalid SSH public key provided in _azuredeploy.parameters.json_ file.
-  - An example SSH public key is shown here. Note that the public key includes "ssh-rsa" at the beginning. The entire value should be included in your _azuredeploy.parameters.json_ file.
-
-      ![Screenshot showing SSH public key example](./ssh_example.png)
-
-- Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 52 available. See the [prerequisites](#prerequisites) section for more details.
-- Target Azure region does not support all required Azure services - ensure you are running ArcBox in one of the supported regions listed in the above section "ArcBox Azure Region Compatibility".
-
-### Exploring logs from the _ArcBox-Client_ virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _ArcBox-Client_, _ArcBox-CAPI-MGMT_ or _ArcBox-K3s_ virtual machines in case of deployment failures. To make troubleshooting easier, the ArcBox deployment scripts collect all relevant logs in the _C:\ArcBox\Logs_ folder on _ArcBox-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\ArcBox\Logs\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _ArcBox-Client_. |
-| _C:\ArcBox\Logs\DevOpsLogonScript.log_ | Output of _DevOpsLogonScript.ps1_ which configures the Hyper-V host and guests and onboards the guests as Azure Arc-enabled servers. |
-| _C:\ArcBox\Logs\installCAPI.log_ | Output from the custom script extension which runs on _ArcBox-CAPI-MGMT_ and configures the Cluster API for Azure cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuCapi.json_ then review this log. |
-| _C:\ArcBox\Logs\installK3s.log_ | Output from the custom script extension which runs on _ArcBox-K3s_ and configures the Rancher cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuRancher.json_ then review this log. |
-| _C:\ArcBox\Logs\MonitorWorkbookLogonScript.log_ | Output from _MonitorWorkbookLogonScript.ps1_ which deploys the Azure Monitor workbook. |
-| _C:\ArcBox\Logs\K3sGitOps.log_ | Output from K3sGitOps.ps1 which deploys GitOps configurations on _ArcBox-K3s_. This script must be manually run by the user. Therefore the log is only present if the user has run the script. |
-| _C:\ArcBox\Logs\K3sRBAC.log_ | Output from K3sRBAC.ps1 which deploys GitOps RBAC configurations on _ArcBox-K3s_. This script must be manually run by the user. Therefore the log is only present if the user has run the script. |
-
-  ![Screenshot showing ArcBox logs folder on ArcBox-Client](./troubleshoot_logs.png)
-
-### Exploring installation logs from the Linux virtual machines
-
-In the case of a failed deployment, pointing to a failure in either the _ubuntuRancherDeployment_ or the _ubuntuCAPIDeployment_ Azure deployments, an easy way to explore the deployment logs is available directly from the associated virtual machines.
-
-- Depending on which deployment failed, connect using SSH to the associated virtual machine public IP:
-  - _ubuntuCAPIDeployment_ - _ArcBox-CAPI-MGMT_ virtual machine.
-  - _ubuntuRancherDeployment_ - _ArcBox-K3s_ virtual machine.
-
-    ![Screenshot showing ArcBox-CAPI-MGMT virtual machine public IP](./arcbox_capi_mgmt_vm_ip.png)
-
-    ![Screenshot showing ArcBox-K3s virtual machine public IP](./arcbox_k3s_vm_ip.png)
-
-    > **NOTE: Port 22 is not open by default in ArcBox deployments. You will need to [create an NSG rule](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps/#connecting-directly-with-rdp) to allow network access to port 22, or use Azure Bastion or JIT to connect to the VM.**
-
-- As described in the message of the day (motd), depending on which virtual machine you logged into, the installation log can be found in the _jumpstart_logs_ folder. This installation logs can help determine the root cause for the failed deployment.
-  - _ArcBox-CAPI-MGMT_ log path: _jumpstart_logs/installCAPI.log_
-  - _ArcBox-K3s_ log path: _jumpstart_logs/installK3s.log_
-
-      ![Screenshot showing login and the message of the day](./login_motd.png)
-
-- From the screenshot below, looking at _ArcBox-CAPI-MGMT_ virtual machine CAPI installation log using the `cat jumpstart_logs/installCAPI.log` command, we can see the _az login_ command failed due to bad service principal credentials.
-
-  ![Screenshot showing cat command for showing installation log](./cat_command.png)
-
-  ![Screenshot showing az login error](./az_login_error.png)
-
-- You might randomly get a similar error in the _InstallCAPI.log_ to `Error from server (InternalError): error when creating "template.yaml": Internal error occurred: failed calling webhook "default.azuremachinetemplate.infrastructure.cluster.x-k8s.io": failed to call webhook: Post "https://capz-webhook-service.capz-system.svc:443/mutate-infrastructure-cluster-x-k8s-io-v1beta1-azuremachinetemplate?timeout=10s": EOF`. This is an issue we are currently investigating. To resolve please redeploy ArcBox.
-
-If you are still having issues deploying ArcBox, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub and include a detailed description of your issue, the Azure region you are deploying to, the flavor of ArcBox you are trying to deploy. Inside the _C:\ArcBox\Logs_ folder you can also find instructions for uploading your logs to an Azure storage account for review by the Jumpstart team.
-
-### Known issues
-
-- Microsoft Defender is not enabled for _ArcBox-CAPI-Data_ connected cluster.
diff --git a/docs/azure_jumpstart_arcbox/Full/_index.md b/docs/azure_jumpstart_arcbox/Full/_index.md
deleted file mode 100644
index 61531b2f7d..0000000000
--- a/docs/azure_jumpstart_arcbox/Full/_index.md
+++ /dev/null
@@ -1,684 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart ArcBox Full"
-weight: 1
----
-
-## Jumpstart ArcBox "Full" Edition - Overview
-
-ArcBox is a solution that provides an easy to deploy sandbox for all things Azure Arc. ArcBox is designed to be completely self-contained within a single Azure subscription and resource group, which will make it easy for a user to get hands-on with all available Azure Arc technology with nothing more than an available Azure subscription.
-
-![ArcBox architecture diagram](./arch_full.png)
-
-### Use cases
-
-- Sandbox environment for getting hands-on with Azure Arc technologies
-- Accelerator for Proof-of-concepts or pilots
-- Training tool for Azure Arc skills development
-- Demo environment for customer presentations or events
-- Rapid integration testing platform
-- Infrastructure-as-code and automation template library for building hybrid cloud management solutions
-
-## Azure Arc capabilities available in ArcBox
-
-### Azure Arc-enabled servers
-
-![ArcBox servers diagram](./servers.png)
-
-ArcBox includes five Azure Arc-enabled server resources that are hosted using nested virtualization in Azure. As part of the deployment, a Hyper-V host (_ArcBox-Client_) is deployed with five guest virtual machines. These machines, _ArcBox-Win2k22_, _ArcBox-Win2k19_, _ArcBox-SQL_, _ArcBox-Ubuntu-01_, and _ArcBox-Ubuntu-02_ are connected as Azure Arc-enabled servers via the ArcBox automation.
-
-### Azure Arc-enabled Kubernetes
-
-<img src="./k8s.png" width="250" alt="K8s diagram">
-
-ArcBox deploys one single-node Rancher K3s cluster running on an Azure virtual machine. This cluster is then connected to Azure as an Azure Arc-enabled Kubernetes resource (_ArcBox-K3s_).
-
-### Azure Arc-enabled data services
-
-ArcBox deploys one single-node Rancher K3s cluster (_ArcBox-CAPI-MGMT_), which is then transformed to a [Cluster API](https://cluster-api.sigs.k8s.io/user/concepts.html) management cluster using the Cluster API Provider Azure(CAPZ), and a workload cluster is deployed onto the management cluster. The Azure Arc-enabled data services and data controller are deployed onto this workload cluster via a PowerShell script that runs when first logging into _ArcBox-Client_ virtual machine.
-
-<img src="./dataservices2.png" width="400" alt="Data services diagram">
-
-### Hybrid Unified Operations
-
-ArcBox deploys several management and operations services that work with ArcBox's Azure Arc resources. These resources include an Azure Log Analytics workspace, an Azure Monitor workbook, Azure Policy assignments for deploying Azure Monitor agents on Windows and Linux Azure Arc-enabled servers, Azure Policy assignment for adding tags to resources, and a storage account used for staging resources needed for the deployment automation.
-
-![ArcBox unified operations diagram](./unifiedops.png)
-
-## ArcBox Azure Consumption Costs
-
-ArcBox resources generate Azure Consumption charges from the underlying Azure resources including core compute, storage, networking and auxiliary services. Note that Azure consumption costs vary depending the region where ArcBox is deployed. Be mindful of your ArcBox deployments and ensure that you disable or delete ArcBox resources when not in use to avoid unwanted charges. Please see the [Jumpstart FAQ](https://aka.ms/Jumpstart-FAQ) for more information on consumption costs.
-
-## Deployment Options and Automation Flow
-
-ArcBox provides multiple paths for deploying and configuring ArcBox resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-- Bicep
-- Terraform
-
-![Deployment flow diagram for ARM-based deployments](./deploymentflow.png)
-
-![Deployment flow diagram for Terraform-based deployments](./deploymentflow_tf.png)
-
-ArcBox uses an advanced automation flow to deploy and configure all necessary resources with minimal user interaction. The previous diagrams provide an overview of the deployment flow. A high-level summary of the deployment is:
-
-- User deploys the primary ARM template (_azuredeploy.json_), Bicep file (_main.bicep_), or Terraform plan (_main.tf_). These objects contain several nested objects that will run simultaneously.
-  - ClientVM ARM template/plan - deploys the Client Windows VM. This is the Hyper-V host VM where all user interactions with the environment are made from.
-  - Storage account template/plan - used for staging files in automation scripts
-  - Management artifacts template/plan - deploys Azure Log Analytics workspace and solutions and Azure Policy artifacts
-- User remotes into Client Windows VM, which automatically kicks off multiple scripts that:
-  - Deploy and configure five (5) nested virtual machines in Hyper-V
-    - Windows Server 2022 VM - onboarded as Azure Arc-enabled server
-    - Windows Server 2019 VM - onboarded as Azure Arc-enabled server
-    - Windows VM running SQL Server - onboarded as Azure Arc-enabled SQL Server (as well as Azure Arc-enabled server)
-    - 2 x Ubuntu VMs - onboarded as Azure Arc-enabled servers
-  - Deploy an Azure Monitor workbook that provides example reports and metrics for monitoring ArcBox components
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.40.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy ArcBox to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- ArcBox must be deployed to one of the following regions. **Deploying ArcBox outside of these regions may result in unexpected results or deployment errors.**
-
-  - East US
-  - East US 2
-  - Central US
-  - West US 2
-  - North Europe
-  - West Europe
-  - France Central
-  - UK South
-  - Australia East
-  - Japan East
-  - Korea Central
-  - Southeast Asia
-
-- **ArcBox Full requires 44 B-series and 16 DSv4-series vCPUs** when deploying with default parameters such as VM series/size. Ensure you have sufficient vCPU quota available in your Azure subscription and the region where you plan to deploy ArcBox. You can use the below Az CLI command to check your vCPU utilization.
-
-  ```shell
-  az vm list-usage --location <your location> --output table
-  ```
-
-  ![Screenshot showing az vm list-usage](./azvmlistusage.png)
-
-- Register necessary Azure resource providers by running the following commands.
-
-  ```shell
-  az provider register --namespace Microsoft.HybridCompute --wait
-  az provider register --namespace Microsoft.GuestConfiguration --wait
-  az provider register --namespace Microsoft.Kubernetes --wait
-  az provider register --namespace Microsoft.KubernetesConfiguration --wait
-  az provider register --namespace Microsoft.ExtendedLocation --wait
-  az provider register --namespace Microsoft.AzureArcData --wait
-  az provider register --namespace Microsoft.OperationsManagement --wait
-  ```
-
-- Create Azure service principal (SP). To deploy ArcBox, an Azure service principal assigned with the _Owner_ Role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcBoxSPN" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcBox",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install or update Azure PowerShell to version 10.4.0 or above.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "JumpstartArcBoxSPN" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    Output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./create_spn_powershell.png)
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.**
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client). The SSH key is used to configure secure access to the Linux virtual machines that are used to run the Kubernetes clusters.
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_jumpstart_arcbox%2FARM%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portaldeploy.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portaldeployinprogress.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portaldeploymentcomplete.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/full/#basic-troubleshooting).**
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-    ```shell
-    git clone https://github.com/microsoft/azure_arc.git
-    ```
-
-- Edit the [azuredeploy.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/ARM/azuredeploy.parameters.json) ARM template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the ArcBox Log Analytics workspace
-  - _`flavor`_ - Use the value "Full" to specify that you want to deploy the full version of ArcBox
-
-  ![Screenshot showing example parameters](./parameters.png)
-
-- Now you will deploy the ARM template. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --template-file azuredeploy.json \
-  --parameters azuredeploy.parameters.json
-  ```
-
-  ![Screenshot showing az group create](./azgroupcreate.png)
-
-  ![Screenshot showing az deployment group create](./azdeploy.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/full/#basic-troubleshooting).**
-
-## Deployment Option 3: Bicep deployment via Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Upgrade to latest Bicep version
-
-  ```shell
-  az bicep upgrade
-  ```
-
-- Edit the [main.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/bicep/main.parameters.json) template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the ArcBox Log Analytics workspace
-  - _`flavor`_ - Use the value "Full" to specify that you want to deploy the full version of ArcBox
-
-  ![Screenshot showing example parameters](./parameters_bicep.png)
-
-- Now you will deploy the Bicep file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/bicep) and run the below command:
-
-  ```shell
-  az login
-  az group create --name "<resource-group-name>"  --location "<preferred-location>"
-  az deployment group create -g "<resource-group-name>" -f "main.bicep" -p "main.parameters.json"
-  ```
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/full/#basic-troubleshooting).**
-
-## Deployment Option 4: Terraform Deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Download and install the latest version of Terraform [here](https://www.terraform.io/downloads.html)
-
-  > **NOTE: Terraform 1.x or higher is supported for this deployment. Tested with Terraform v1.011.**
-
-- Create a `terraform.tfvars` file in the root of the terraform folder and supply some values for your environment.
-
-  ```HCL
-  azure_location    = "westus2"
-  spn_client_id     = "1414133c-9786-53a4-b231-f87c143ebdb1"
-  spn_client_secret = "fakeSecretValue123458125712ahjeacjh"
-  spn_tenant_id     = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-  client_admin_ssh  = "C:/Temp/rsa.pub"
-  deployment_flavor = "Full"
-  ```
-
-- Variable Reference:
-  - **_`azure_location`_** - Azure location code (e.g. 'eastus', 'westus2', etc.)
-  - **_`resource_group_name`_** - Resource group which will contain all of the ArcBox artifacts
-  - **_`spn_client_id`_** - Your Azure service principal id
-  - **_`spn_client_secret`_** - Your Azure service principal secret
-  - **_`spn_tenant_id`_** - Your Azure tenant id
-  - **_`client_admin_ssh`_** - SSH public key path, used for Linux VMs
-  - **_`deployment_flavor`_** - Use the value "Full" to specify that you want to deploy the full version of ArcBox
-  - _`client_admin_username`_ - Admin username for Windows & Linux VMs
-  - _`client_admin_password`_ - Admin password for Windows VMs. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - **_`workspace_name`_** - Unique name for the ArcBox Log Analytics workspace
-
-  > **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-- Now you will deploy the Terraform file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/terraform) and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-
-- Example output from `terraform init`:
-
-  ![terraform init](./terraform_init.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![terraform plan](./terraform_plan.png)
-
-- Example output from `terraform apply "infra.out"`:
-
-  ![terraform plan](./terraform_apply.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/full/#basic-troubleshooting).**
-
-## Start post-deployment automation
-
-Once your deployment is complete, you can open the Azure portal and see the ArcBox resources inside your resource group. You will be using the _ArcBox-Client_ Azure virtual machine to explore various capabilities of ArcBox such as GitOps configurations and Key Vault integration. You will need to remotely access _ArcBox-Client_.
-
-  ![Screenshot showing all deployed resources in the resource group](./deployed_resources.png)
-
-   > **NOTE: For enhanced ArcBox security posture, RDP (3389) and SSH (22) ports are not open by default in ArcBox deployments. You will need to create a network security group (NSG) rule to allow network access to port 3389, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.**
-
-### Connecting to the ArcBox Client virtual machine
-
-Various options are available to connect to _ArcBox-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_jumpstart_arcbox/Full/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _ArcBox-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_jumpstart_arcbox/Full/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_jumpstart_arcbox/Full/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-#### Connecting directly with RDP
-
-By design, ArcBox does not open port 3389 on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _ArcBox-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing ArcBox-Client NSG with blocked RDP](./rdp_nsg_blocked.png)
-
-  ![Screenshot showing adding a new inbound security rule](./nsg_add_rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  <img src="./nsg_add_rdp_rule.png" alt="Screenshot showing adding a new allow RDP inbound security rule" width="400">
-
-  ![Screenshot showing all inbound security rule](./rdp_nsg_all_rules.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-#### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./bastion_connect.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _ArcBox-Client_ with Azure Bastion.**
-
-#### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./jit_allowing_rdp.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./jit_connect_rdp.png)
-
-#### The Logon scripts
-
-- Once you log into the _ArcBox-Client_ VM, multiple automated scripts will open and start running. These scripts usually take 10-20 minutes to finish, and once completed, the script windows will close automatically. At this point, the deployment is complete.
-
-  ![Screenshot showing ArcBox-Client](./automation.png)
-
-- Deployment is complete! Let's begin exploring the features of Azure Arc with ArcBox!
-
-  ![Screenshot showing complete deployment](./arcbox_complete.png)
-
-  ![Screenshot showing ArcBox resources in Azure portal](./rg_arc.png)
-
-## Azure Arc-enabled SQL Server onboarding
-
-- During deployment, a check is performed to determine whether or not the Service Principal being used has permissions of _'Microsoft.Authorization/roleAssignments/write'_ on the target resource group. This permission can be found in the Azure built-in roles of Owner, User Access Administrator, or you may have a custom RBAC role which provides this permission. If the Service Principal has been granted the rights to change the role assignments on the resource group, the Azure Arc-enabled SQL Server can be automatically onboarded as part of the port-deployment automation.
-
-- In the event that the Service Principal does **not** have _'Microsoft.Authorization/roleAssignments/write'_ on the target resource group, and icon will created on the _ArcBox-Client_ desktop, which will allow you to onboard the Azure Arc-enabled SQL Server after the post-deployment automation is complete. To start the onboarding process in this scenario, simply click the _'Onboard SQL Server'_ icon on the desktop. This process should take around 10-15 minutes to complete.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_icon.png)
-
-- A pop-up box will walk you through the target SQL Server which will be onboarded to Azure Arc, as well as provide details around the flow of the onboarding automation and how to complete the Azure authentication process when prompted.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_start.png)
-
-- The automation uses the PowerShell SDK to onboard the Azure Arc-enabled SQL Server on your behalf. To accomplish this, it will login to Azure with the _-UseDeviceAuthentication_ flag. The device code will be copied to the clipboard on your behalf, so you can simply paste the value into box when prompted.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_code.png)
-
-- You'll then need to provide your Azure credentials to complete the authentication process. The user you login as will need _'Microsoft.Authorization/roleAssignments/write'_ permissions on the ArcBox resource group to complete the onboarding process.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_login.png)
-
-- The output of each step of the onboarding process will be displayed in the PowerShell script window, so you'll be able to see where the script currently is in the process at all times.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_output.png)
-
-- Once complete, you'll receive a pop-up notification informing you that the onboarding process is complete, and to check the Azure Arc blade in the Azure portal in the next few minutes.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_complete.png)
-
-- From the Azure portal, the SQL Server should now be visible as an Azure Arc-enabled SQL Server.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_portal.png)
-
-## Using ArcBox
-
-After deployment is complete, its time to start exploring ArcBox. Most interactions with ArcBox will take place either from Azure itself (Azure portal, CLI or similar) or from inside the _ArcBox-Client_ virtual machine. When remoted into the client VM, here are some things to try:
-
-- Open the Hyper-V Manager to access the ArcBox nested virtual machines, that are onboarded as Azure Arc-enabled servers.
-&nbsp;
-
-  Windows virtual machine credentials:
-
-  ```text
-  Username: Administrator
-  Password: ArcDemo123!!
-  ```
-
-  Ubuntu virtual machine credentials:
-  
-  ```text
-  Username: arcdemo
-  Password: ArcDemo123!!
-  ```
-
-  ![Screenshot showing ArcBox Client VM with Hyper-V](./hypervterminal.png)
-
-- Alternately, you can use Azure CLI to connect to one of the Azure Arc-enabled servers, Hyper-V Ubuntu virtual machines [using SSH](https://learn.microsoft.com/azure/azure-arc/servers/ssh-arc-overview?tabs=azure-cli). Open a PowerShell session and use the below commands.
-
-    ```powershell
-    az login -u $env:SPN_CLIENT_ID -p $env:SPN_CLIENT_SECRET -t $env:SPN_TENANT_ID --service-principal
-
-    $serverName = "ArcBox-Ubuntu-01"
-    $localUser = "arcdemo"
-    az ssh arc --resource-group $Env:resourceGroup --name $serverName --local-user $localUser
-    ```
-
-    > **NOTE: Server-side SSH is being provisioned asynchronously to the VMs in the automated provisioning scripts, so it might take up to 5 minutes after the ArcBox deployment scripts is finished until the _az ssh_ commands will run successfully.**
-
-    ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_01.png)
-
-    ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_02.png)
-
-- Following the previous method, you can also use Azure CLI to connect to one of the Azure Arc-enabled servers, Hyper-V Windows Server virtual machines via SSH.
-
-  ```powershell
-  az login -u $env:SPN_CLIENT_ID -p $env:SPN_CLIENT_SECRET -t $env:SPN_TENANT_ID --service-principal
-
-  $serverName = "ArcBox-Win2K22"
-  $localUser = "Administrator"
-
-  az ssh arc --resource-group $Env:resourceGroup --name $serverName --local-user $localUser
-  ```
-
-  ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_03.png)
-
-  ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_04.png)
-
-- In addition to SSH, you can also use Azure CLI to connect to one of the Azure Arc-enabled servers, Hyper-V Windows Server virtual machines using Remote Desktop tunneled via SSH.
-
-  ```powershell
-  az login -u $env:SPN_CLIENT_ID -p $env:SPN_CLIENT_SECRET -t $env:SPN_TENANT_ID --service-principal
-
-  $serverName = "ArcBox-Win2K22"
-  $localUser = "Administrator"
-
-  az ssh arc --resource-group $Env:resourceGroup --name $serverName --local-user $localUser --rdp
-  ```
-
-  ![Screenshot showing usage of Remote Desktop tunnelled via SSH](./rdp_via_az_cli.png)
-
-- Use the included [kubectx](https://github.com/ahmetb/kubectx) tool to switch Kubernetes contexts between the Rancher K3s and AKS clusters.
-
-  ```shell
-  kubectx
-  kubectx arcbox-capi
-  kubectl get nodes
-  kubectl get pods -n arc
-  kubectx arcbox-k3s
-  kubectl get nodes
-  ```
-
-  ![Screenshot showing usage of kubectx](./kubectx.png)
-
-- Open Azure Data Studio and explore the SQL MI and PostgreSQL instances.
-
-  ![Screenshot showing Azure Data Studio usage](./azdatastudio.png)
-
-### ArcBox Azure Monitor workbook
-
-Open the [ArcBox Azure Monitor workbook documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/workbook/flavors/Full) and explore the visualizations and reports of hybrid cloud resources.
-
-  ![Screenshot showing Azure Monitor workbook usage](./workbook.png)
-
-### Azure Arc-enabled data services operations
-
-Open the [data services operations page](https://azurearcjumpstart.io/azure_jumpstart_arcbox/data_ops/) and explore various ways you can perform operations against the Azure Arc-enabled data services deployed with ArcBox.
-
-  ![Screenshot showing Grafana dashboard](./activity1.png)
-
-### Arc-enabled SQL Server - Best practices assessment
-
-As part of the ArcBox deployment, SQL Server best practices assessment is configured and run. Open _ArcBox-SQL_ Arc-enabled SQL Server resource from the resource group deployed or Azure Arc service blade to view SQL Server best practice assessment results.
-
-- The following screenshot shows the SQL Server best practices assessment page and the scheduled and previously ran assessments. If this page does not show assessment results click on the Refresh button to show assessments. Once displayed the assessments and results click on _View assessment_ results to see results.
-
-  ![Screenshot showing SQL Server best practices assessment configuration](./sql-pba-view-results.png)
-
-  ![Screenshot showing SQL Server best practices assessment results part 1](./sql-bpa-results-1.png)
-
-  ![Screenshot showing SQL Server best practices assessment results part 2](./sql-bpa-results-2.png)
-
-### Microsoft Defender for Cloud - SQL servers on machines
-
-This section guides you through different settings for enabling Microsoft Defender for Cloud - SQL servers on machines. Most of these settings are already enabled during the logon script execution after logging in to _ArcBox-Client_ Azure VM. Even though these are pre-configured there might be delays in showing them in the Azure portal.
-
-- Following are the settings of Microsoft Defender for Cloud - SQL servers on machines configured using automation scripts and can be reviewed in Azure portal.
-
-  ![Screenshot showing Microsoft Defender for Cloud plans](./microsoft-defender-plans.png)
-
-  ![Screenshot showing Microsoft Defender for Cloud SQL enabled](./defender-sql-plan.png)
-
-- The below screenshots show Arc-enabled SQL Server Defender for Cloud enablement and protection status. Defender for Cloud for SQL Server is enabled at the subscription level, but the protection status is still showing as not enabled.
-
-Please note it may take some time to show this status in the Azure portal, but still able to detect SQL threats generated by the test scripts.
-
-  ![Screenshot showing Microsoft Defender for Cloud - Arc-enabled SQL server status](./sql-defender-status.png)
-
-- The below screenshot shows the SQL threats detected by Microsoft Defender for Cloud.
-
-  ![Screenshot showing Defender for SQL security incidents and alerts](./sql-defender-incidents.png)
-
-  > **NOTE: Once in a while executing Defender for SQL test script (_testDefenderForSQL.ps1_) may fail due to delays in deploying SQLAdvancedThreatProtection Log Analytics solution and may not generate security incidents and alerts. If you do not find these security incidents and alerts, log in to nested SQL server VM _ArcBox-SQL_ in Hyper-V and execute the test script manually as shown below.**
-
-- The below screenshot shows the test script used to generate SQL threats, detect, and alert using Defender for Cloud for SQL servers. This script is copied on the nested _ArcBox-SQL_ Hyper-V virtual machine and can be used to run additional tests to generate security incidents and alerts.
-
-  ![Screenshot showing Defender for SQL test scripts](./sql-defender-testing-script.png)
-
-- Open PowerShell window and change directory to _C:\ArcBox\agentScript_ folder and run _testDefenderForSQL.ps1_ PowerShell script to generate Defender for SQL incidents and alerts.
-
-  ![Screenshot showing manual execution of the test scripts](./manual-brute-force-test.png)
-
-- The below screenshot shows an email alert sent by Defender for Cloud when a SQL threat is detected. By default, this email is sent to the registered contact email at the subscription level.
-  ![Screenshot showing test script results](./brute-force-attack-alert.png)
-
-### Included tools
-
-The following tools are including on the _ArcBox-Client_ VM.
-
-- Azure Data Studio with Arc and PostgreSQL extensions
-- kubectl, kubectx, helm
-- Chocolatey
-- Visual Studio Code
-- Putty
-- 7zip
-- Terraform
-- Git
-- SqlQueryStress
-
-### Next steps
-
-ArcBox is a sandbox that can be used for a large variety of use cases, such as an environment for testing and training or a kickstarter for proof of concept projects. Ultimately, you are free to do whatever you wish with ArcBox. Some suggested next steps for you to try in your ArcBox are:
-
-- Deploy sample databases to the PostgreSQL instance or to the SQL Managed Instance
-- Use the included kubectx to switch contexts between the two Kubernetes clusters
-- Deploy GitOps configurations with Azure Arc-enabled Kubernetes
-- Build policy initiatives that apply to your Azure Arc-enabled resources
-- Write and test custom policies that apply to your Azure Arc-enabled resources
-- Incorporate your own tooling and automation into the existing automation framework
-- Build a certificate/secret/key management strategy with your Azure Arc resources
-
-Do you have an interesting use case to share? [Submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub with your idea and we will consider it for future releases!
-
-## Clean up the deployment
-
-To clean up your deployment, simply delete the resource group using Azure CLI or Azure portal.
-
-```shell
-az group delete -n <name of your resource group>
-```
-
-![Screenshot showing az group delete](./azdelete.png)
-
-![Screenshot showing group delete from Azure portal](./portaldelete.png)
-
-## Basic Troubleshooting
-
-Occasionally deployments of ArcBox may fail at various stages. Common reasons for failed deployments include:
-
-- Invalid service principal id, service principal secret or service principal Azure tenant ID provided in _azuredeploy.parameters.json_ file.
-- Invalid SSH public key provided in _azuredeploy.parameters.json_ file.
-  - An example SSH public key is shown here. Note that the public key includes "ssh-rsa" at the beginning. The entire value should be included in your _azuredeploy.parameters.json_ file.
-
-      ![Screenshot showing SSH public key example](./ssh_example.png)
-
-- Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 52 available. See the [prerequisites](#prerequisites) section for more details.
-- Target Azure region does not support all required Azure services - ensure you are running ArcBox in one of the supported regions listed in the above section "ArcBox Azure Region Compatibility".
-- "BadRequest" error message when deploying - this error returns occasionally when the Log Analytics solutions in the ARM templates are deployed. Typically, waiting a few minutes and re-running the same deployment resolves the issue. Alternatively, you can try deploying to a different Azure region.
-
-  ![Screenshot showing BadRequest errors in Az CLI](./error_badrequest.png)
-
-  ![Screenshot showing BadRequest errors in Azure portal](./error_badrequest2.png)
-
-### Exploring logs from the _ArcBox-Client_ virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _ArcBox-Client_, _ArcBox-CAPI-MGMT_ or _ArcBox-K3s_ virtual machines in case of deployment failures. To make troubleshooting easier, the ArcBox deployment scripts collect all relevant logs in the _C:\ArcBox\Logs_ folder on _ArcBox-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\ArcBox\Logs\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _ArcBox-Client_. |
-| _C:\ArcBox\Logs\ArcServersLogonScript.log_ | Output of _ArcServersLogonScript.ps1_ which configures the Hyper-V host and guests and onboards the guests as Azure Arc-enabled servers. |
-| _C:\ArcBox\Logs\DataServicesLogonScript.log_ | Output of _DataServicesLogonScript.ps1_ which configures Azure Arc-enabled data services baseline capability. |
-| _C:\ArcBox\Logs\deployPostgreSQL.log_ | Output of _deployPostgreSQL.ps1_ which deploys and configures PostgreSQL with Azure Arc. |
-| _C:\ArcBox\Logs\deploySQL.log_ | Output of _deploySQL.ps1_ which deploys and configures SQL Managed Instance with Azure Arc. |
-| _C:\ArcBox\Logs\installCAPI.log_ | Output from the custom script extension which runs on _ArcBox-CAPI-MGMT_ and configures the Cluster API for Azure cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuCapi.json_ then review this log. |
-| _C:\ArcBox\Logs\installK3s.log_ | Output from the custom script extension which runs on _ArcBox-K3s_ and configures the Rancher cluster and onboards it as an Azure Arc-enabled Kubernetes cluster. If you encounter ARM deployment issues with _ubuntuRancher.json_ then review this log. |
-| _C:\ArcBox\Logs\MonitorWorkbookLogonScript.log_ | Output from _MonitorWorkbookLogonScript.ps1_ which deploys the Azure Monitor workbook. |
-| _C:\ArcBox\Logs\SQLMIEndpoints.log_ | Output from _SQLMIEndpoints.ps1_ which collects the service endpoints for SQL MI and uses them to configure Azure Data Studio connection settings. |
-
-  ![Screenshot showing ArcBox logs folder on ArcBox-Client](./troubleshoot_logs.png)
-
-### Exploring installation logs from the Linux virtual machines
-
-In the case of a failed deployment, pointing to a failure in either the _ubuntuRancherDeployment_ or the _ubuntuCAPIDeployment_ Azure deployments, an easy way to explore the deployment logs is available directly from the associated virtual machines.
-
-  ![Screenshot showing failed deployments](./failed_deployments.png)
-
-- Depends on which deployment failed, connect using SSH to the associated virtual machine public IP:
-  - _ubuntuCAPIDeployment_ - _ArcBox-CAPI-MGMT_ virtual machine.
-  - _ubuntuRancherDeployment_ - _ArcBox-K3s_ virtual machine.
-
-    Since you are logging in using the provided SSH public key, all you need is the _arcdemo_ username.
-
-      ![Screenshot showing ArcBox-CAPI-MGMT virtual machine public IP](./arcbox_capi_mgmt_vm_ip.png)
-
-      ![Screenshot showing ArcBox-K3s virtual machine public IP](./arcbox_k3s_vm_ip.png)
-
-- As described in the message of the day (motd), depends on which virtual machine you logged into, the installation log can be found in the _jumpstart_logs_ folder. This installation logs can help determine the root cause for the failed deployment.
-  - _ArcBox-CAPI-MGMT_ log path: _jumpstart_logs/installCAPI.log_
-  - _ArcBox-K3s_ log path: _jumpstart_logs/installK3s.log_
-
-      ![Screenshot showing login and the message of the day](./login_motd.png)
-
-- From the screenshot below, looking at _ArcBox-CAPI-MGMT_ virtual machine CAPI installation log using the `cat jumpstart_logs/installCAPI.log` command, we can see the _az login_ command failed due to bad service principal credentials.
-
-  ![Screenshot showing cat command for showing installation log](./cat_command.png)
-
-  ![Screenshot showing az login error](./az_login_error.png)
-
-- You might randomly get a similar error in the _InstallCAPI.log_ to `Error from server (InternalError): error when creating "template.yaml": Internal error occurred: failed calling webhook "default.azuremachinetemplate.infrastructure.cluster.x-k8s.io": failed to call webhook: Post "https://capz-webhook-service.capz-system.svc:443/mutate-infrastructure-cluster-x-k8s-io-v1beta1-azuremachinetemplate?timeout=10s": EOF`. This is an issue we are currently investigating. To resolve please redeploy ArcBox.
-
-If you are still having issues deploying ArcBox, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub and include a detailed description of your issue, the Azure region you are deploying to, the flavor of ArcBox you are trying to deploy. Inside the _C:\ArcBox\Logs_ folder you can also find instructions for uploading your logs to an Azure storage account for review by the Jumpstart team.
diff --git a/docs/azure_jumpstart_arcbox/ITPro/_index.md b/docs/azure_jumpstart_arcbox/ITPro/_index.md
deleted file mode 100644
index 5cda11df94..0000000000
--- a/docs/azure_jumpstart_arcbox/ITPro/_index.md
+++ /dev/null
@@ -1,614 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart ArcBox for IT Pros"
-weight: 2
----
-
-## Jumpstart ArcBox for IT Pros
-
-ArcBox for IT Pros is a special "flavor" of ArcBox that is intended for users who want to experience Azure Arc-enabled servers capabilities in a sandbox environment.
-
-![ArcBox architecture diagram](./arch_itpro.png)
-
-### Use cases
-
-- Sandbox environment for getting hands-on with Azure Arc technologies
-- Accelerator for Proof-of-concepts or pilots
-- Training tool for Azure Arc skills development
-- Demo environment for customer presentations or events
-- Rapid integration testing platform
-- Infrastructure-as-code and automation template library for building hybrid cloud management solutions
-
-## Azure Arc capabilities available in ArcBox for IT Pros
-
-### Azure Arc-enabled servers
-
-![ArcBox servers diagram](./servers.png)
-
-ArcBox includes three Azure Arc-enabled server resources that are hosted using nested virtualization in Azure. As part of the deployment, a Hyper-V host (_ArcBox-Client_) is deployed with three guest virtual machines. These machines, _ArcBoxWin_, _ArcBoxUbuntu_, and _ArcBoxSQL_ are connected as Azure Arc-enabled servers via the ArcBox automation.
-
-### Hybrid Unified Operations
-
-ArcBox deploys several management and operations services that work with ArcBox's Azure Arc resources. These resources include an Azure Log Analytics workspace, an Azure Monitor workbook, Azure Policy assignments for deploying Azure Monitor agents on Windows and Linux Azure Arc-enabled servers, Azure Policy assignment for adding tags to resources, and a storage account used for staging resources needed for the deployment automation.
-
-![ArcBox unified operations diagram](./unifiedops.png)
-
-## ArcBox Azure Consumption Costs
-
-ArcBox resources generate Azure Consumption charges from the underlying Azure resources including core compute, storage, networking and auxillary services. Note that Azure consumption costs vary depending the region where ArcBox is deployed. Be mindful of your ArcBox deployments and ensure that you disable or delete ArcBox resources when not in use to avoid unwanted charges. Please see the [Jumpstart FAQ](https://aka.ms/Jumpstart-FAQ) for more information on consumption costs.
-
-## Deployment Options and Automation Flow
-
-ArcBox provides multiple paths for deploying and configuring ArcBox resources. Deployment options include:
-
-- Azure portal
-- ARM template via Azure CLI
-- Bicep
-- Terraform
-
-![Deployment flow diagram for ARM-based deployments](./deploymentflow.png)
-
-![Deployment flow diagram for Terraform-based deployments](./deploymentflow_tf.png)
-
-ArcBox uses an advanced automation flow to deploy and configure all necessary resources with minimal user interaction. The previous diagrams provide an overview of the deployment flow. A high-level summary of the deployment is:
-
-- User deploys the primary ARM template (azuredeploy.json), Bicep file (main.bicep), or Terraform plan (main.tf). These objects contain several nested objects that will run simultaneously.
-  - ClientVM ARM template/plan - deploys the Client Windows VM. This is the Hyper-V host VM where all user interactions with the environment are made from.
-  - Storage account template/plan - used for staging files in automation scripts
-  - Management artifacts template/plan - deploys Azure Log Analytics workspace and solutions and Azure Policy artifacts
-- User remotes into Client Windows VM, which automatically kicks off multiple scripts that:
-  - Deploy and configure five (5) nested virtual machines in Hyper-V
-    - Windows Server 2022 VM - onboarded as Azure Arc-enabled server
-    - Windows Server 2019 VM - onboarded as Azure Arc-enabled server
-    - Windows VM running SQL Server - onboarded as Azure Arc-enabled SQL Server (as well as Azure Arc-enabled server)
-    - 2 x Ubuntu VM - onboarded as Azure Arc-enabled servers
-  - Deploy an Azure Monitor workbook that provides example reports and metrics for monitoring ArcBox components
-
-## Prerequisites
-
-- [Install or update Azure CLI to version 2.40.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Login to AZ CLI using the ```az login``` command.
-
-- Ensure that you have selected the correct subscription you want to deploy ArcBox to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- ArcBox must be deployed to one of the following regions. **Deploying ArcBox outside of these regions may result in unexpected results or deployment errors.**
-
-  - East US
-  - East US 2
-  - Central US
-  - West US 2
-  - North Europe
-  - West Europe
-  - France Central
-  - UK South
-  - Australia East
-  - Japan East
-  - Korea Central
-  - Southeast Asia
-
-- **ArcBox for IT Pros requires 16 DSv4-series vCPUs** when deploying with default parameters such as VM series/size. Ensure you have sufficient vCPU quota available in your Azure subscription and the region where you plan to deploy ArcBox. You can use the below Az CLI command to check your vCPU utilization.
-
-  ```shell
-  az vm list-usage --location <your location> --output table
-  ```
-
-  ![Screenshot showing az vm list-usage](./azvmlistusage.png)
-
-- Register necessary Azure resource providers by running the following commands.
-
-  ```shell
-  az provider register --namespace Microsoft.HybridCompute --wait
-  az provider register --namespace Microsoft.GuestConfiguration --wait
-  az provider register --namespace Microsoft.AzureArcData --wait
-  az provider register --namespace Microsoft.OperationsManagement --wait
-  ```
-
-- Create Azure service principal (SP). To deploy ArcBox, an Azure service principal assigned with the _Owner_ Role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartArcBoxSPN" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    Output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartArcBox",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install or update Azure PowerShell to version 10.4.0 or above.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "JumpstartArcBoxSPN" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    Output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./create_spn_powershell.png)
-
-    > **NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.**
-
-    > **NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)**
-
-- [Generate a new SSH key pair](https://docs.microsoft.com/azure/virtual-machines/linux/create-ssh-keys-detailed) or use an existing one (Windows 10 and above now comes with a built-in ssh client). The SSH key is used to configure secure access to the Linux virtual machines that are used to run the Kubernetes clusters.
-
-  ```shell
-  ssh-keygen -t rsa -b 4096
-  ```
-
-  To retrieve the SSH public key after it's been created, depending on your environment, use one of the below methods:
-  - In Linux, use the `cat ~/.ssh/id_rsa.pub` command.
-  - In Windows (CMD/PowerShell), use the SSH public key file that by default, is located in the _`C:\Users\WINUSER/.ssh/id_rsa.pub`_ folder.
-
-  SSH public key example output:
-
-  ```shell
-  ssh-rsa o1djFhyNe5NXyYk7XVF7wOBAAABgQDO/QPJ6IZHujkGRhiI+6s1ngK8V4OK+iBAa15GRQqd7scWgQ1RUSFAAKUxHn2TJPx/Z/IU60aUVmAq/OV9w0RMrZhQkGQz8CHRXc28S156VMPxjk/gRtrVZXfoXMr86W1nRnyZdVwojy2++sqZeP/2c5GoeRbv06NfmHTHYKyXdn0lPALC6i3OLilFEnm46Wo+azmxDuxwi66RNr9iBi6WdIn/zv7tdeE34VAutmsgPMpynt1+vCgChbdZR7uxwi66RNr9iPdMR7gjx3W7dikQEo1djFhyNe5rrejrgjerggjkXyYk7XVF7wOk0t8KYdXvLlIyYyUCk1cOD2P48ArqgfRxPIwepgW78znYuwiEDss6g0qrFKBcl8vtiJE5Vog/EIZP04XpmaVKmAWNCCGFJereRKNFIl7QfSj3ZLT2ZXkXaoLoaMhA71ko6bKBuSq0G5YaMq3stCfyVVSlHs7nzhYsX6aDU6LwM/BTO1c= user@pc
-  ```
-
-- ArcBox must be deployed to one of the following regions. **Deploying ArcBox outside of these regions may result in unexpected results or deployment errors.**
-
-  - East US
-  - East US 2
-  - Central US
-  - West US 2
-  - North Europe
-  - West Europe
-  - France Central
-  - UK South
-  - Australia East
-  - Japan East
-  - Korea Central
-  - Southeast Asia
-
-## Deployment Option 1: Azure portal
-
-- Click the <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2Fazure_arc%2Fmain%2Fazure_jumpstart_arcbox%2FARM%2Fazuredeploy.json" target="_blank"><img src="https://aka.ms/deploytoazurebutton"/></a> button and enter values for the the ARM template parameters.
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portaldeploy.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portaldeployinprogress.png)
-
-  ![Screenshot showing Azure portal deployment of ArcBox](./portaldeploymentcomplete.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#basic-troubleshooting).**
-
-## Deployment Option 2: ARM template with Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Edit the [azuredeploy.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/ARM/azuredeploy.parameters.json) ARM template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the ArcBox Log Analytics workspace
-  - _`flavor`_ - Use the value "ITPro" to specify that you want to deploy ArcBox for IT Pros
-
-  ![Screenshot showing example parameters](./parameters.png)
-
-- Now you will deploy the ARM template. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/ARM) and run the below command:
-
-  ```shell
-  az group create --name <Name of the Azure resource group> --location <Azure Region>
-  az deployment group create \
-  --resource-group <Name of the Azure resource group> \
-  --template-file azuredeploy.json \
-  --parameters azuredeploy.parameters.json
-  ```
-
-  ![Screenshot showing az group create](./azgroupcreate.png)
-
-  ![Screenshot showing az deployment group create](./azdeploy.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#basic-troubleshooting).**
-
-## Deployment Option 3: Bicep deployment via Azure CLI
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Upgrade to latest Bicep version
-
-  ```shell
-  az bicep upgrade
-  ```
-
-- Edit the [main.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_arcbox/bicep/main.parameters.json) template parameters file and supply some values for your environment.
-  - _`sshRSAPublicKey`_ - Your SSH public key
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the ArcBox Log Analytics workspace
-  - _`flavor`_ - Use the value "ITPro" to specify that you want to deploy ArcBox for IT Pros
-
-  ![Screenshot showing example parameters](./parameters_bicep.png)
-
-- Now you will deploy the Bicep file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_arcbox/bicep) and run the below command:
-
-  ```shell
-  az login
-  az group create --name "<resource-group-name>" --location "<preferred-location>"
-  az deployment group create -g "<resource-group-name>" -f "main.bicep" -p "main.parameters.json"
-  ```
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#basic-troubleshooting).**
-
-## Deployment Option 4: Terraform Deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- Download and install the latest version of Terraform [here](https://www.terraform.io/downloads.html)
-
-  > **NOTE: Terraform 1.x or higher is supported for this deployment. Tested with Terraform v1.011.**
-
-- Create a `terraform.tfvars` file in the root of the terraform folder and supply some values for your environment.
-
-  ```HCL
-  azure_location    = "westus2"
-  spn_client_id     = "1414133c-9786-53a4-b231-f87c143ebdb1"
-  spn_client_secret = "fakeSecretValue123458125712ahjeacjh"
-  spn_tenant_id     = "33572583-d294-5b56-c4e6-dcf9a297ec17"
-  user_ip_address   = "99.88.99.88"
-  client_admin_ssh  = "C:/Temp/rsa.pub"
-  deployment_flavor = "ITPro"
-  ```
-
-- Variable Reference:
-  - **_`azure_location`_** - Azure location code (e.g. 'eastus', 'westus2', etc.)
-  - **_`resource_group_name`_** - Resource group which will contain all of the ArcBox artifacts
-  - **_`spn_client_id`_** - Your Azure service principal id
-  - **_`spn_client_secret`_** - Your Azure service principal secret
-  - **_`spn_tenant_id`_** - Your Azure tenant id
-  - **_`user_ip_address`_** - Your local IP address. This is used to allow remote RDP connections to the Client Windows VM. If you don't know your public IP, you can find it [here](https://www.whatismyip.com/)
-  - **_`client_admin_ssh`_** - SSH public key path, used for Linux VMs
-  - **_`deployment_flavor`_** - Use the value "ITPro" to specify that you want to deploy ArcBox for IT Pros
-  - _`client_admin_username`_ - Admin username for Windows & Linux VMs
-  - _`client_admin_password`_ - Admin password for Windows VMs. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - **_`workspace_name`_** - Unique name for the ArcBox Log Analytics workspace
-
-  > **NOTE: Any variables in bold are required. If any optional parameters are not provided, defaults will be used.**
-
-- Now you will deploy the Terraform file. Navigate to the local cloned deployment folder and run the commands below:
-
-  ```shell
-  terraform init
-  terraform plan -out=infra.out
-  terraform apply "infra.out"
-  ```
-
-- Example output from `terraform init`:
-
-  ![terraform init](./terraform_init.png)
-
-- Example output from `terraform plan -out=infra.out`:
-
-  ![terraform plan](./terraform_plan.png)
-
-- Example output from `terraform apply "infra.out"`:
-
-  ![terraform plan](./terraform_apply.png)
-
-    > **NOTE: If you see any failure in the deployment, please check the [troubleshooting guide](https://azurearcjumpstart.io/azure_jumpstart_arcbox/itpro/#basic-troubleshooting).**
-
-## Start post-deployment automation
-
-Once your deployment is complete, you can open the Azure portal and see the ArcBox resources inside your resource group. You will be using the _ArcBox-Client_ Azure virtual machine to explore various capabilities of ArcBox such as GitOps configurations and Key Vault integration. You will need to remotely access _ArcBox-Client_.
-
-  ![Screenshot showing all deployed resources in the resource group](./deployed_resources.png)
-
-   > **NOTE: For enhanced ArcBox security posture, RDP (3389) and SSH (22) ports are not open by default in ArcBox deployments. You will need to create a network security group (NSG) rule to allow network access to port 3389, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.**
-
-### Connecting to the ArcBox Client virtual machine
-
-Various options are available to connect to _ArcBox-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_jumpstart_arcbox/ITPro/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _ArcBox-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_jumpstart_arcbox/ITPro/#connect-using-just-in-time-access-jit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_jumpstart_arcbox/ITPro/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-#### Connecting directly with RDP
-
-By design, ArcBox does not open port 3389 on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-- Open the _ArcBox-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing ArcBox-Client NSG with blocked RDP](./rdp_nsg_blocked.png)
-
-  ![Screenshot showing adding a new inbound security rule](./nsg_add_rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  <img src="./nsg_add_rdp_rule.png" alt="Screenshot showing adding a new allow RDP inbound security rule" width="400">
-
-  ![Screenshot showing all inbound security rule](./rdp_nsg_all_rules.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-#### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./bastion_connect.png)
-
-  > **NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _ArcBox-Client_ with Azure Bastion.**
-
-#### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./jit_allowing_rdp.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./jit_connect_rdp.png)
-
-#### The Logon scripts
-
-- Once you log into the _ArcBox-Client_ VM, multiple automated scripts will open and start running. These scripts usually take 10-20 minutes to finish, and once completed, the script windows will close automatically. At this point, the deployment is complete.
-
-  ![Screenshot showing ArcBox-Client](./automation.png)
-
-- Deployment is complete! Let's begin exploring the features of Azure Arc-enabled servers with ArcBox for IT Pros!
-
-  ![Screenshot showing complete deployment](./arcbox_complete.png)
-
-  ![Screenshot showing ArcBox resources in Azure portal](./rg_arc.png)
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_icon.png)
-
-- A pop-up box will walk you through the target SQL Server which will be onboarded to Azure Arc, as well as provide details around the flow of the onboarding automation and how to complete the Azure authentication process when prompted.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_start.png)
-
-- The automation uses the PowerShell SDK to onboard the Azure Arc-enabled SQL Server on your behalf. To accomplish this, it will login to Azure with the _-UseDeviceAuthentication_ flag. The device code will be copied to the clipboard on your behalf, so you can simply paste the value into box when prompted.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_code.png)
-
-- You'll then need to provide your Azure credentials to complete the authentication process. The user you login as will need _'Microsoft.Authorization/roleAssignments/write'_ permissions on the ArcBox resource group to complete the onboarding process.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_login.png)
-
-- The output of each step of the onboarding process will be displayed in the PowerShell script window, so you'll be able to see where the script currently is in the process at all times.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_output.png)
-
-- Once complete, you'll receive a pop-up notification informing you that the onboarding process is complete, and to check the Azure Arc blade in the Azure portal in the next few minutes.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_complete.png)
-
-- From the Azure portal, the SQL Server should now be visible as an Azure Arc-enabled SQL Server.
-
-  ![Screenshot showing ArcBox-Client](./sql_manual_onboard_portal.png)
-
-## Using ArcBox for IT Pros
-
-After deployment is complete, its time to start exploring ArcBox. Most interactions with ArcBox will take place either from Azure itself (Azure portal, CLI or similar) or from inside the _ArcBox-Client_ virtual machine. When remoted into the client VM, here are some things to try:
-
-- Open the Hyper-V Manager to access the ArcBox nested virtual machines, that are onboarded as Azure Arc-enabled servers.
-&nbsp;
-
-  Windows virtual machine credentials:
-
-  ```text
-  Username: Administrator
-  Password: ArcDemo123!!
-  ```
-
-  Ubuntu virtual machine credentials:
-  
-  ```text
-  Username: arcdemo
-  Password: ArcDemo123!!
-  ```
-
-  ![Screenshot showing ArcBox Client VM with Hyper-V](./hypervterminal.png)
-
-- Alternately, you can use Azure CLI to connect to one of the Azure Arc-enabled servers, Hyper-V Ubuntu virtual machines [using SSH](https://learn.microsoft.com/azure/azure-arc/servers/ssh-arc-overview?tabs=azure-cli). Open a PowerShell session and use the below commands.
-
-    ```powershell
-    az login -u $env:SPN_CLIENT_ID -p $env:SPN_CLIENT_SECRET -t $env:SPN_TENANT_ID --service-principal
-
-    $serverName = "ArcBox-Ubuntu-01"
-    $localUser = "arcdemo"
-    az ssh arc --resource-group $Env:resourceGroup --name $serverName --local-user $localUser
-    ```
-
-    > **NOTE: Server-side SSH is being provisioned asynchronously to the VMs in the automated provisioning scripts, so it might take up to 5 minutes after the ArcBox deployment scripts is finished until the _az ssh_ commands will run successfully.**
-
-    ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_01.png)
-
-    ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_02.png)
-
-- Following the previous method, you can also use Azure CLI to connect to one of the Azure Arc-enabled servers, Hyper-V Windows Server virtual machines via SSH.
-
-  ```powershell
-  az login -u $env:SPN_CLIENT_ID -p $env:SPN_CLIENT_SECRET -t $env:SPN_TENANT_ID --service-principal
-
-  $serverName = "ArcBox-Win2K22"
-  $localUser = "Administrator"
-
-  az ssh arc --resource-group $Env:resourceGroup --name $serverName --local-user $localUser
-  ```
-
-  ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_03.png)
-
-  ![Screenshot showing usage of SSH via Azure CLI](./ssh_via_az_cli_04.png)
-
-- In addition to SSH, you can also use Azure CLI to connect to one of the Azure Arc-enabled servers, Hyper-V Windows Server virtual machines using Remote Desktop tunneled via SSH.
-
-  ```powershell
-  az login -u $env:SPN_CLIENT_ID -p $env:SPN_CLIENT_SECRET -t $env:SPN_TENANT_ID --service-principal
-
-  $serverName = "ArcBox-Win2K22"
-  $localUser = "Administrator"
-
-  az ssh arc --resource-group $Env:resourceGroup --name $serverName --local-user $localUser --rdp
-  ```
-
-  ![Screenshot showing usage of Remote Desktop tunnelled via SSH](./rdp_via_az_cli.png)
-
-### ArcBox Azure Monitor workbook
-
-Open the [ArcBox Azure Monitor workbook documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/workbook/flavors/ITPro/) and explore the visualizations and reports of hybrid cloud resources.
-
-  ![Screenshot showing Azure Monitor workbook usage](./workbook.png)
-
-### Arc-enabled SQL Server - Best practices assessment
-
-As part of the ArcBox deployment, SQL Server best practices assessment is configured and run. Open _ArcBox-SQL_ Arc-enabled SQL Server resource from the resource group deployed or Azure Arc service blade to view SQL Server best practice assessment results.
-
-- The following screenshot shows the SQL Server best practices assessment page and the scheduled and previously ran assessments. If this page does not show assessment results click on the Refresh button to show assessments. Once displayed the assessments and results click on _View assessment_ results to see results.
-
-  ![Screenshot showing SQL Server best practices assessment configuration](./sql-pba-view-results.png)
-
-  ![Screenshot showing SQL Server best practices assessment results part 1](./sql-bpa-results-1.png)
-
-  ![Screenshot showing SQL Server best practices assessment results part 2](./sql-bpa-results-2.png)
-
-### Microsoft Defender for Cloud - SQL servers on machines
-
-This section guides you through different settings for enabling Microsoft Defender for Cloud - SQL servers on machines. Most of these settings are already enabled during the logon script execution when login to _ArcBox-Client_ Azure VM. Even though these are pre-configured there might be delays in showing them in the Azure portal.
-
-- Following are the settings of Microsoft Defender for Cloud - SQL servers on machines configured using automation scripts and can be reviewed in the Azure portal.
-
-  ![Screenshot showing Microsoft Defender for Cloud plans](./microsoft-defender-plans.png)
-
-  ![Screenshot showing Microsoft Defender for Cloud SQL enabled](./defender-sql-plan.png)
-
-- The below screenshots show Arc-enabled SQL Server Defender for Cloud enablement and protection status. Defender for Cloud for SQL Server is enabled at the subscription level, but the protection status is still showing as not enabled.
-Please note it may take some time to show this status in the Azure portal, but still able to detect SQL threats generated by the test scripts.
-
-  ![Screenshot showing Microsoft Defender for Cloud - Arc-enabled SQL server status](./sql-defender-status.png)
-
-- The below screenshot shows the SQL threats detected by Microsoft Defender for Cloud.
-
-  ![Screenshot showing Defender for SQL security incidents and alerts](./sql-defender-incidents.png)
-
-  > **NOTE: Once in a while executing Defender for SQL test script (_testDefenderForSQL.ps1_) may fail due to delays in deploying SQLAdvancedThreatProtection Log Analytics solution and may not generate security incidents and alerts. If you do not find these security incidents and alerts, log in to nested SQL server VM _ArcBox-SQL_ in Hyper-V and execute the test script manually as shown below.**
-
-- The below screenshot shows the test script used to generate SQL threats, detect, and alert using Defender for Cloud for SQL servers. This script is copied on the nested _ArcBox-SQL_ Hyper-V virtual machine and can be used to run additional tests to generate security incidents and alerts.
-
-  ![Screenshot showing Defender for SQL test scripts](./sql-defender-testing-script.png)
-
-- Open PowerShell window and change the directory to _C:\ArcBox\agentScript_ folder and run _testDefenderForSQL.ps1_ PowerShell script to generate Defender for SQL incidents and alerts.
-
-  ![Screenshot showing manual execution of the test scripts](./manual-brute-force-test.png)
-
-- The below screenshot shows an email alert sent by Defender for Cloud when a SQL threat is detected. By default, this email is sent to the registered contact email at the subscription level.
-  ![Screenshot showing test script results](./brute-force-attack-alert.png)
-
-### Included tools
-
-The following tools are including on the _ArcBox-Client_ VM.
-
-- Chocolatey
-- Visual Studio Code
-- Putty
-- 7zip
-- Terraform
-- Git
-
-### Next steps
-
-ArcBox is a sandbox that can be used for a large variety of use cases, such as an environment for testing and training or a kickstarter for proof of concept projects. Ultimately, you are free to do whatever you wish with ArcBox. Some suggested next steps for you to try in your ArcBox are:
-
-- Build policy initiatives that apply to your Azure Arc-enabled resources
-- Write and test custom policies that apply to your Azure Arc-enabled resources
-- Incorporate your own tooling and automation into the existing automation framework
-- Build a certificate/secret/key management strategy with your Azure Arc resources
-
-Do you have an interesting use case to share? [Submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub with your idea and we will consider it for future releases!
-
-## Clean up the deployment
-
-To clean up your deployment, simply delete the resource group using Azure CLI or Azure portal.
-
-```shell
-az group delete -n <name of your resource group>
-```
-
-![Screenshot showing az group delete](./azdelete.png)
-
-![Screenshot showing group delete from Azure portal](./portaldelete.png)
-
-## Basic Troubleshooting
-
-Occasionally deployments of ArcBox may fail at various stages. Common reasons for failed deployments include:
-
-- Invalid service principal id, service principal secret or service principal Azure tenant ID provided in _azuredeploy.parameters.json_ file.
-- Invalid SSH public key provided in _azuredeploy.parameters.json_ file.
-  - An example SSH public key is shown here. Note that the public key includes "ssh-rsa" at the beginning. The entire value should be included in your _azuredeploy.parameters.json_ file.
-
-![Screenshot showing SSH public key example](./ssh_example.png)
-
-- Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 16 available. See the [prerequisites](#prerequisites) section for more details.
-- Target Azure region does not support all required Azure services - ensure you are running ArcBox in one of the supported regions listed in the above section "ArcBox Azure Region Compatibility".
-- "BadRequest" error message when deploying - this error returns occasionally when the Log Analytics solutions in the ARM templates are deployed. Typically, waiting a few minutes and re-running the same deployment resolves the issue. Alternatively, you can try deploying to a different Azure region.
-
-  ![Screenshot showing BadRequest errors in Az CLI](./error_badrequest.png)
-
-  ![Screenshot showing BadRequest errors in Azure portal](./error_badrequest2.png)
-
-### Exploring logs from the _ArcBox-Client_ virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _ArcBox-Client_ virtual machine in case of deployment failures. To make troubleshooting easier, the ArcBox deployment scripts collect all relevant logs in the _C:\ArcBox\Logs_ folder on _ArcBox-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file | Description |
-| ------- | ----------- |
-| _C:\ArcBox\Logs\Bootstrap.log_ | Output from the initial bootstrapping script that runs on _ArcBox-Client_. |
-| _C:\ArcBox\Logs\ArcServersLogonScript.log_ | Output of ArcServersLogonScript.ps1 which configures the Hyper-V host and guests and onboards the guests as Azure Arc-enabled servers. |
-| _C:\ArcBox\Logs\MonitorWorkbookLogonScript.log_ | Output from MonitorWorkbookLogonScript.ps1 which deploys the Azure Monitor workbook. |
-
-  ![Screenshot showing ArcBox logs folder on ArcBox-Client](./troubleshoot_logs.png)
-
-If you are still having issues deploying ArcBox, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub and include a detailed description of your issue, the Azure region you are deploying to, and the flavor of ArcBox you are trying to deploy. Inside the _C:\ArcBox\Logs_ folder you can also find instructions for uploading your logs to an Azure storage account for review by the Jumpstart team.
diff --git a/docs/azure_jumpstart_arcbox/_index.md b/docs/azure_jumpstart_arcbox/_index.md
deleted file mode 100644
index 654468369a..0000000000
--- a/docs/azure_jumpstart_arcbox/_index.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart ArcBox"
-weight: 4
----
-
-## Jumpstart ArcBox - Overview
-
-ArcBox is a solution that provides an easy to deploy sandbox for all things Azure Arc. ArcBox is designed to be completely self-contained within a single Azure subscription and resource group, which will make it easy for a user to get hands-on with all available Azure Arc technology with nothing more than an available Azure subscription.
-
-### Use cases
-
-- Sandbox environment for getting hands-on with Azure Arc
-- Accelerator for Proof-of-concepts or pilots
-- Training tool for Azure Arc skills development
-- Demo environment for customer presentations or events
-- Rapid integration testing platform
-
-### ArcBox "Flavors"
-
-ArcBox comes in multiple "flavors", or configurations, which can be selected to best suit your needs. Currently, the available flavors are:
-
-- [ArcBox "Full"](https://azurearcjumpstart.io/azure_jumpstart_arcbox/Full)
-    The core ArcBox experience with Azure Arc-enabled servers, Kubernetes, and data services capabilities.
-
-    ![ArcBox architecture diagram](./arch_full.png)
-
-- [ArcBox for IT Pros](https://azurearcjumpstart.io/azure_jumpstart_arcbox/ITPro)
-    This essential Azure Arc-enabled servers sandbox includes a mix of Microsoft Windows and Linux servers managed using the included capabilities such Azure Monitor, Microsoft Defender for Cloud, Azure Policy, Update Management and more.
-
-    ![ArcBox for IT Pros architecture diagram](./arch_itpro.png)
-
-- [ArcBox for DevOps](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DevOps)
-    This essential Azure Arc-enabled Kubernetes sandbox with the included capabilities such as GitOps, Open Service Mesh (OSM), secrets management, monitoring, and more.
-
-    ![ArcBox for DevOps architecture diagram](./arch_devops.png)
-
-- [ArcBox for DataOps](https://azurearcjumpstart.io/azure_jumpstart_arcbox/DataOps)
-    This essential Azure Arc-enabled SQL Managed Instance sandbox with the included capabilities such as Active Directory authentication, point-in-time restore, high availability, disaster recovery, and more.
-
-    ![ArcBox for DevOps architecture diagram](./arch_dataops.png)
-
-To get started with one of the flavors of ArcBox, click the relevant links above to view the detailed README for each flavor. For additional questions, please review the [Jumpstart FAQ](https://aka.ms/Jumpstart-FAQ).
diff --git a/docs/azure_jumpstart_arcbox/data_ops/_index.md b/docs/azure_jumpstart_arcbox/data_ops/_index.md
deleted file mode 100644
index d5e8b87cee..0000000000
--- a/docs/azure_jumpstart_arcbox/data_ops/_index.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Jumpstart ArcBox - Data Services Operations
-
-## Azure Arc-enabled SQL Managed Instance Stress Simulation
-
-Included in ArcBox, is a dedicated SQL stress simulation tool named _SqlQueryStress_ automatically installed for you on the Client VM. _SqlQueryStress_ will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well to highlight operational practices described in the next section.
-
-* To start with, open the _SqlQueryStress_ desktop shortcut and connect to the SQL Managed Instance endpoint IP address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was also created for you alongside the username and password you used to deploy the environment.
-
-  ![Open SqlQueryStress](./SqlQueryStress.png)
-
-  ![SQLMI Endpoints text file](./endpoints.png)
-
-* To connect, use "SQL Server Authentication" and select the deployed sample _AdventureWorks_ database (you can use the "Test" button to check the connection).
-
-  ![SqlQueryStress connected](./connected.png)
-
-* To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-* As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![SqlQueryStress settings](./sqssettings.png)
-
-  ![SqlQueryStress running](./sqsrunning.png)
-
-## Azure Arc-enabled SQL Managed Instance monitoring using Grafana
-
-When deploying Azure Arc-enabled data services, a [Grafana](https://grafana.com/) instance is also automatically deployed on the same Kubernetes cluster and include built-in dashboards for both Kubernetes infrastructure as well SQL Managed Instance monitoring (PostgreSQL dashboards are included as well but we will not be covering these in this section).
-
-* Now that you have the _SqlQueryStress_ stored procedure running and generating load, we can look how this is shown in the the built-in Grafana dashboard. As part of the automation, a new URL desktop shortcut simply named "Grafana" was created.
-
-  ![Grafana desktop shortcut](./grafanashortcut.png)
-
-* [Optional] The IP address for this instance represents the Kubernetes _LoadBalancer_ external IP that was provision as part of Azure Arc-enabled data services. Use the _```kubectl get svc -n arc```_ command to view the _metricsui_ external service IP address.
-
-  ![metricsui Kubernetes service](./metricsui.png)
-
-* To log in, use the same username and password that is in the _SQLMI Endpoints_ text file desktop shortcut.
-
-  ![Grafana username and password](./grananacreds.png)
-
-* Navigate to the built-in "SQL Managed Instance Metrics" dashboard.
-
-  ![Grafana dashboards](./grananadashboards.png)
-
-  ![Grafana "SQL Managed Instance Metrics" dashboard](./grananasqldashboard.png)
-
-* Change the dashboard time range to "Last 5 minutes" and re-run the stress test using _SqlQueryStress_ (in case it was already finished).
-
-  ![Last 5 minutes time range](./fivemin.png)
-
-* You can now see how the SQL graphs are starting to show increased activity and load on the database instance.
-
-  ![Increased load activity](./activity1.png)
-
-  ![Increased load activity](./activity2.png)
diff --git a/docs/azure_jumpstart_arcbox/release_notes/_index.md b/docs/azure_jumpstart_arcbox/release_notes/_index.md
deleted file mode 100644
index c603c3dee0..0000000000
--- a/docs/azure_jumpstart_arcbox/release_notes/_index.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-type: docs
-weight: 98
-toc_hide: true
----
-
-# Jumpstart ArcBox release notes
-
-Release notes will be released on the first week of each month and will cover the previous month.
-
-## October 2021
-
-* Update required Azure CLI version to 2.25.0 or higher
-* Fix missing dependencies in ARM templates
-* Documentation revisions
-
-## September 2021
-
-* Switch inbound SQL MI port from 1433 to 11433
-* Switch inbound PostgreSQL port from 5432 to 15432
-* Remove custom-locations-oid parameter from connected cluster onboarding scripts
-* Add --kubeconfig parameter to custom location creation
-
-## August 2021
-
-* New [Azure Monitor workbook](https://azurearcjumpstart.io/azure_jumpstart_arcbox/workbook/) included that provides single pane of glass monitoring for all ArcBox resources.
-* Remove port 22 from Cluster API control plane Network Security Group
-* Update clusterctl to v0.4.2
-* Update CAPZ provider to v0.5.2
-* Update Kubernetes version to 1.20.10
-* Automation optimizations
-* Documentation revisions
-
-## July 2021
-
-* Improvements to Azure Policy experience. Updated policy names with (ArcBox) callout to easily identify policies created by ArcBox deployment. New policies to support onboarding Dependency Agents and Azure Defender for Kubernetes.
-* Add Change Tracking, Security, VMInsights solutions to deployment.
-* New troubleshooting section in documentation.
-* Add automatic provisioning for Microsoft.HybridCompute and Microsoft.GuestConfiguration resource providers.
-* Various fixes to Cluster API and Data Services components.
-* Automation optimizations and cleanup.
-
-## June 2021
-
-* Azure Arc-enabled data services components of ArcBox have been updated to use [directly connected mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity#connectivity-modes).
-* Required resource providers are now enabled automatically as part of the automation scripts.
-* Per updated Azure Arc-enabled data services requirements, ArcBox region support is restricted to East US, Northern Europe, and Western Europe.
-* Incorporated streamlined modular automation approach for Azure Arc-enabled data services used by the primary Jumpstart data services scenarios.
-
-## April 2021
-
-* This is the initial release for Jumpstart ArcBox, a project that provides an easy to deploy sandbox for all things Azure Arc. ArcBox is designed to be completely self-contained within a single Azure subscription and resource group, which will make it easy for a user to get hands-on with all available Azure Arc technologies with nothing more than an available Azure subscription.
-
-* ArcBox can be used for a wide variety of use cases including:
-  * Sandbox environment for getting hands-on with Azure Arc technologies
-  * Accelerator for Proof-of-concepts or pilots
-  * Training tool for Azure Arc skills development
-  * Demo environment for customer presentations or events
-  * Rapid integration testing platform
-
-* View the official README for details on Jumpstart ArcBox including features and usage.
-
-* If you encounter issues, bugs, or have a feature idea, submit it as an issue through GitHub and tag it with the ArcBox label.
diff --git a/docs/azure_jumpstart_arcbox/workbook/flavors/DataOps/_index.md b/docs/azure_jumpstart_arcbox/workbook/flavors/DataOps/_index.md
deleted file mode 100644
index ac468e5291..0000000000
--- a/docs/azure_jumpstart_arcbox/workbook/flavors/DataOps/_index.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-type: docs
-weight: 99
-toc_hide: true
----
-
-# Jumpstart ArcBox for DataOps - Azure Monitor Workbook
-
-ArcBox for DataOps is a special "flavor" of ArcBox that is intended for users who want to experience Azure Arc-enabled SQL Managed Instance capabilities in a sandbox environment. This document provides specific guidance on the included ArcBox [Azure Monitor Workbook](https://docs.microsoft.com/azure/azure-monitor/visualize/workbooks-overview). Please refer to the main [ArcBox documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/) for information on deploying and using ArcBox.
-
-As part of ArcBox for DataOps, an Azure Monitor workbook is deployed to provide a single pane of glass for monitoring and reporting on ArcBox resources. Using Azure's management and operations tools in hybrid, multi-cloud and edge deployments provides the consistency needed to manage each environment through a common set of governance and operations management practices. The Azure Monitor workbook acts as a flexible canvas for data analysis and visualization in the Azure portal, gathering information from several data sources from across ArcBox and combining them into an integrated interactive experience.
-
-   > **NOTE: Due to the number of Azure resources included in a single ArcBox deployment and the data ingestion and analysis required, it is expected that metrics and telemetry for the workbook can take several hours to be fully available.**
-
-## Access the ArcBox for DataOps workbook
-
-The Jumpstart ArcBox workbook is automatically deployed for you as part of ArcBox's advanced automation. To access the Jumpstart ArcBox workbook use the Azure portal to follow the next steps.
-
-- From the ArcBox resource group, select the Azure Workbook, then click "Open Workbook"
-
-   ![Workbook Gallery](./azure_workbook.png)
-
-   ![Workbook Gallery](./open_workbook.png)
-
-- The Jumpstart ArcBox Workbook will be displayed.
-
-   ![Arcbox workbook overview](./workbook_overview.png)
-
-## ArcBox Workbook for DataOps capabilities
-
-The ArcBox Workbook is a single report that combines data from different sources and services, providing a unified view across resources, enabling richer data and insights for unified operations.
-
-The Workbook is organized into several tabs that provide easier navigation and separation of concerns.
-
-![Tab Menu](./tab_menu.png)
-
-### Inventory
-
-By using Azure Arc, your on-premises and multi-cloud resources become visible through Azure Resource Manager. Therefore, you can use tools such as Azure Resource Graph as a way to explore your inventory at scale. Your Azure Resource Graph queries can now include Azure Arc-enabled resources with filtering, using tags, or tracking changes.
-
-The "Inventory" tab in the ArcBox Workbook has three sections:
-
-- _parameters_ - use the drop-down menu to select your subscription and resource group, you also get the option to filter the report by resource type.
-
-   ![Inventory Parameters](./inventory_parameters.png)
-
-- _Resource Count by Type_ - this visualization shows the number of resources by type within a resource group, these grouping will be automatically refreshed if the parameters section is changed.
-
-   ![Inventory Resource by type](./inventory_count_by_type.png)
-
-- _Resource List_ - this table shows a list of resources in the resource group provided in the parameters section. This is an interactive list, therefore you can click on any resource or tag for additional information.
-
-   ![Inventory Resource List](./inventory_resource_list.png)
-
-### Monitoring
-
-Enabling a resource in Azure Arc gives you the ability to perform configuration management and monitoring tasks on those services as if they were first-class citizens in Azure. You are able to monitor your Kubernetes clusters at the scope of the resource with container Insights and your Azure Arc-enabled SQL Managed Instances. In ArcBox for DataOps the Azure Arc-enabled Kubernetes clusters have been onboarded onto Azure Monitor.
-
-The "Monitoring" tab of the Jumpstart Workbook shows metrics and alerts for ArcBox resources organized in three sections:
-
-- _Alert Summary_ - Shows an overview of alerts organized by severity and status. You can use the drop-down menus to apply filters to the report. The following filters are available:
-  - Subscription: select one or multiple subscriptions in your environment to show available alerts.
-  - Resource Group: select one or more resource groups in your environment to show available alerts.
-  - Resource Type: select one or multiple resource types to show its alerts.
-  - Resources: select individual resources by name to visualize their alerts.
-  - Time Range: provide a time range in which the alert has been created.
-  - State: choose the alert type between New, Acknowledged, or Closed.
-
-   ![Monitoring Alert Summary](./monitoring_alert_summary.png)
-
-- _Azure Arc-enabled Kubernetes_ - Shows information and metrics from ArcBox's Azure Arc-enabled Kubernetes clusters. Use the parameters section to filter data:
-  - Time Range: provide a time range for the metrics and logs to be displayed.
-  - Subscription: select your subscription where ArcBox is deployed.
-  - Log Analytics Workspace: select ArcBox's Log Analytics workspace.
-  - Azure Arcenabled K8s cluster: choose one of ArcBox's Azure Arc-enabled Kubernetes clusters.
-  - Workload Type: choose one or multiple kubernetes deployment types.
-  - Namespace: choose one or multiple namespaces in the Kubernetes cluster.
-  - Workload Name: choose one of the deployments in your cluster.
-  - Pod Status: filter by Pod status like Pending/Running/Failed etc.
-  - Pod Name: filter by pod name in the namespace and workload name selected.
-
-  With this report you will get several visualizations:
-
-  - _Pod and Container restart trend graphs._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_1.png)
-
-  - _Pod count and status chart._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_2.png)
-
-  - _A list of the container status for pods._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_3.png)
-
-  - _The Kubernetes cluster's nodes CPU and memory working set percentage._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_4.png)
-
-  - _The Arc-enabled SQL Managed Instance CPU usage._
-
-     ![Monitoring Azure Arc-enabled SQL Managed Instance CPU usage](./monitoring_arc_sqlmi_1.png)
-
-  - _The Arc-enabled SQL Managed Instance memory usage._
-
-     ![Monitoring Azure Arc-enabled SQL Managed Instance memory usage](./monitoring_arc_sqlmi_2.png)
-
-  - _The Arc-enabled SQL Managed Instance Transactions per seconds._
-
-     ![Monitoring Azure Arc-enabled SQL Managed Instance transactions per second](./monitoring_arc_sqlmi_3.png)
-
-### Security
-
-Microsoft Defender for Cloud can monitor the security posture of your hybrid and multi-cloud deployments that have been onboarded onto Azure Arc. Once those deployments are registered in Azure, you can take care of the security baseline and audit, apply, or automate requirements from recommended security controls as well as identify and provide mitigation guidance for security-related business risks.
-
-The "Security" tab of the Jumpstart Workbook shows insights from Microsoft Defender for Cloud assessments. To be able to use this report, you will need to configure "continuous export" capability to export Microsoft Defender for Cloud's data to ArcBox's Log Analytics workspace:
-
-- From Microsoft Defender for Cloud's sidebar, select Environment Settings.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_1.png)
-
-- Select the specific subscription for which you want to configure the data export.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_2.png)
-
-- From the sidebar of the settings page for that subscription, select Continuous Export, set the export target to the Log Analytics workspace, and set the data types to Security recommendations and Secure Score (Preview) and leave the export frequency at the default values.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_3.png)
-
-- Make sure to select ArcBox's subscription, resource group, and Log Analytics workspace as the export target. Select Save.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_4.png)
-
-Once configured, the report will provide an overview of the secure score, you can filter information by using the parameters section:
-
-- _Workspace_ -  Select one or multiple Log Analytics workspaces.
-
-- _Time Range_ -  Filter the data of the report to one of the predefined time ranges.
-
-   ![Security parameters](./security_parameters.png)
-
-  With this report you will get several visualizations:
-
-  - _Current score trends per subscription_
-
-     ![Security workbook trends](./security_trends.png)
-
-  - _Aggregated score for selected subscriptions over time_
-
-     ![Security workbook aggregated score](./security_score.png)
-
-  - _Top recommendations with the recent increase in unhealthy resources_
-
-     ![Security tab top recommendations](./security_recommendations.png)
-
-  - _Security controls scores over time (weekly)_
-
-     ![Security controls scores overtime](./security_controls.png)
-
-  - _Resources changed over time_ - To view changes over time on a specific recommendation, please select any from the list above.
-
-     ![Resources changed overtime](./security_changes.png)
-
-     ![Resources changed overtime selected resources](./security_changes_resource.png)
diff --git a/docs/azure_jumpstart_arcbox/workbook/flavors/DevOps/_index.md b/docs/azure_jumpstart_arcbox/workbook/flavors/DevOps/_index.md
deleted file mode 100644
index 2c69c07de5..0000000000
--- a/docs/azure_jumpstart_arcbox/workbook/flavors/DevOps/_index.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-type: docs
-weight: 99
-toc_hide: true
----
-
-# Jumpstart ArcBox for DevOps - Azure Monitor Workbook
-
-ArcBox for DevOps is a special "flavor" of ArcBox that is intended for users who want to experience Azure Arc-enabled Kubernetes capabilities in a sandbox environment. This document provides specific guidance on the included ArcBox [Azure Monitor Workbook](https://docs.microsoft.com/azure/azure-monitor/visualize/workbooks-overview). Please refer to the main [ArcBox documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/) for information on deploying and using ArcBox.
-
-As part of ArcBox for DevOps, an Azure Monitor workbook is deployed to provide a single pane of glass for monitoring and reporting on ArcBox resources. Using Azure's management and operations tools in hybrid, multi-cloud and edge deployments provides the consistency needed to manage each environment through a common set of governance and operations management practices. The Azure Monitor workbook acts as a flexible canvas for data analysis and visualization in the Azure portal, gathering information from several data sources from across ArcBox and combining them into an integrated interactive experience.
-
-   > **NOTE: Due to the number of Azure resources included in a single ArcBox deployment and the data ingestion and analysis required, it is expected that metrics and telemetry for the workbook can take several hours to be fully available.**
-
-## Access the ArcBox for DevOps workbook
-
-The Jumpstart ArcBox workbook is automatically deployed for you as part of ArcBox's advanced automation. To access the Jumpstart ArcBox workbook use the Azure portal to follow the next steps.
-
-- From the ArcBox resource group, select the Azure Workbook, then click "Open Workbook"
-
-   ![Workbook Gallery](./azure_workbook.png)
-
-   ![Workbook Gallery](./open_workbook.png)
-
-- The Jumpstart ArcBox Workbook will be displayed.
-
-   ![Arcbox workbook overview](./workbook_overview.png)
-
-## ArcBox Workbook for DevOps capabilities
-
-The ArcBox Workbook is a single report that combines data from different sources and services, providing a unified view across resources, enabling richer data and insights for unified operations.
-
-The Workbook is organized into several tabs that provide easier navigation and separation of concerns.
-
-![Tab Menu](./tab_menu.png)
-
-### Inventory
-
-By using Azure Arc, your on-premises and multi-cloud resources become visible through Azure Resource Manager. Therefore, you can use tools such as Azure Resource Graph as a way to explore your inventory at scale. Your Azure Resource Graph queries can now include Azure Arc-enabled resources with filtering, using tags, or tracking changes.
-
-The "Inventory" tab in the ArcBox Workbook has three sections:
-
-- _parameters_ - use the drop-down menu to select your subscription and resource group, you also get the option to filter the report by resource type.
-
-   ![Inventory Parameters](./inventory_parameters.png)
-
-- _Resource Count by Type_ - this visualization shows the number of resources by type within a resource group, these grouping will be automatically refreshed if the parameters section is changed.
-
-   ![Inventory Resource by type](./inventory_count_by_type.png)
-
-- _Resource List_ - this table shows a list of resources in the resource group provided in the parameters section. This is an interactive list, therefore you can click on any resource or tag for additional information.
-
-   ![Inventory Resource List](./inventory_resource_list.png)
-
-### Monitoring
-
-Enabling a resource in Azure Arc gives you the ability to perform configuration management and monitoring tasks on those services as if they were first-class citizens in Azure. You are able to monitor your Kubernetes clusters at the scope of the resource with container Insights. In ArcBox for DevOps the Azure Arc-enabled Kubernetes clusters have been onboarded onto Azure Monitor.
-
-The "Monitoring" tab of the Jumpstart Workbook shows metrics and alerts for ArcBox resources organized in three sections:
-
-- _Alert Summary_ - Shows an overview of alerts organized by severity and status. You can use the drop-down menus to apply filters to the report. The following filters are available:
-  - Subscription: select one or multiple subscriptions in your environment to show available alerts.
-  - Resource Group: select one or more resource groups in your environment to show available alerts.
-  - Resource Type: select one or multiple resource types to show its alerts.
-  - Resources: select individual resources by name to visualize their alerts.
-  - Time Range: provide a time range in which the alert has been created.
-  - State: choose the alert type between New, Acknowledged, or Closed.
-
-   ![Monitoring Alert Summary](./monitoring_alert_summary.png)
-
-- _Azure Arc-enabled Kubernetes_ - Shows information and metrics from ArcBox's Azure Arc-enabled Kubernetes clusters. Use the parameters section to filter data:
-  - Time Range: provide a time range for the metrics and logs to be displayed.
-  - Subscription: select your subscription where ArcBox is deployed.
-  - Log Analytics Workspace: select ArcBox's Log Analytics workspace.
-  - Azure Arcenabled K8s cluster: choose one of ArcBox's Azure Arc-enabled Kubernetes clusters.
-  - Workload Type: choose one or multiple kubernetes deployment types.
-  - Namespace: choose one or multiple namespaces in the Kubernetes cluster.
-  - Workload Name: choose one of the deployments in your cluster.
-  - Pod Status: filter by Pod status like Pending/Running/Failed etc.
-  - Pod Name: filter by pod name in the namespace and workload name selected.
-
-  With this report you will get several visualizations:
-
-  - _Pod and Container restart trend graphs._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_1.png)
-
-  - _Pod count and status chart._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_2.png)
-
-  - _A list of the container status for pods._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_3.png)
-
-  - _The Kubernetes cluster's nodes CPU and memory working set percentage._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_4.png)
-
-### Security
-
-Microsoft Defender for Cloud can monitor the security posture of your hybrid and multi-cloud deployments that have been onboarded onto Azure Arc. Once those deployments are registered in Azure, you can take care of the security baseline and audit, apply, or automate requirements from recommended security controls as well as identify and provide mitigation guidance for security-related business risks.
-
-The "Security" tab of the Jumpstart Workbook shows insights from Microsoft Defender for Cloud assessments. To be able to use this report, you will need to configure "continuous export" capability to export Microsoft Defender for Cloud's data to ArcBox's Log Analytics workspace:
-
-- From Microsoft Defender for Cloud's sidebar, select Environment Settings.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_1.png)
-
-- Select the specific subscription for which you want to configure the data export.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_2.png)
-
-- From the sidebar of the settings page for that subscription, select Continuous Export, set the export target to the Log Analytics workspace, and set the data types to Security recommendations and Secure Score (Preview) and leave the export frequency at the default values.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_3.png)
-
-- Make sure to select ArcBox's subscription, resource group, and Log Analytics workspace as the export target. Select Save.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_4.png)
-
-Once configured, the report will provide an overview of the secure score, you can filter information by using the parameters section:
-
-- _Workspace_ -  Select one or multiple Log Analytics workspaces.
-
-- _Time Range_ -  Filter the data of the report to one of the predefined time ranges.
-
-   ![Security parameters](./security_parameters.png)
-
-  With this report you will get several visualizations:
-
-  - _Current score trends per subscription_
-
-     ![Security workbook trends](./security_trends.png)
-
-  - _Aggregated score for selected subscriptions over time_
-
-     ![Security workbook aggregated score](./security_score.png)
-
-  - _Top recommendations with the recent increase in unhealthy resources_
-  
-     ![Security tab top recommendations](./security_recommendations.png)
-
-  - _Security controls scores over time (weekly)_
-
-     ![Security controls scores overtime](./security_controls.png)
-
-  - _Resources changed over time_ - To view changes over time on a specific recommendation, please select any from the list above.
-
-     ![Resources changed overtime](./security_changes.png)
-
-     ![Resources changed overtime selected resources](./security_changes_resource.png)
-
-- _Machines not reporting to Log Analytics workspace_ - this has four lists of machines that are not sending heartbeats to the Log Analytics workspace in different periods of time: 15 minutes, 24 hours, 48 hours and 7 days. Please not that there are no machines listed on the image as all of them are properly sending heartbeats to the workspace.
-
-   ![Machines not reporting](./agentmgmt_machinesnotreport.png)
-
-- _Security status_ - has a full report of Azure VMs and Azure Arc-enabled-servers security configurations including its Log Analytics workspace and the agent status.
-
-   ![Security Status](./agentmgmt_securitystatus.png)
diff --git a/docs/azure_jumpstart_arcbox/workbook/flavors/Full/_index.md b/docs/azure_jumpstart_arcbox/workbook/flavors/Full/_index.md
deleted file mode 100644
index 555bdaeb93..0000000000
--- a/docs/azure_jumpstart_arcbox/workbook/flavors/Full/_index.md
+++ /dev/null
@@ -1,182 +0,0 @@
----
-type: docs
-weight: 99
-toc_hide: true
----
-
-# Jumpstart ArcBox - Azure Monitor Workbook
-
-[ArcBox](https://azurearcjumpstart.io/azure_jumpstart_arcbox/) is a solution that provides an easy to deploy sandbox for all things Azure Arc. This document provides specific guidance on the included ArcBox [Azure Monitor Workbook](https://docs.microsoft.com/azure/azure-monitor/visualize/workbooks-overview). Please refer to the main [ArcBox documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/) for information on deploying and using ArcBox.
-
-As part of ArcBox, an Azure Monitor workbook is deployed to provide a single pane of glass for monitoring and reporting on ArcBox resources. Using Azure's management and operations tools in hybrid, multi-cloud and edge deployments provides the consistency needed to manage each environment through a common set of governance and operations management practices. The Azure Monitor workbook acts as a flexible canvas for data analysis and visualization in the Azure portal, gathering information from several data sources from across ArcBox and combining them into an integrated interactive experience.
-
-   > **NOTE: Due to the number of Azure resources included in a single ArcBox deployment and the data ingestion and analysis required, it is expected that metrics and telemetry for the workbook can take several hours to be fully available.**
-
-## Access the ArcBox workbook
-
-The Jumpstart ArcBox workbook is automatically deployed for you as part of ArcBox's advanced automation. To access the Jumpstart ArcBox workbook use the Azure portal to follow the next steps.
-
-- From the ArcBox resource group, select the Azure Workbook, then click "Open Workbook"
-
-   ![Workbook Gallery](./azure_workbook.png)
-
-   ![Workbook Gallery](./open_workbook.png)
-
-- The Jumpstart ArcBox Workbook will be displayed.
-
-   ![Arcbox workbook overview](./workbook_overview.png)
-
-## ArcBox Workbook capabilities
-
-The ArcBox Workbook is a single report that combines data from different sources and services, providing a unified view across resources, enabling richer data and insights for unified operations.
-
-The Workbook is organized into several tabs that provide easier navigation and separation of concerns.
-
-![Tab Menu](./tab_menu.png)
-
-### Inventory
-
-By using Azure Arc, your on-premises and multi-cloud resources become visible through Azure Resource Manager. Therefore, you can use tools such as Azure Resource Graph as a way to explore your inventory at scale. Your Azure Resource Graph queries can now include Azure Arc-enabled resources with filtering, using tags, or tracking changes.
-
-The "Inventory" tab in the ArcBox Workbook has three sections:
-
-- _parameters_ - use the drop-down menu to select your subscription and resource group, you also get the option to filter the report by resource type.
-
-   ![Inventory Parameters](./inventory_parameters.png)
-
-- *Resource Count by Type* - this visualization shows the number of resources by type within a resource group, these grouping will be automatically refreshed if the parameters section is changed.
-
-   ![Inventory Resource by type](./inventory_count_by_type.png)
-
-- _Resource List_ - this table shows a list of resources in the resource group provided in the parameters section. This is an interactive list, therefore you can click on any resource or tag for additional information.
-
-   ![Inventory Resource List](./inventory_resource_list.png)
-
-### Monitoring
-
-Enabling a resource in Azure Arc gives you the ability to perform configuration management and monitoring tasks on those services as if they were first-class citizens in Azure. You are able to monitor your connected machine guest operating system performance and your Kubernetes clusters at the scope of the resource with VM and container Insights. In ArcBox the Azure Arc-enabled servers and Azure Arc-enabled Kubernetes clusters have been onboarded onto Azure Monitor.
-
-The "Monitoring" tab of the Jumpstart Workbook shows metrics and alerts for ArcBox resources organized in three sections:
-
-- _Alert Summary_ - Shows an overview of alerts organized by severity and status. You can use the drop-down menus to apply filters to the report. The following filters are available:
-  - Subscription: select one or multiple subscriptions in your environment to show available alerts.
-  - Resource Group: select one or more resource groups in your environment to show available alerts.
-  - Resource Type: select one or multiple resource types to show its alerts.
-  - Resources: select individual resources by name to visualize their alerts.
-  - Time Range: provide a time range in which the alert has been created.
-  - State: choose the alert type between New, Acknowledged, or Closed.
-
-   ![Monitoring Alert Summary](./monitoring_alert_summary.png)
-
-- _Azure Arc-enabled servers_ - Shows metrics for CPU and memory usage on the Azure Arc-enabled servers. Use the parameters section to select the Azure Arc-enabled server as well as a time range to visualize the data.
-
-   ![Monitoring Azure Arc-enabled Server Metrics](./monitoring_arc_servers.png)
-
-- _Azure Arc-enabled Kubernetes_ - Shows information and metrics from ArcBox's Azure Arc-enabled Kubernetes clusters. Use the parameters section to filter data:
-  - Time Range: provide a time range for the metrics and logs to be displayed.
-  - Subscription: select your subscription where ArcBox is deployed.
-  - Log Analytics Workspace: select ArcBox's Log Analytics workspace.
-  - Azure Arc-enabled Kubernetes cluster: choose one of ArcBox's Azure Arc-enabled Kubernetes clusters.
-  - Workload Type: choose one or multiple kubernetes deployment types.
-  - Namespace: choose one or multiple namespaces in the Kubernetes cluster.
-  - Workload Name: choose one of the deployments in your cluster.
-  - Pod Status: filter by Pod status like Pending/Running/Failed etc.
-  - Pod Name: filter by pod name in the namespace and workload name selected.
-
-  With this report you will get several visualizations:
-
-  - _Pod and Container restart trend graphs._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_1.png)
-
-  - _Pod count and status chart._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_2.png)
-
-  - _A list of the container status for pods._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_3.png)
-
-  - _The Kubernetes cluster's nodes CPU and memory working set percentage._
-
-     ![Monitoring Azure Arc-enabled Kubernetes Metrics](./monitoring_arc_kubernetes_4.png)
-
-### Security
-
-Microsoft Defender for Cloud can monitor the security posture of your hybrid and multi-cloud deployments that have been onboarded onto Azure Arc. Once those deployments are registered in Azure, you can take care of the security baseline and audit, apply, or automate requirements from recommended security controls as well as identify and provide mitigation guidance for security-related business risks.
-
-The "Security" tab of the Jumpstart Workbook shows insights from Microsoft Defender for Cloud assessments. To be able to use this report, you will need to configure "continuous export" capability to export Microsoft Defender for Cloud's data to ArcBox's Log Analytics workspace:
-
-- From Microsoft Defender for Cloud's sidebar, select Environment Settings.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_1.png)
-
-- Select the specific subscription for which you want to configure the data export.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_2.png)
-
-- From the sidebar of the settings page for that subscription, select Continuous Export, set the export target to the Log Analytics workspace, and set the data types to Security recommendations and Secure Score (Preview) and leave the export frequency at the default values.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_3.png)
-
-- Make sure to select ArcBox's subscription, resource group, and Log Analytics workspace as the export target. Select Save.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_4.png)
-
-Once configured, the report will provide an overview of the secure score, you can filter information by using the parameters section:
-
-- _Workspace_ -  Select one or multiple Log Analytics workspaces.
-
-- _Time Range_ -  Filter the data of the report to one of the predefined time ranges.
-
-   ![Security parameters](./security_parameters.png)
-
-  With this report you will get several visualizations:
-
-  - _Current score trends per subscription_
-
-     ![Security workbook trends](./security_trends.png)
-
-  - _Aggregated score for selected subscriptions over time_
-
-     ![Security workbook aggregated score](./security_score.png)
-
-  - _Top recommendations with the recent increase in unhealthy resources_
-  
-     ![Security tab top recommendations](./security_recommendations.png)
-
-  - _Security controls scores over time (weekly)_
-
-     ![Security controls scores overtime](./security_controls.png)
-
-  - _Resources changed over time_ - To view changes over time on a specific recommendation, please select any from the list above.
-
-     ![Resources changed overtime](./security_changes.png)
-
-     ![Resources changed overtime selected resources](./security_changes_resource.png)
-
-This part of the workbook also includes a section dedicated to agent monitoring. For Microsoft Defender for Cloud to be able to monitor an Azure Arc-enabled-servers certain configurations have to be in place and the workbook will help visualize machines that may not be properly reporting to the Log Analytics workspace.
-
-In the parameters section select the Log Analytics workspace used by ArcBox.
-
-   ![Resources changed overtime](./agentmgmt_parameters.png)
-
-From within the Agent Monitoring section you will get several tabs:
-
-- _Overview_ - with three visualizations:
-
-  - _Azure Monitor Agent installation status_ shows the Azure Monitor Agent installation status as reported by Microsoft Defender for Cloud.
-
-  - _Azure Monitor Agent reporting status_ shows the current Azure Monitor Agent reporting status of the Azure Arc-enabled servers. Machines that are sending current heartbeat information within the last 15 minutes are considered as currently reporting.
-
-  - _Microsoft Defender for Cloud coverage_ shows the status of Microsoft Defender for Cloud for Servers across all servers that are protected by Microsoft Defender for Cloud.
-
-      ![Azure Monitor Agent installation status](./agentmgmt_overviewstatus.png)
-
-- _Machines not reporting to Log Analytics workspace_ - this has four lists of machines that are not sending heartbeats to the Log Analytics workspace in different periods of time: 15 minutes, 24 hours, 48 hours and 7 days. Please not that there are no machines listed on the image as all of them are properly sending heartbeats to the workspace.
-
-   ![Machines not reporting](./agentmgmt_machinesnotreport.png)
-
-- _Security status_ - has a full report of Azure VMs and Azure Arc-enabled-servers security configurations including its Log Analytics workspace and the agent status.
-
-   ![Security Status](./agentmgmt_securitystatus.png)
diff --git a/docs/azure_jumpstart_arcbox/workbook/flavors/ITPro/_index.md b/docs/azure_jumpstart_arcbox/workbook/flavors/ITPro/_index.md
deleted file mode 100644
index a06886b0f3..0000000000
--- a/docs/azure_jumpstart_arcbox/workbook/flavors/ITPro/_index.md
+++ /dev/null
@@ -1,157 +0,0 @@
----
-type: docs
-weight: 99
-toc_hide: true
----
-
-# Jumpstart ArcBox for IT Pros - Azure Monitor Workbook
-
-ArcBox for IT Pros is a special "flavor" of ArcBox that is intended for users who want to experience Azure Arc-enabled servers capabilities in a sandbox environment. This document provides specific guidance on the included ArcBox [Azure Monitor Workbook](https://docs.microsoft.com/azure/azure-monitor/visualize/workbooks-overview). Please refer to the main [ArcBox documentation](https://azurearcjumpstart.io/azure_jumpstart_arcbox/) for information on deploying and using ArcBox.
-
-As part of ArcBox for IT Pros, an Azure Monitor workbook is deployed to provide a single pane of glass for monitoring and reporting on ArcBox resources. Using Azure's management and operations tools in hybrid, multi-cloud and edge deployments provides the consistency needed to manage each environment through a common set of governance and operations management practices. The Azure Monitor workbook acts as a flexible canvas for data analysis and visualization in the Azure portal, gathering information from several data sources from across ArcBox and combining them into an integrated interactive experience.
-
-   > **Note: Due to the number of Azure resources included in a single ArcBox deployment and the data ingestion and analysis required, it is expected that metrics and telemetry for the workbook can take several hours to be fully available.**
-
-## Access the ArcBox for IT Pros workbook
-
-The Jumpstart ArcBox workbook is automatically deployed for you as part of ArcBox's advanced automation. To access the Jumpstart ArcBox workbook use the Azure portal to follow the next steps.
-
-- From the ArcBox resource group, select the Azure Workbook, then click "Open Workbook"
-
-   ![Workbook Gallery](./azure_workbook.png)
-
-   ![Workbook Gallery](./open_workbook.png)
-
-- The Jumpstart ArcBox for IT Pros Workbook will be displayed.
-
-   ![Arcbox for IT Pros workbook overview](./workbook_overview.png)
-
-## ArcBox for IT Pros Workbook capabilities
-
-The ArcBox for IT Pros Workbook is a single report that combines data from different sources and services, providing a unified view across resources, enabling richer data and insights for unified operations.
-
-The Workbook is organized into several tabs that provide easier navigation and separation of concerns.
-
-![Tab Menu](./tab_menu.png)
-
-### Inventory
-
-By using Azure Arc, your on-premises and multi-cloud resources become visible through Azure Resource Manager. Therefore, you can use tools such as Azure Resource Graph as a way to explore your inventory at scale. Your Azure Resource Graph queries can now include Azure Arc-enabled resources with filtering, using tags, or tracking changes.
-
-The "Inventory" tab in the ArcBox for IT Pros Workbook has three sections:
-
-- _parameters_ - use the drop-down menu to select your subscription and resource group, you also get the option to filter the report by resource type.
-
-   ![Inventory Parameters](./inventory_parameters.png)
-
-- *Resource Count by Type* - this visualization shows the number of resources by type within a resource group, these grouping will be automatically refreshed if the parameters section is changed.
-
-   ![Inventory Resource by type](./inventory_count_by_type.png)
-
-- _Resource List_ - this table shows a list of resources in the resource group provided in the parameters section. This is an interactive list, therefore you can click on any resource or tag for additional information.
-
-   ![Inventory Resource List](./inventory_resource_list.png)
-
-### Monitoring
-
-Enabling a resource in Azure Arc gives you the ability to perform configuration management and monitoring tasks on those services as if they were first-class citizens in Azure. You are able to monitor your connected machine guest operating system performance at the scope of the resource with VM insights. In ArcBox for IT Pros the Azure Arc-enabled servers have been onboarded onto Azure Monitor.
-
-The "Monitoring" tab of the Jumpstart Workbook shows metrics and alerts for ArcBox for IT Pros resources organized in three sections:
-
-- _Alert Summary_ - Shows an overview of alerts organized by severity and status. You can use the drop-down menus to apply filters to the report. The following filters are available:
-  - Subscription: select one or multiple subscriptions in your environment to show available alerts.
-  - Resource Group: select one or more resource groups in your environment to show available alerts.
-  - Resource Type: select one or multiple resource types to show its alerts.
-  - Resources: select individual resources by name to visualize their alerts.
-  - Time Range: provide a time range in which the alert has been created.
-  - State: choose the alert type between New, Acknowledged, or Closed.
-
-   ![Monitoring Alert Summary](./monitoring_alert_summary.png)
-
-- _Azure Arc-enabled servers_ - Shows metrics for CPU and memory usage on the Azure Arc-enabled servers. Use the parameters section to select the Azure Arc-enabled server as well as a time range to visualize the data.
-
-   ![Monitoring Azure Arc-enabled server Metrics](./monitoring_arc_servers.png)
-
-### Microsoft Defender for Cloud
-
-Microsoft Defender for Cloud can monitor the security posture of your hybrid and multi-cloud deployments that have been onboarded onto Azure Arc. Once those deployments are registered in Azure, you can take care of the security baseline and audit, apply, or automate requirements from recommended security controls as well as identify and provide mitigation guidance for security-related business risks.
-
-The "Security" tab of the Jumpstart Workbook shows insights from Microsoft Defender for Cloud assessments. To be able to use this report, you will need to configure "continuous export" capability to export Microsoft Defender for Cloud's data to ArcBox's Log Analytics workspace:
-
-- From Microsoft Defender for Cloud's sidebar, select Environment Settings.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_1.png)
-
-- Select the specific subscription for which you want to configure the data export.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_2.png)
-
-- From the sidebar of the settings page for that subscription, select Continuous Export, set the export target to the Log Analytics workspace, and set the data types to Security recommendations and Secure Score (Preview) and leave the export frequency at the default values.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_3.png)
-
-- Make sure to select ArcBox's subscription, resource group, and Log Analytics workspace as the export target. Select Save.
-
-   ![Microsoft Defender for Cloud Configuration](./security_center_config_4.png)
-
-Once configured, the report will provide an overview of the secure score, you can filter information by using the parameters section:
-
-- _Workspace_ -  Select one or multiple Log Analytics workspaces.
-
-- _Time Range_ -  Filter the data of the report to one of the predefined time ranges.
-
-   ![Security parameters](./security_parameters.png)
-
-  With this report you will get several visualizations:
-
-  - _Current score trends per subscription_
-
-     ![Security workbook trends](./security_trends.png)
-
-  - _Aggregated score for selected subscriptions over time_
-
-     ![Security workbook aggregated score](./security_score.png)
-
-  - _Top recommendations with the recent increase in unhealthy resources_
-  
-     ![Security tab top recommendations](./security_recommendations.png)
-
-  - _Security controls scores over time (weekly)_
-
-     ![Security controls scores overtime](./security_controls.png)
-
-  - _Resources changed over time_ - To view changes over time on a specific recommendation, please select any from the list above.
-
-     ![Resources changed overtime](./security_changes.png)
-
-     ![Resources changed overtime selected resources](./security_changes_resource.png)
-
-This part of the workbook also includes a section dedicated to agent monitoring. For Azure Defender to be able to monitor an Azure Arc-enabled-servers certain configurations have to be in place and the workbook will help visualize machines that may not be properly reporting to the Log Analytics workspace.
-
-In the parameters section select the Log Analytics workspace used by ArcBox.
-
-   ![Agent Management](./agentmgmt_parameters.png)
-
-From within the Agent Monitoring section you will get several tabs:
-
-- _Overview_ - with three visualizations:
-
-  - _Azure Monitor Agent installation status_ shows the Azure Monitor Agent installation status as reported by Microsoft Defender for Cloud.
-
-     ![Azure Monitor Agent installation status](./agentmgmt_overviewstatus.png)
-
-  - _Azure Monitor Agent reporting status_ shows the current Azure Monitor Agent reporting status of the Azure Arc-enabled servers. Machines that are sending current heartbeat information within the last 15 minutes are considered as currently reporting.
-
-     ![Azure Monitor Agent reporting status](./agentmgmt_overviewsreport.png)
-
-  - _Azure Defender coverage_ shows the status of Azure Defender for Servers across all servers that are protected by Microsoft Defender for Cloud.
-
-     ![Azure Defender coverage](./agentmgmt_overviewscoverage.png)
-
-- _Machines not reporting to Log Analytics workspace_ - this has four lists of machines that are not sending heartbeats to the Log Analytics workspace in different periods of time: 15 minutes, 24 hours, 48 hours and 7 days. Please not that there are no machines listed on the image as all of them are properly sending heartbeats to the workspace.
-
-   ![Machines not reporting](./agentmgmt_machinesnotreport.png)
-
-- _Security status_ - has a full report of Azure VMs and Azure Arc-enabled-servers security configurations including its Log Analytics workspace and the agent status.
-
-   ![Security Status](./agentmgmt_securitystatus.png)
diff --git a/docs/azure_jumpstart_hcibox/AKS/_index.md b/docs/azure_jumpstart_hcibox/AKS/_index.md
deleted file mode 100644
index 94d87e2d97..0000000000
--- a/docs/azure_jumpstart_hcibox/AKS/_index.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Jumpstart HCIBox - Azure Kubernetes Service
-
-## Azure Kubernetes Service on Azure Stack HCI
-
-Azure Stack HCI can provide host infrastructure for [Azure Kubernetes Service clusters](https://learn.microsoft.com/azure-stack/aks-hci/). HCIBox comes pre-configured with Azure Kubernetes Service on HCI (AKS-HCI). To see this in action, navigate to the resource group where you deployed HCIBox and follow these steps.
-
-- Open the resource group and group by type to see the Kubernetes clusters deployed with HCIBox. We can see two clusters here. The first cluster with the long _guid_ for a name is the [management cluster](https://learn.microsoft.com/azure-stack/aks-hci/kubernetes-concepts#the-management-cluster). This is a cluster used by AKS-HCI to manage AKS-HCI [workload clusters](https://learn.microsoft.com/azure-stack/aks-hci/kubernetes-concepts#the-workload-cluster). The second cluster with the name prefix _hcibox-aks_ is a workload cluster.
-
-  ![Screenshot showing clusters in resource group](./rg_aks.png)
-
-- Click on the workload cluster resource to drill into it. We can see this cluster was onboarded as an [Arc-enabled Kubernetes cluster](https://learn.microsoft.com/azure/azure-arc/kubernetes/overview).
-
-  ![Screenshot showing clusters in resource group](./aks_cluster_detail.png)
-
-- We can also view Kubernetes resources on the cluster from Azure portal. To do this you will need a service account bearer token. You can create one by opening the C:\HCIBox folder and running the GetServiceAccountBearerToken.ps1 script by right clicking on it and selecting "Run with PowerShell".
-
-  ![Screenshot showing how to run the service account bearer token generating script](./run_token_script.png)
-
-- After the script completes it will pause to allow you to copy the token. Highlight the token and right click to copy it.
-
-  ![Screenshot showing the script running](./run_token_script_result.png)
-
-- Navigate to the workload cluster in Azure portal and select Namespaces under Kubernetes resources (preview). After signing in with the token your Kubernetes resources will be available to view from Azure portal.
-
-  ![Screenshot showing Kubernetes token page in Azure portal](./enter_token_portal.png)
-
-  ![Screenshot showing Kubernetes resources in Azure portal](./k8s_resources_portal.png)
-
-- We can deploy configurations for this workload cluster automatically from source using [GitOps](https://learn.microsoft.com/azure/azure-arc/kubernetes/tutorial-use-gitops-connected-cluster). HCIBox includes a script that will automatically configure a simple "Hello Arc" application and ingress controller on the AKS cluster.
-
-- Open up Windows Explorer on the _HCIBox-Client_ and navigate to the _C:\HCIBox_ folder. From here, right click on the "_Deploy-GitOps.ps1_" file and run with PowerShell.
-
-  ![Screenshot showing starting GitOps script](./deploy_gitops.png)
-
-  ![Screenshot showing running GitOps script](./deploying_gitops.png)
-
-- Once this script completes you will have a "Hello-Arc" icon on desktop of AdminCenter computer. Open this link to see the Hello Arc application deployed on your cluster.
-
-  ![Screenshot showing Hello Arc link](./hello_arc_desktop.png)
-
-  ![Screenshot showing Hello Arc app](./hello_arc.png)
-
-## Next steps
-
-Azure Kubernetes Service on Azure Stack HCI provides many more capabilities not directly covered here. Review the documentation to continue your journey with [AKS on HCI](https://learn.microsoft.com/azure-stack/aks-hci/).
diff --git a/docs/azure_jumpstart_hcibox/RB/_index.md b/docs/azure_jumpstart_hcibox/RB/_index.md
deleted file mode 100644
index 0cb5ce152c..0000000000
--- a/docs/azure_jumpstart_hcibox/RB/_index.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Jumpstart HCIBox - Virtual machine provisioning with Azure Arc
-
-Azure Stack HCI supports [VM provisioning the Azure portal](https://learn.microsoft.com/azure-stack/hci/manage/azure-arc-enabled-virtual-machines). HCIBox is pre-configured with [Arc resource bridge](https://learn.microsoft.com/azure-stack/hci/manage/azure-arc-enabled-virtual-machines#what-is-azure-arc-resource-bridge) to support this capability.
-
-  > **NOTE: Resource bridge only supports deploying a guest VM with DHCP IP assignment. HCIBox runs a simple DHCP server that provides IP addresses to VMs created with resource bridge. The DHCP range is 192.168.200.210 - 192.168.200.249. Static assignment of IP from the Azure portal is not supported at this time.**
-
-## Deploy a new Linux virtual machine
-
-HCIBox includes a pre-configured Linux virtual machine image that you can use to deploy new guest virtual machines on the HCI cluster. Follow these steps to deploy one in your HCIBox.
-
-- Navigate to the Azure Stack HCI cluster resource in your HCIBox resource group.
-
-  ![Screenshot showing Azure Stack HCI cluster in RG](./hcicluster_rg.png)
-
-- Click on "Virtual Machines" in the navigation menu, then click "Create VM"
-
-  ![Screenshot showing Azure Stack HCI cluster resource blade](./hcicluster_create_vm.png)
-
-  ![Screenshot showing Create VM blade](./hcicluster_create_vm_blade.png)
-
-- Provide a name for the VM, select the _ubuntu20_ image, and set the virtual processor count to 1 and the memory count to 2.
-
-  ![Screenshot showing select gallery image](./create_vm_detail_1.png)
-
-- Click the Networking tab of the create wizard, then click Add network interface.
-
-  ![Screenshot showing network tab of create vm wizard](./create_vm_detail_2.png)
-
-- Give the new network interface a name and select _sdnswitch_ in the Network dropdown, then click Add.
-
-  ![Screenshot showing create NIC tab of create vm wizard](./create_vm_detail_3.png)
-
-  ![Screenshot showing NIC was created](./create_vm_detail_4.png)
-
-- Click the Review + Create tab and then click Create.
-
-  ![Screenshot showing Review and Create tab](./create_vm_detail_5.png)
-
-- Download the private key and save it to your local computer.
-
-  ![Screenshot showing download the private key](./create_vm_detail_6.png)
-
-- Wait for the deployment to complete.
-
-  ![Screenshot showing deployment in progress](./create_vm_detail_7.png)
-
-  ![Screenshot showing deployment complete](./create_vm_detail_8.png)
-
-- Navigate back to the HCI cluster Virtual machines tab to view your created VM.
-
-  ![Screenshot showing created VM](./created_vm.png)
-
-- Click on the VM to drill into the Azure Arc-enabled HCI machine detail.
-
-  ![Screenshot showing created VM detail](./created_vm_detail.png)
-
-### Next steps
-
-Review the [Arc resource bridge](https://learn.microsoft.com/azure-stack/hci/manage/azure-arc-enabled-virtual-machines#what-is-azure-arc-resource-bridge) documentation for additional information.
diff --git a/docs/azure_jumpstart_hcibox/SQLMI/_index.md b/docs/azure_jumpstart_hcibox/SQLMI/_index.md
deleted file mode 100644
index 93b76a435f..0000000000
--- a/docs/azure_jumpstart_hcibox/SQLMI/_index.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-type: docs
-weight: 100
-toc_hide: true
----
-
-# Jumpstart HCIBox - Azure Arc-enabled SQL Managed Instance
-
-## Azure Arc-enabled SQL Managed Instance on Azure Stack HCI
-
-Azure Stack HCI can provide host infrastructure for [Azure Kubernetes Service clusters](https://learn.microsoft.com/azure-stack/aks-hci/) which can be used to deploy Azure Arc-enabled SQL Managed Instance. HCIBox comes pre-configured with Azure Kubernetes Service on HCI (AKS-HCI) and an Azure Arc-enabled SQL Managed Instance. To see this in action, navigate to the resource group where you deployed HCIBox and follow these steps.
-
-- You will first need to get the Azure Custom Location Resource Provider (RP) Object ID (OID). This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your Arc-enabled Kubernetes cluster.
-
-- Sign in to Azure CLI using your user account. Fetch the objectId of the Azure AD application used by Azure Arc service.
-
-  ```bash
-  az ad sp list --filter "displayname eq 'Custom Locations RP'" --query "[?appDisplayName=='Custom Locations RP'].id" -o tsv
-  ```
-
-  ![Screenshot showing running a cli command to get custom location objectId](./objectid_script.png)
-
-- Open up Windows Explorer on the HCIBox-Client and navigate to the C:\HCIBox folder. From here, right click on the "Deploy-SQLMI.ps1" file and run with PowerShell.
-
-  ![Screenshot showing running a cli command to get custom location objectId](./deploy_sqlmi_script.png)
-
-- Enter the Azure Custom Location Resource Provider (RP) Object ID (OID) as generated by the previous step.
-
-  ![Screenshot showing a prompt to enter the custom location objectId](./objectid_prompt.png)
-
-  ![Screenshot showing the prompt after entering the objectId](./objectid_prompt_enter.png)
-
-  ![Screenshot showing the deploy-sqlmi script running](./deploy_sqlmi_script_running.png)
-
-- Once this script completes, open the resource group and group by type to see the Azure Arc-enabled SQL Managed Instance deployed with HCIBox.
-
-  ![Screenshot showing clusters in resource group](./rg_sqlmi.png)
-
-## Connect to the Azure Arc-enabled SQL Managed Instance using Azure Data Studio
-
-Azure Data Studio is installed and pre-configured on the AdminCenter computer to allow you to connect and manage your Arc-enabled SQL Managed Instance.
-
-- To start, click on the Azure Data Studio shortcut on the desktop of the AdminCenter computer.
-
-  ![Screenshot showing the azure data studio shortcut](./ads_shortcut.png)
-
-- Connect to the pre-configured connection, and click _Enable Trust server certificate_
-
-  ![Screenshot showing the connecting to the SQL Managed Instance](./ads_connect.png)
-
-- Once connected, you can now browse to the sample AdventureWorks database.
-
-  ![Screenshot showing the connecting to the sample AdventureWorks database](./adventureworks_browse.png)
-
-## Azure Arc-enabled SQL Managed Instance stress simulation
-
-HCIBox includes a dedicated SQL stress simulation tool named SqlQueryStress automatically installed for you on the Client VM. SqlQueryStress will allow you to generate load on the Azure Arc-enabled SQL Managed Instance that can be done used to showcase how the SQL database and services are performing as well as the HCI cluster.
-
-- To start with, open the SqlQueryStress desktop shortcut and connect to the Arc-enabled SQL Managed Instance primary endpoint Ip address. This can be found in the _SQLMI Endpoints_ text file desktop shortcut that was created for you. Or you can get the primary endpoint from the Azure portal.
-
-  ![Screenshot showing SQL Stress application](./sql_stress_start.png)
-
-  ![Screenshot showing SQL Managed Instance endpoints file](./sqlmi-endpoint_file.png)
-
-  ![Screenshot showing SQL Managed Instance endpoints in the Azure portal](./sqlmi_connection_portal.png)
-
-- To connect, use "Integrated Authentication" and select the deployed sample AdventureWorks database (you can use the "Test" button to check the connection).
-
-  ![Screenshot showing SQL Managed Instance connection](./sql_stress_connection.png)
-
-- To generate some load, we will be running a simple stored procedure. Copy the below procedure and change the number of iterations you want it to run as well as the number of threads to generate even more load on the database. In addition, change the delay between queries to 1ms for allowing the stored procedure to run for a while. Click on Go to start generating load.
-
-    ```sql
-    exec [dbo].[uspGetEmployeeManagers] @BusinessEntityID = 8
-    ```
-
-- As you can see from the example below, the configuration settings are 100,000 iterations, five threads per iteration, and a 1ms delay between queries. These configurations should allow you to have the stress test running for a while.
-
-  ![Screenshot showing SQLstress stored procedure](./sql_stress_sp.png)
-
-  ![Screenshot showing SQLstress running](./sql_stress_running.png)
-
-- To monitor the performance of the HCI cluster, click on the Insights workbook and explore logs from your cluster.
-
-    ![Screenshot showing the VM insights workbook](./insights_workbook.png)
-
-- You can also navigate to the Overview blade of the Windows Admin Center and explore the CPU and Memory utilization.
-
-    ![Screenshot showing the CPU utilization on the cluster](./cpu_utilization.png)
-
-    ![Screenshot showing the Memory utilization on the cluster](./memory_utilization.png)
-
-## Next steps
-
-Azure Arc-enabled SQL Managed Instance provides many more capabilities not directly covered here. Review the documentation to continue your journey with [Azure Arc-enabled SQL Managed Instance](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-overview).
diff --git a/docs/azure_jumpstart_hcibox/WAC/_index.md b/docs/azure_jumpstart_hcibox/WAC/_index.md
deleted file mode 100644
index bf4b7144ab..0000000000
--- a/docs/azure_jumpstart_hcibox/WAC/_index.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-type: docs
-weight: 200
-toc_hide: true
----
-
-# Jumpstart HCIBox - Windows Admin Center operations
-
-## Using Windows Admin Center
-
-HCIBox includes multiple methods of exploring Windows Admin Center (WAC). Windows Admin Center is available from inside the Azure portal, and a deployment of [Windows Admin Center as a gateway server](https://learn.microsoft.com/windows-server/manage/windows-admin-center/plan/installation-options) is also available. A shortcut to the Windows Admin Center gateway server is available on the _HCIBox-Client_ desktop.
-
-### Windows Admin Center in Azure portal
-
-Windows Admin Center can be used directly from the Azure portal. To set this up for your HCIBox cluster, follow these steps:
-
-- Navigate to the _HCIBox-Cluster_ resource and select the Windows Admin Center blade.
-
-  ![Screenshot showing opening WAC in portal](./wac_portal_setup_1.png)
-
-- Leave the port set to the default value and click Install. Installation will take a few minutes to complete.
-
-  ![Screenshot showing installing WAC in portal](./wac_portal_setup_2.png)
-
-- Once installation is complete, click Connect from the Windows Admin Center blade on the cluster resource.
-
-  ![Screenshot showing connecting to WAC in portal](./wac_portal_setup_3.png)
-
-- Connecting to Windows Admin Center requires using the domain account credential. Connect with your domain account as shown in the screenshot below.
-
-  ![Screenshot showing connecting with domain account](./wac_portal_setup_4.png)
-
-- You can now explore your cluster using Windows Admin Center in Azure portal.
-
-  ![Screenshot showing Windows Admin Center in Azure portal](./wac_portal.png)
-
-### Windows Admin Center gateway server
-
-HCIBox also includes a dedicated Windows Admin Center (WAC) gateway server. The WAC gateway server can be accessed by connecting to it from RDP. A shortcut is available on the _HCIBox-Client_ desktop.
-
-  > __NOTE: [Registering Windows Admin Center with Azure](https://learn.microsoft.com/azure-stack/hci/manage/register-windows-admin-center) is not supported in HCIBox.__
-
-- Open this shortcut and use the domain credential (username_supplied_at_deployment@jumpstart.local) to start an RDP session to the Windows Admin Center VM.
-
-  ![Screenshot showing WAC desktop shortcut](./wac_gateway_shortcut.png)
-
-- Log in to the WAC gateway server using the domain credential.
-
-  ![Screenshot showing logging into the WAC server](./wac_gateway_login.png)
-
-- Now you can open the Windows Admin Center shortcut on the WAC server desktop. Once again you will use your domain account to access WAC.
-
-  ![Screenshot showing logging into WAC](./wac_gateway_desktop.png)
-
-  ![Screenshot showing WAC login prompt](./wac_login.png)
-
-- Now that we are logged in, our first step is to add a connection to our HCI cluster. Click on the "Add" button, and then click on "Add" under "Server clusters".
-
-  ![Screenshot showing WAC first login](./wac_empty.png)
-
-  ![Screenshot showing WAC adding cluster](./wac_add_cluster.png)
-
-- Enter "_hciboxcluster_" for the cluster name, and use the domain account credential to connect to the cluster.
-
-  ![Screenshot showing WAC connection details](./wac_add_cluster_detail.png)
-
-  ![Screenshot showing WAC connection details](./wac_add_cluster_detail_2.png)
-
-- Now that the cluster is added, we can explore management capabilities for the cluster inside of WAC. Click on the cluster to drill into its details.
-
-  ![Screenshot showing cluster list](./wac_cluster_added.png)
-
-  ![Screenshot showing cluster detail](./wac_cluster_added_detail.png)
-
-- If you followed the steps to [deploy a VM from Azure portal](https://azurearcjumpstart.io/azure_jumpstart_hcibox/RB/_index.md), click on the Virtual Machines.
-
-  ![Screenshot showing the VM we created earlier](./wac_virtual_machine.png)
-
-- Windows Admin Center also provides the ability to connect directly to the VM. Click on the VM name and then click the "Connect" dropdown and click "Connect" to login to the VM using the domain credential. Click the checkbox to automatically use the certificate presented by the machine before clicking "Connect" again to connect.
-
-  ![Screenshot showing connecting to the VM](./wac_virtual_machine_connect.png)
-
-  ![Screenshot showing connect dialog](./wac_virtual_machine_connect_cred.png)
-
-  ![Screenshot showing VM connected](./wac_virtual_machine_connected.png)
-
-- We can also seamlessly move the VM from one cluster node to another using [live migration](https://learn.microsoft.com/windows-server/virtualization/hyper-v/manage/live-migration-overview).
-
-- In the example below, we can see the LinuxGuest virtual machine is hosted on _AzSHOST2_.
-
-  ![Screenshot showing live migration step 1](./wac_virtual_machine_placement.png)
-
-- Click the "Manage" dropdown and then click "Move".
-
-  ![Screenshot showing live migration step 2](./wac_virtual_machine_move.png)
-
-- In the Move dialog, leave the default settings and click "Move" to start the live migration.
-
-  ![Screenshot showing live migration dialog](./wac_virtual_machine_move_dialog.png)
-
-- The migrated virtual machine is now hosted on _AzSHOST2_.
-
-  ![Screenshot showing migrated virtual machine](./wac_virtual_machine_move_complete.png)
-
-### Next steps
-
-For additional Windows Admin Center operations, review the [official documentation](https://learn.microsoft.com/windows-server/manage/windows-admin-center/overview).
diff --git a/docs/azure_jumpstart_hcibox/_index.md b/docs/azure_jumpstart_hcibox/_index.md
deleted file mode 100644
index 73a9e966c8..0000000000
--- a/docs/azure_jumpstart_hcibox/_index.md
+++ /dev/null
@@ -1,463 +0,0 @@
----
-type: docs
-linkTitle: "Jumpstart HCIBox"
-weight: 5
----
-
-## Jumpstart HCIBox - Overview
-
-HCIBox is a turnkey solution that provides a complete sandbox for exploring [Azure Stack HCI](https://learn.microsoft.com/azure-stack/hci/overview) capabilities and hybrid cloud integration in a virtualized environment. HCIBox is designed to be completely self-contained within a single Azure subscription and resource group, which will make it easy for a user to get hands-on with Azure Stack HCI and [Azure Arc](https://learn.microsoft.com/azure/azure-arc/overview) technology without the need for physical hardware.
-
-![Screenshot showing HCIBox architecture diagram](./arch_full.png)
-
-### Use cases
-
-- Sandbox environment for getting hands-on with Azure Stack HCI and Azure Arc technologies
-- Accelerator for Proof-of-concepts or pilots
-- Training tool for skills development
-- Demo environment for customer presentations or events
-- Rapid integration testing platform
-- Infrastructure-as-code and automation template library for building hybrid cloud management solutions
-
-## Azure Stack HCI capabilities available in HCIBox
-
-### 2-node Azure Stack HCI cluster
-
-HCIBox automatically provisions and configures a two-node Azure Stack HCI cluster. HCIBox simulates physical hardware by using nested virtualization with Hyper-V running on an Azure Virtual Machine. This Hyper-V host provisions three guest virtual machines: two Azure Stack HCI nodes (_AzSHost1_, _AzSHost2_), and one nested Hyper-V host (_AzSMGMT_). _AzSMGMT_ itself hosts three guest VMs: a [Windows Admin Center](https://learn.microsoft.com/windows-server/manage/windows-admin-center/overview) gateway server, an [Active Directory domain controller](https://learn.microsoft.com/windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview), and a [Routing and Remote Access Server](https://learn.microsoft.com/windows-server/remote/remote-access/remote-access) acting as a BGP router.
-
-![Screenshot showing HCIBox nested virtualization](./nested_virtualization.png)
-
-### Azure Arc Resource Bridge
-
-HCIBox installs and configures [Azure Arc Resource Bridge](https://learn.microsoft.com/azure/azure-arc/resource-bridge/overview). This allows full virtual machine lifecycle management from Azure portal or CLI. As part of this configuration, HCIBox also configures a [custom location](https://learn.microsoft.com/azure-stack/hci/manage/deploy-arc-resource-bridge-using-command-line?tabs=for-static-ip-address#create-a-custom-location-by-installing-azure-arc-resource-bridge) and deploys two [gallery images](https://learn.microsoft.com/azure-stack/hci/manage/deploy-arc-resource-bridge-using-command-line?tabs=for-static-ip-address#create-virtual-network-and-gallery-image) (Windows Server 2019 and Ubuntu). These gallery images can be used to create virtual machines through the Azure portal.
-
-![Screenshot showing HCIBox Azure Arc Resource Bridge](./arc_resource_bridge.png)
-
-### Azure Kubernetes Service on Azure Stack HCI
-
-HCIBox includes [Azure Kubernetes Services on Azure Stack HCI (AKS-HCI)](https://learn.microsoft.com/azure-stack/aks-hci/). As part of the deployment automation, HCIBox configures AKS-HCI infrastructure including a management cluster. It then creates a [target](https://learn.microsoft.com/azure-stack/aks-hci/kubernetes-concepts), or "workload", cluster (_HCIBox-AKS-$randomguid_). As an optional capability, HCIBox also includes a PowerShell script that can be used to configure a sample application on the target cluster using [GitOps](https://learn.microsoft.com/azure/azure-arc/kubernetes/tutorial-use-gitops-flux2).
-
-<img src="./aks_hci.png" width="250" alt="AKS-HCI diagram">
-
-### Azure Arc-enabled SQL Managed Instance on Azure Stack HCI
-
-HCIBox includes [Azure Arc-enabled SQL Managed Instance on Azure Stack HCI](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-overview). As part of the deployment automation, HCIBox configures AKS-HCI infrastructure including a management cluster. It then creates a [target](https://learn.microsoft.com/azure-stack/aks-hci/kubernetes-concepts), or "workload", cluster (_HCIBox-AKS-$randomguid_) and deploys an Azure Arc-enabled SQL Managed Instance.
-
-<img src="./aks_sqlmi.png" width="250" alt="AKS-HCI diagram">
-
-### Hybrid unified operations
-
-HCIBox includes capabilities to support managing, monitoring and governing the cluster. The deployment automation configures [Azure Stack HCI Insights](https://learn.microsoft.com/azure-stack/hci/manage/monitor-hci-multi) along with [Azure Monitor](https://learn.microsoft.com/azure/azure-monitor/overview) and a [Log Analytics workspace](https://learn.microsoft.com/azure/azure-monitor/logs/log-query-overview). Additionally, [Azure Policy](https://learn.microsoft.com/azure/governance/policy/overview) can be configured to support automation configuration and remediation of resources.
-
-![Screenshot showing HCIBox unified operations diagram](./governance.png)
-
-## HCIBox Azure Consumption Costs
-
-HCIBox resources generate Azure Consumption charges from the underlying Azure resources including core compute, storage, networking and auxiliary services. Note that Azure consumption costs may vary depending on the region where HCIBox is deployed. Be mindful of your HCIBox deployments and ensure that you disable or delete HCIBox resources when not in use to avoid unwanted charges. Please see the [Jumpstart FAQ](https://aka.ms/Jumpstart-FAQ) for more information on consumption costs.
-
-## Deployment Options and Automation Flow
-
-HCIBox provides two methods for deploying and configuring the necessary resources in Azure.
-
-- A [Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview?tabs=bicep) template that can be deployed manually via Azure CLI.
-
-- An [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/overview) template that can be used for a more streamlined experience.
-
-![Screenshot showing deployment flow diagram for Bicep-based deployments](./deployment_flow.png)
-
-HCIBox uses an advanced automation flow to deploy and configure all necessary resources with minimal user interaction. The previous diagram provides an overview of the deployment flow. A high-level summary of the deployment is:
-
-- User deploys the primary Bicep file (_main.bicep_). This file contains several nested objects that will run simultaneously.
-  - Host template - deploys the _HCIBox-Client_ VM. This is the Hyper-V host VM that uses nested virtualization to host the complete HCIBox infrastructure. Once the Bicep template finishes deploying, the user remotes into this client using RDP to start the second step of the deployment.
-  - Network template - deploys the network artifacts required for the solution
-  - Storage account template - used for staging files in automation scripts and as the cloud witness for the HCI cluster
-  - Management artifacts template - deploys Azure Log Analytics workspace and solutions and Azure Policy artifacts
-- User remotes into _HCIBox-Client_ VM, which automatically kicks off a PowerShell script that:
-  - Deploy and configure three (3) nested virtual machines in Hyper-V
-    - Two (2) Azure Stack HCI virtual nodes
-    - One (1) Windows Server 2019 virtual machine
-  - Configures the necessary virtualization and networking infrastructure on the Hyper-V host to support the HCI cluster.
-  - Deploys an Active Directory domain controller, a Windows Admin Center server in gateway mode, and a Remote Access Server acting as a BGP router
-  - Registers the HCI Cluster with Azure
-  - Deploys AKS-HCI and a target AKS cluster
-  - Deploys Arc Resource Bridge and gallery VM images
-  - Deploys an Azure Arc-enabled SQL Managed Instance on top of the AKS cluster
-
-## Prerequisites
-
-The following prerequisites must be completed in order to deploy HCIBox using the manual Bicep template option. If you elect to use Azure Developer CLI instead, then many of these prerequisites are configured for you as part of the AZD experience and can be skipped.
-
-### Required for both manual and Azure Developer CLI deployment
-
-- Clone the Azure Arc Jumpstart repository
-
-  ```shell
-  git clone https://github.com/microsoft/azure_arc.git
-  ```
-
-- [Install or update Azure CLI to version 2.49.0 and above](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest). Use the below command to check your current installed version.
-
-  ```shell
-  az --version
-  ```
-
-- Login to AZ CLI using the ```az login``` command.
-
-### Required for manual deployment only (skip this section if using Azure Developer CLI)
-
-- Ensure that you have selected the correct subscription you want to deploy HCIBox to by using the ```az account list --query "[?isDefault]"``` command. If you need to adjust the active subscription used by Az CLI, follow [this guidance](https://docs.microsoft.com/cli/azure/manage-azure-subscriptions-azure-cli#change-the-active-subscription).
-
-- HCIBox must be deployed to one of the following regions. **Deploying HCIBox outside of these regions may result in unexpected results or deployment errors.**
-
-  - East US
-  - East US 2
-  - West US 2
-  - North Europe
-
-  > __NOTE: Some HCIBox resources will be created in regions other than the one you initially specified. This is due to the limited regional availability of the various services included in HCIBox.__
-
-- __HCIBox requires 32 ESv5-series vCPUs__ when deploying with default parameters such as VM series/size. Ensure you have sufficient vCPU quota available in your Azure subscription and the region where you plan to deploy HCIBox. You can use the below Az CLI command to check your vCPU utilization.
-
-  > __NOTE: If using Azure Developer CLI the pre-provision step will check your subscription for available capacity.__
-
-  ```shell
-  az vm list-usage --location <your location> --output table
-  ```
-
-  ![Screenshot showing az vm list-usage](./az_vm_list_usage.png)
-
-- Register necessary Azure resource providers by running the following commands.
-
-  ```shell
-  az provider register --namespace Microsoft.HybridCompute --wait
-  az provider register --namespace Microsoft.GuestConfiguration --wait
-  az provider register --namespace Microsoft.Kubernetes --wait
-  az provider register --namespace Microsoft.KubernetesConfiguration --wait
-  az provider register --namespace Microsoft.ExtendedLocation --wait
-  az provider register --namespace Microsoft.AzureArcData --wait
-  az provider register --namespace Microsoft.OperationsManagement --wait
-  az provider register --namespace Microsoft.AzureStackHCI --wait
-  az provider register --namespace Microsoft.ResourceConnector --wait
-  az provider register --namespace Microsoft.OperationalInsights --wait
-  ```
-
-- Create Azure service principal (SP). To deploy HCIBox, an Azure service principal assigned with the _Owner_ Role-based access control (RBAC) role is required. You can use Azure Cloud Shell (or other Bash shell), or PowerShell to create the service principal.
-
-  - (Option 1) Create service principal using [Azure Cloud Shell](https://shell.azure.com/) or Bash shell with Azure CLI:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "<Unique SP Name>" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    For example:
-
-    ```shell
-    az login
-    subscriptionId=$(az account show --query id --output tsv)
-    az ad sp create-for-rbac -n "JumpstartHCIBox" --role "Owner" --scopes /subscriptions/$subscriptionId
-    ```
-
-    The output should look similar to this:
-
-    ```json
-    {
-    "appId": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "displayName": "JumpstartHCIBox",
-    "password": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-    "tenant": "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    }
-    ```
-  
-  - (Option 2) Create service principal using PowerShell. If necessary, follow [this documentation](https://learn.microsoft.com/powershell/azure/install-az-ps?view=azps-8.3.0) to install or update Azure PowerShell to version 10.4.0 or above.
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "<Unique SPN name>" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    For example:
-
-    ```PowerShell
-    $account = Connect-AzAccount
-    $spn = New-AzADServicePrincipal -DisplayName "HCIBoxSPN" -Role "Owner" -Scope "/subscriptions/$($account.Context.Subscription.Id)"
-    echo "SPN App id: $($spn.AppId)"
-    echo "SPN secret: $($spn.PasswordCredentials.SecretText)"
-    ```
-
-    The output should look similar to this:
-
-    ![Screenshot showing creating an SPN with PowerShell](./create_spn_powershell.png)
-
-    > __NOTE: If you create multiple subsequent role assignments on the same service principal, your client secret (password) will be destroyed and recreated each time. Therefore, make sure you grab the correct password.__
-
-    > __NOTE: The Jumpstart scenarios are designed with as much ease of use in-mind and adhering to security-related best practices whenever possible. It is optional but highly recommended to scope the service principal to a specific [Azure subscription and resource group](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest) as well as considering using a [less privileged service principal account](https://docs.microsoft.com/azure/role-based-access-control/best-practices)__
-
-## Azure Developer CLI deployment
-
-- Follow the install guide for the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd?tabs=winget-windows%2Cbrew-mac%2Cscript-linux&pivots=os-linux) for your environment.
-
-  > __NOTE: PowerShell is required for using azd with HCIBox. If you are running in a Linux environment be sure that you have [PowerShell for Linux](https://learn.microsoft.com/powershell/scripting/install/installing-powershell-on-linux?view=powershell-7.3) installed.__
-
-- Login with azd using ```azd auth login``` which will open a browser for interactive login.
-
-  ![Screenshot showing azd auth login](./azd_auth_login.png)
-
-- Run the ```azd init``` command from your cloned repo _*azure_jumpstart_hcibox*_ folder.
-  
-  ![Screenshot showing azd init](./azd_init.png)
-
-- Run the ```azd up``` command to deploy the environment. Azd will prompt you to enter the target subscription, region and all required parameters.
-
-  ![Screenshot showing azd up](./azd_up.png)
-
-- Once complete, continue on in the section [Start post-deployment automation](https://azurearcjumpstart.io/azure_jumpstart_hcibox/#start-post-deployment-automation)
-
-## Bicep deployment via Azure CLI
-
-- Upgrade to the latest Bicep version
-
-  ```shell
-  az bicep upgrade
-  ```
-
-- Edit the [main.parameters.json](https://github.com/microsoft/azure_arc/blob/main/azure_jumpstart_hcibox/bicep/main.parameters.json) template parameters file and supply some values for your environment.
-  - _`spnClientId`_ - Your Azure service principal id
-  - _`spnClientSecret`_ - Your Azure service principal secret
-  - _`spnTenantId`_ - Your Azure tenant id
-  - _`windowsAdminUsername`_ - Client Windows VM Administrator name
-  - _`windowsAdminPassword`_ - Client Windows VM Password. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long.
-  - _`logAnalyticsWorkspaceName`_ - Unique name for the HCIBox Log Analytics workspace
-  - _`deployBastion`_ - Option to deploy Azure Bastion which is used to connect to the _HCIBox-Client_ VM instead of normal RDP.
-  - _`registerCluster`_ - Option to automatically register the cluster; set to true by default
-  - _`deployAKSHCI`_ - Option to automatically deploy and configure AKS on HCI; set to true by default
-  - _`deployResourceBridge`_ - Option to automatically deploy and configure Arc Resource Bridge; set to true by default
-
-  ![Screenshot showing example parameters](./parameters_bicep.png)
-
-- Now you will deploy the Bicep file. Navigate to the local cloned [deployment folder](https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_hcibox/bicep) and run the below command:
-
-  ```shell
-  az group create --name "<resource-group-name>"  --location "<preferred-location>"
-  az deployment group create -g "<resource-group-name>" -f "main.bicep" -p "main.parameters.json"
-  ```
-
-  ![Screenshot showing bicep deploying](./bicep_deploying.png)
-
-## Start post-deployment automation
-
-Once your deployment is complete, you can open the Azure portal and see the initial HCIBox resources inside your resource group. You will be using both the Azure portal and the _HCIBox-Client_ Azure virtual machine to interact with the HCIBox resources.
-
-  ![Screenshot showing all deployed resources in the resource group](./deployed_resources.png)
-
-   > __NOTE: For enhanced HCIBox security posture, RDP (3389) and SSH (22) ports are not open by default in HCIBox deployments. You will need to create a network security group (NSG) rule to allow network access to port 3389, or use [Azure Bastion](https://docs.microsoft.com/azure/bastion/bastion-overview) or [Just-in-Time (JIT)](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) access to connect to the VM.__
-
-### Connecting to the HCIBox Client virtual machine
-
-Various options are available to connect to _HCIBox-Client_ VM, depending on the parameters you supplied during deployment.
-
-- [RDP](https://azurearcjumpstart.io/azure_jumpstart_hcibox/#connecting-directly-with-rdp) - available after configuring access to port 3389 on the _HCIBox-NSG_, or by enabling [Just-in-Time access (JIT)](https://azurearcjumpstart.io/azure_jumpstart_hcibox/#connect-using-just-in-time-accessjit).
-- [Azure Bastion](https://azurearcjumpstart.io/azure_jumpstart_hcibox/#connect-using-azure-bastion) - available if ```true``` was the value of your _`deployBastion`_ parameter during deployment.
-
-#### Connecting directly with RDP
-
-By design, HCIBox does not open port 3389 on the network security group. Therefore, you must create an NSG rule to allow inbound 3389.
-
-  > __NOTE: If you deployed with Azure Developer CLI then this step is automatically done for you as part of the automation.__
-
-- Open the _HCIBox-NSG_ resource in Azure portal and click "Add" to add a new rule.
-
-  ![Screenshot showing HCIBox-Client NSG with blocked RDP](./rdp_nsg_blocked.png)
-
-  ![Screenshot showing adding a new inbound security rule](./nsg_add_rule.png)
-
-- Specify the IP address that you will be connecting from and select RDP as the service with "Allow" set as the action. You can retrieve your public IP address by accessing [https://icanhazip.com](https://icanhazip.com) or [https://whatismyip.com](https://whatismyip.com).
-
-  <img src="./nsg_add_rdp_rule.png" alt="Screenshot showing adding a new allow RDP inbound security rule" width="400">
-
-  ![Screenshot showing all inbound security rule](./rdp_nsg_all_rules.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-#### Connect using Azure Bastion
-
-- If you have chosen to deploy Azure Bastion in your deployment, use it to connect to the VM.
-
-  ![Screenshot showing connecting to the VM using Bastion](./bastion_connect.png)
-
-  > __NOTE: When using Azure Bastion, the desktop background image is not visible. Therefore some screenshots in this guide may not exactly match your experience if you are connecting to _HCIBox-Client_ with Azure Bastion.__
-
-#### Connect using just-in-time access (JIT)
-
-If you already have [Microsoft Defender for Cloud](https://docs.microsoft.com/azure/defender-for-cloud/just-in-time-access-usage?tabs=jit-config-asc%2Cjit-request-asc) enabled on your subscription and would like to use JIT to access the Client VM, use the following steps:
-
-- In the Client VM configuration pane, enable just-in-time. This will enable the default settings.
-
-  ![Screenshot showing the Microsoft Defender for cloud portal, allowing RDP on the client VM](./jit_allowing_rdp.png)
-
-  ![Screenshot showing connecting to the VM using RDP](./rdp_connect.png)
-
-  ![Screenshot showing connecting to the VM using JIT](./jit_rdp_connect.png)
-
-#### The Logon scripts
-
-- Once you log into the _HCIBox-Client_ VM, a PowerShell script will open and start running. __This script will take between 3-4 hours to finish__, and once completed, the script window will close automatically. At this point, the deployment is complete and you can start exploring all that HCIBox has to offer.
-
-  ![Screenshot showing _HCIBox-Client_](./automation.png)
-
-  > __NOTE: The automation will take 3-4 hours to fully complete. Do not close the PowerShell window during this time. When automation is completed successfully, the desktop background will be changed to the HCIBox wallpaper.__
-
-- Deployment is complete! Let's begin exploring the features of HCIBox!
-
-  ![Screenshot showing complete deployment](./hcibox_complete.png)
-
-  ![Screenshot showing HCIBox resources in Azure portal](./rg_hcibox.png)
-
-  > __NOTE: The _Register-AzStackHCI_ PowerShell command registers the cluster to the East US region. This region is hardcoded into the script. If you have regional limitations in your Azure subscription that prevent resource creation in East US the registration will fail.__
-
-  ![Screenshot showing HCIBox resources in Azure portal](./rg_arc_servers.png)
-
-## Using HCIBox
-
-HCIBox has many features that can be explored through the Azure portal or from inside the _HCIBox-Client_ virtual machine. To help you navigate all the features included, read through the following sections to understand the general architecture and how to use various features.
-
-### Nested virtualization
-
-HCIBox simulates a 2-node physical deployment of Azure Stack HCI by using [nested virtualization on Hyper-V](https://learn.microsoft.com/virtualization/hyper-v-on-windows/user-guide/nested-virtualization). To ensure you have the best experience with HCIBox, take a moment to review the details below to help you understand the various nested VMs that make up the solution.
-
-  ![Screenshot showing HCIBox nested virtualization stack diagram](./nested_virtualization_arch.png)
-
-| Computer Name    | Role                                | Domain Joined | Parent Host     | OS                  |
-| ---------------- | ----------------------------------- | ------------- | --------------- | ------------------- |
-| _HCIBox-Client_  | Primary host                        | No            | Azure           | Windows Server 2022 |
-| _AzSHOST1_       | HCI node                            | Yes           | _HCIBox-Client_ | Azure Stack HCI     |
-| _AzSHOST2_       | HCI node                            | Yes           | _HCIBox-Client_ | Azure Stack HCI     |
-| _AzSMGMT_        | Nested hypervisor                   | No            | _HCIBox-Client_ | Windows Server 2022 |
-| _JumpstartDC_    | Domain controller                   | Yes (DC)      | _AzSMGMT_       | Windows Server 2022 |
-| _AdminCenter_    | Windows Admin Center gateway server | Yes           | _AzSMGMT_       | Windows Server 2022 |
-| _Bgp-Tor-Router_ | Remote Access Server                | No            | _AzSMGMT_       | Windows Server 2022 |
-
-### Active Directory domain user credentials
-
-Once you are logged into the _HCIBox-Client_ VM using the local admin credentials you supplied in your template parameters during deployment you will need to switch to using a domain account to access most other functions, such as logging into the HCI nodes or accessing Windows Admin Center. This domain account is automatically configured for you using the same username and password you supplied at deployment. The default domain name is _jumpstart.local_, so if the username supplied at deployment is "_arcdemo_", your domain account in UPN format would be __arcdemo@jumpstart.local__.
-
-  > __NOTE: The password for this account is set as the same password you supplied during deployment for the local account. Many HCIBox operations will use the domain account wherever credentials are required.__
-
-### Monitoring Azure Stack HCI
-
-Azure Stack HCI integrates with [Azure Monitor](https://learn.microsoft.com/azure-stack/hci/manage/monitor-hci-single) to support monitoring HCI clusters through the Azure portal. Follow these steps to configure monitoring on your HCIBox cluster.
-
-- From the Overview blade of the _HCIBox-Cluster_ resource, select the "Capabilities" tab, then click on "Not configured" on the "Logs" box.
-
-  ![Screenshot showing capabilities tab](./enable_monitoring_1.png)
-
-- On the dialog box, select the HCIBox-Workspace log analytics workspace in the dropdown, then click "Add". This will begin the process of installing the Log Analytics extensions on the host nodes and will take a few minutes. When complete, the Logs box will show as "Configured" on the Capabilities tab.
-
-  ![Screenshot showing capabilities tab](./enable_monitoring_2.png)
-
-- On the "Capabilities" tab, click on "Not configured" on the "Insights" box.
-
-- On the dialog box, click "Turn on". After a few seconds, the Insights box should show as "Configured" on the Capabilities tab.
-
-  ![Screenshot showing logs configured](./enable_monitoring_3.png)
-
-- It will take time for logs data to flow through to Log Analytics. Once data is available, click on the Insights blade of the _HCIBox-Cluster_ resource to view the Insights workbook and explore logs from your cluster.
-
-  ![Screenshot showing logs configured](./hci_insights.png)
-
-### VM provisioning through Azure portal with Arc Resource Bridge
-
-Azure Stack HCI supports [VM provisioning through the Azure portal](https://learn.microsoft.com/azure-stack/hci/manage/azure-arc-enabled-virtual-machines). Open the [HCIBox VM provisioning documentation](https://azurearcjumpstart.io/azure_jumpstart_hcibox/RB/) to get started.
-
-![Screenshot showing VM provisioning blade](./vm_provisioning.png)
-
-### Windows Admin Center
-
-HCIBox includes a deployment of a Windows Admin Center (WAC) gateway server. Windows Admin Center can also be used from the Azure portal. Open the [HCIBox Windows Admin Center documentation](https://azurearcjumpstart.io/azure_jumpstart_hcibox/WAC/) to get started.
-
-![Screenshot showing Windows Admin Center](./wac_portal.png)
-
-  > __NOTE: [Registering Windows Admin Center with Azure](https://learn.microsoft.com/azure-stack/hci/manage/register-windows-admin-center) is not supported in HCIBox.__
-
-### Azure Kubernetes Service
-
-HCIBox comes pre-configured with [Azure Kubernetes Service on Azure Stack HCI](https://learn.microsoft.com/azure-stack/aks-hci/). Open the [HCIBox AKS-HCI documentation](https://azurearcjumpstart.io/azure_jumpstart_hcibox/AKS/) to get started with AKS-HCI in HCIBox.
-
-![Screenshot showing AKS on Azure Stack HCI](./aks_portal.png)
-
-### Azure Arc-enabled SQL Managed Instance
-
-HCIBox supports deploying [Azure Arc-enabled SQL Managed Instance](https://learn.microsoft.com/azure/azure-arc/data/managed-instance-overview) on an AKS HCI cluster. Open the [HCIBox SQLMI documentation](https://azurearcjumpstart.io/azure_jumpstart_hcibox/SQLMI/) to get started with Azure Arc-enabled SQL Managed Instance in HCIBox.
-
-![Screenshot showing SQLMI on Azure Stack HCI](./sqlmi_portal.png)
-
-### Advanced Configurations
-
-HCIBox provides a full Azure Stack HCI sandbox experience with minimal configuration required by the user. Some users may be interested in changing HCIBox's default configuration. Many advanced settings can be configured by modifying the values in the [_HCIBox-Config.psd1_](https://raw.githubusercontent.com/microsoft/azure_arc/main/azure_jumpstart_hcibox/artifacts/HCIBox-Config.psd1) PowerShell file. If you wish to make changes to this file, you must fork the Jumpstart repo and make the changes in your fork, then set the optional _githubAccount_ and _githubBranch_ deployment template parameters to point to your fork.
-
-  > __NOTE: Advanced configuration deployments are not supported by the Jumpstart team. Changes made to the _HCIBox-Config.psd1_ file may result in failures at any point in HCIBox deployment. Make changes to this file only if you understand the implications of the change.__
-
-![Screenshot showing advanced configuration file](./advanced_config.png)
-
-### Next steps
-  
-HCIBox is a sandbox that can be used for a large variety of use cases, such as an environment for testing and training or to jumpstart proof of concept projects. Ultimately, you are free to do whatever you wish with HCIBox. Some suggested next steps for you to try in your HCIBox are:
-
-- Explore Windows Admin Center from either Azure portal or from the WAC gateway server
-- Deploy GitOps configurations with Azure Arc-enabled Kubernetes
-- Build policy initiatives that apply to your Azure Arc-enabled resources
-- Write and test custom policies that apply to your Azure Arc-enabled resources
-- Reuse automation for external solutions or proof-of-concepts
-
-## Clean up the deployment
-
-To clean up your deployment, simply delete the resource groups using Azure CLI, Azure Developer CLI, or Azure portal. Be sure to delete the ArcServers resource group first as seen in the example below.
-
-- Clean up Using Azure CLI
-
-  ```shell
-  az group delete -n <name of your resource group>-ArcServers
-  az group delete -n <name of your resource group>
-  ```
-
-  ![Screenshot showing az group delete](./az_delete.png)
-
-- Clean up using Azure Developer CLI
-
-  ```shell
-  azd down
-  ```
-
-  ![Screenshot showing azd down](./azd_down.png)
-
-## Basic Troubleshooting
-
-Occasionally deployments of HCIBox may fail at various stages. Common reasons for failed deployments include:
-
-- Invalid service principal id, service principal secret or service principal Azure tenant ID provided in _main.parameters.json_ file. This can cause failures when running automation that requires logging into Azure, such as the scripts that register the HCI cluster, deploy AKS-HCI, or configure Arc resource bridge.
-- Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 48 available. See the [prerequisites](#prerequisites) section for more details.
-- Target Azure region does not support all required Azure services - ensure you are running HCIBox in one of the supported regions. See the [prerequisites](#prerequisites) section for more details.
-- Authentication issues - Most HCIBox operations require the use of the domain credentials configured during deployment. These credentials take the UPN format of _<username>@jumpstart.local_. If you have issues accessing services such as Windows Admin Center, make sure you are using the correct credential.
-- Script failures due to upstream dependencies - This can happen due to network issues or failures in upstream services that HCIBox depends on (such as package repositories) - in most cases deleting the deployment and redeploying is the simplest resolution.
-
-If you have issues that you cannot resolve when deploying HCIBox please submit an issue on the [Github repo](https://github.com/microsoft/azure_arc/issues)
-
-### Exploring logs from the _HCIBox-Client_ virtual machine
-
-Occasionally, you may need to review log output from scripts that run on the _HCIBox-Client_ virtual machines in case of deployment failures. To make troubleshooting easier, the HCIBox deployment scripts collect all relevant logs in the _C:\HCIBox\Logs_ folder on _HCIBox-Client_. A short description of the logs and their purpose can be seen in the list below:
-
-| Log file                                      | Description                                                                                                                               |
-| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| _C:\HCIBox\Logs\Bootstrap.log_                | Output from the initial bootstrapping script that runs on _HCIBox-Client_.                                                                |
-| _C:\HCIBox\Logs\New-HCIBoxCluster.log_        | Output of _New-HCIBoxCluster.ps1_ which configures the Hyper-V host and builds the HCI cluster, management VMs, and other configurations. |
-| _C:\HCIBox\Logs\Register-AzSHCI.log_          | Output of _Register-AzSHCI.ps1_ which registers the cluster with Azure.                                                                   |
-| _C:\HCIBox\Logs\Deploy-AKS.log_               | Output of _Deploy-AKS.ps1_ which deploys and configures AKS on HCI.                                                                       |
-| _C:\HCIBox\Logs\Deploy-ArcResourceBridge.log_ | Output of _Deploy-ArcResourceBridge.ps1_ which deploys and configures Arc resource bridge and builds gallery images.                      |
-| _C:\HCIBox\Logs\Deploy-SQLMI.log_ | Output of _Deploy-SQLMI.ps1_ which deploys and configures Arc-enabled SQL Managed Instance.                      |
-
-  ![Screenshot showing HCIBox logs folder on HCIBox-Client](./troubleshoot_logs.png)
-
-If you are still having issues deploying HCIBox, please [submit an issue](https://github.com/microsoft/azure_arc/issues/new/choose) on GitHub and include a detailed description of your issue and the Azure region you are deploying to. Inside the _C:\HCIBox\Logs_ folder you can also find instructions for uploading your logs to an Azure storage account for review by the Jumpstart team.
diff --git a/docs/code_of_conduct/_index.md b/docs/code_of_conduct/_index.md
deleted file mode 100644
index 1d7fedca1e..0000000000
--- a/docs/code_of_conduct/_index.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-type: docs
-title: "Microsoft Open Source Code of Conduct"
-linkTitle: "Code of Conduct"
-weight: 10
----
-
-# Microsoft Open Source Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-
-Resources:
-
-- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
-- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
-- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
diff --git a/docs/contributing/_index.md b/docs/contributing/_index.md
deleted file mode 100644
index 01f07e3239..0000000000
--- a/docs/contributing/_index.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-type: docs
-title: "Contributing"
-linkTitle: "Contributing"
-weight: 11
----
-
-# Contributing
-
-When contributing to this repository, please first discuss the change you wish to make via issue,
-email, or any other method with the owners of this repository before making a change.
-
-Please note we have a code of conduct, please follow it in all your interactions with the project.
-
-## Want to be an Azure Arc "Jumpstarter"?
-
-We would love to have you! We are always looking for community support so if you want to create your own Azure Arc Jumpstart scenario, hop over to the [Jumpstart Scenario Writeup Guidelines](https://azurearcjumpstart.io/scenario_guidelines/) page to learn how to create one.
-
-## Pull Request Process
-
-1. Ensure any install or build dependencies are removed before the end of the layer when doing a build.
-2. Update the README.md with details of changes to the interface, this includes new environment
-   variables, exposed ports, useful file locations and container parameters.
-3. Increase the version numbers in any examples files and the README.md to the new version that this
-   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
-4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer to merge it for you.
-
-## Code of Conduct
-
-### Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-### Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-### Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-### Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-### Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [](likamrat@microsoft.com). All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-### Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4
\ No newline at end of file
diff --git a/docs/oss/_index.md b/docs/oss/_index.md
deleted file mode 100644
index 556b07f766..0000000000
--- a/docs/oss/_index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-type: docs
-title: "Open-Source Commitment"
-linkTitle: "Open-Source Commitment"
-weight: 9
----
-
-# Azure Arc Jumpstart commitment to open-source software
-
-The Azure Arc Jumpstart contains extensive automation and scripting for our scenarios and features, and for us, it is critical to maintain high code quality. To do that, it is important to not just go through extensive code reviews and testing, but also select and embed the right tools for the job.
-
-It is our mission to support the open-source community whenever we can and build on the amazing work of others when presented with the opportunity to do so. With more than 30 open-source projects used in the Jumpstart, we are committed to continue to support, advocate and contribute to these projects, so you can expect an AWESOME open-source experience when using the Azure Arc Jumpstart!
-
-![Image showing open-source projects logos](/img/oss_logos.png)
diff --git a/docs/overview/_index.md b/docs/overview/_index.md
deleted file mode 100644
index daf98afedb..0000000000
--- a/docs/overview/_index.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-type: docs
-title: "Overview"
-linkTitle: "Overview"
-weight: 1
----
-
-## Azure Arc Jumpstart
-
-The Azure Arc Jumpstart is designed to provide a "zero to hero" experience so you can start working with Azure Arc right away!
-
-The Jumpstart provides step-by-step guides for independent Azure Arc scenarios that incorporate as much automation as possible, detailed screenshots and code samples, and a rich and comprehensive experience while getting started with the Azure Arc platform.
-
-Our goal is for you to have a working Azure Arc environment spin-up in no time so you can focus on the core values of the platform, regardless of where your infrastructure may be, either on-premises or in the cloud.
-
-<p align="center"><img src="/img/jumpstart_logo.png" alt="jumpstart-logo" width="270"></p>
-
-## Our philosophy and core design principals
-
-In the Jumpstart, we believe a document or a guide is not just that. It should represent an experience that is simply more than just a set of instructions. It should be a journey that is easy to follow, fun to do, and most importantly, it should be a journey that you can relate to and see yourself in it.
-
-<p align="center"><img src="/img/design_principals.png" alt="design-principals" width="1280"></p>
-
-## Jumpstart Scenarios
-
-Ready to get going?! This website offers you detailed guides, automation, code samples, screenshots and everything you really need to get going with Azure Arc!
-
-Hop over to the [Jumpstart Scenarios](https://azurearcjumpstart.io/azure_arc_jumpstart/) section and enjoy the ride.
-
-> **Disclaimer: The intention for the Azure Arc Jumpstart project is to focus on the core Azure Arc capabilities, deployment scenarios, use cases, and ease of use. It does not focus on Azure best practices or the other tech and OSS projects being leveraged in the scenarios and code. Jumpstart scenarios, ArcBox, HCIBox, and Agora are all intended for evaluation, training and demo purposes only and are not supported for production use cases.**
-
-## Jumpstart Agora
-
-[Jumpstart Agora](https://aka.ms/JumpstartAgora) is a marketplace of various “cloud to edge” industry scenarios, designed to provide an automated end-to-end user experience. It provides a rich and comprehensive experience while getting started with a full-stack deployment, from the infrastructure layer all the way to the line of business applications and the operational and development process around them.
-
-<p align="center"><a href="https://aka.ms/JumpstartAgora" target="_blank"><img src="/img/agora_logo.png" alt="jumpstart-agora-logo" width="270"></a></p>
-
-## Jumpstart ArcBox
-
-Have you ever wanted to have a complete Azure Arc environment with just one click? We've got you covered with ArcBox!
-
-[ArcBox](https://aka.ms/JumpstartArcBox) is a dedicated sandbox environment for exploring all things Azure Arc, and the best part is that the only prerequisite is an Azure subscription. With a one-click deployment, you get a full Azure Arc lab packed with technology including Azure Arc-enabled Servers, Kubernetes, Data Services and much more. Check out ArcBox today and start exploring a comprehensive hybrid sandbox powered by Azure Arc.
-
-<p align="center"><a href="https://aka.ms/JumpstartArcBox" target="_blank"><img src="/img/arcbox_logo.png" alt="jumpstart-arcbox-logo" width="270"></a></p>
-
-## Jumpstart HCIBox
-
-Are you eager to try out Azure Stack HCI but you don't have access to physical hardware? If so then HCIBox is the tool for you.
-
-[HCIBox](https://aka.ms/JumpstartHCIBox) is a dedicated Azure Stack HCI sandbox environment, and like ArcBox you only need an Azure subscription to get started. With a one-click deployment, you get a full Azure Stack HCI lab packed with technology including Azure Arc integration, Azure Kubernetes Service, Windows Admin Center and much more. Check out HCIBox today and start exploring a comprehensive hybrid sandbox powered by Azure Arc.
-
-<p align="center"><a href="https://aka.ms/JumpstartHCIBox" target="_blank"><img src="/img/hcibox_logo.png" alt="jumpstart-hcibox-logo" width="270"></a></p>
-
-## Jumpstart YouTube Channel
-
-We know you are busy and sometimes all you need is just a good, short, solid recorded demo and we hope that here you will be able to find just that.
-
-All the demos in the [Azure Arc Jumpstart YouTube channel](https://aka.ms/AzureArcJumpstartDemos) are "bite-size" versions of the Azure Arc Jumpstart written scenarios we have on our website so make sure to check those as well.
-
-<p align="center"><a href="https://www.youtube.com/channel/UCoIJw-P_9Jp6Jo_0Ca9avcA" target="_blank"><img src="/img/jumpstart_demos_logo.png" alt="jumpstart-demos-logo" width="270"></a></p>
-
-Oh, and one last thing before you go. Please consider subscribing to the channel so you will know when we have a new awesome demo for you!
-
-Enjoy!
-
-## Jumpstart Lightning
-
-Jumpstart Lightning is the show where you get a chance to share with our team and the world your Azure Arc, Jumpstart contribution and Hybrid cloud awesome stories. Who knows?! You might find yourself on our YouTube channel!
-
-<p align="center"><a href="https://www.youtube.com/playlist?list=PLZuSmETs0xIagjkwrufUkBbex7RPJV4n5" target="_blank"><img src="/img/jumpstart_lightning_logo.png" alt="jumpstart-lightning-logo" width="270"></a></p>
-
-* Are you an awesome Azure Arc customer or a Microsoft partner who has an awesome story you would like to talk about?!
-* Have you ever contributed to the Jumpstart project and want to share it with the world?!
-* Do you have a unique Azure Arc demo and content to show off?!
-
-What are you waiting for?! [Fill the submission form](https://forms.office.com/r/cyg2DduG1W) and if it’s snazzy enough, you will be hearing from us soon.
-
-## Community decks
-
-Architecture diagrams and visualization are important so we wanted you to have our [official Azure Arc overview library, the Azure Kubernetes Service (AKS) hybrid deployment options library deck, and the Azure Arc Jumpstart overview PowerPoint decks](https://github.com/microsoft/azure_arc/tree/main/docs/ppt) we use, just because you know, we care!
-
-![diagrams](/img/diagrams.png)
-
-## Azure Arc Overview
-
-For customers who want to simplify complex and distributed environments across on-premises, edge and multi-cloud, [Azure Arc](https://azure.microsoft.com/services/azure-arc/) enables deployment of Azure services anywhere and extends Azure management to any infrastructure.
-
-* **Organize and govern across environments** - Get databases, Kubernetes clusters, and servers sprawling across on-premises, edge and multi-cloud environments under control by centrally organizing and governing from a single place.
-
-* **Manage Kubernetes Apps at scale** - Deploy and manage Kubernetes applications across environments using DevOps techniques. Ensure that applications are deployed and configured from source control consistently.
-
-* **Run Azure services anywhere** - Get automated patching, upgrades, security and scale on-demand across on-premises, edge and multi-cloud environments for your data estate.
-
-## Azure Arc Story Time
-
-Contoso Global Manufacturing runs workloads on different hardware, across on-premises data centers, and multiple public clouds, with Microsoft Azure being the primary cloud. They also support IoT workloads deployed on the edge. Workloads include very diverse services and are based on either virtual machines, managed Platform-as-a-Service (PaaS) services, and container-based applications.
-
-As mentioned, Contoso’s R&D teams are well-invested in containerized workloads for their modernized applications. As a result, they are using Kubernetes as their container orchestration platform. Kubernetes is deployed both as self-managed Kubernetes clusters in their on-premises environments and managed Kubernetes deployments in the cloud.
-
-As part of their cloud-native practices with Azure being the main hyper-scale cloud, Contoso’s operations teams are standardized and taking advantage of Azure Resource Manager (ARM) capabilities such as (but not limited to) tagging, Azure Monitoring for VMs and containers, logging and telemetry, policy and governance, Desired State Configuration (DSC), Update Management, Change Tracking, Inventory management, etc.
-
-These practices and techniques are already well established for Azure-based workloads in use such as Azure VMs, Azure Kubernetes Service (AKS), Azure SQL, and many more. In order to take advantage of these well-established practices, Contoso is using Azure Arc to extend the ARM APIs to project and manage their workloads deployed outside of Azure. Once onboarded, Azure Arc projects resources as first-class citizens in Azure which can then take advantage of the ARM capabilities mentioned above. In addition, they are able to guarantee Kubernetes deployments and app consistency through GitOps-based configuration for their Kubernetes clusters in Azure, other clouds and on-premises.
-
-With Azure Arc, Contoso is able to project resources and register them into Azure Resource Manager independently of where they run, so they have a single control plane and can extend cloud-native operations and governance beyond Azure.
-
-![architecture](/img/architecture_dark.jpg)
-
-## Want to be an Azure Arc "Jumpstarter"?
-
-We would love to have you! We are always looking for community support so if you want to create your own Azure Arc Jumpstart scenario, hop over to the [Jumpstart Scenario Writeup Guidelines](https://azurearcjumpstart.io/scenario_guidelines/) page to learn how to create one.
-
-## Jumpstart Roadmap
-
-An up-to-date roadmap for the Azure Arc Jumpstart scenarios can be found under [the repository GitHub Project](https://github.com/orgs/microsoft/projects/162).
diff --git a/docs/release_notes/_index.md b/docs/release_notes/_index.md
deleted file mode 100644
index 59466fab7a..0000000000
--- a/docs/release_notes/_index.md
+++ /dev/null
@@ -1,443 +0,0 @@
----
-type: docs
-title: "Jumpstart Release Notes"
-linkTitle: "Jumpstart Release Notes"
-weight: 6
----
-
-# Azure Arc Jumpstart release notes
-
-**Release notes will be released around the first week of each month and will cover the previous month.**
-
-## 2023
-
-### October 2023
-
-#### Release highlights
-
-- New scenarios: 1
-- New features: 0
-- Enhancements: 7
-- Bug fixes: 6
-- Documentation updates: 3
-
-#### Cross-scenario
-
-- [Documentation: Proposed changes in Azure Arc Documentation (grammar and wording) #2160](https://github.com/microsoft/azure_arc/issues/2160)
-
-#### Jumpstart Agora
-
-- [Enhancement: Control AKSEE schema version using config file #2140](https://github.com/microsoft/azure_arc/issues/2140)
-- [Enhancement: AKS Edge Essentials - sporadic registration issue #2191](https://github.com/microsoft/azure_arc/issues/2191)
-- [Documentation: Add guidance to update Az PowerShell module to latest version #2146](https://github.com/microsoft/azure_arc/issues/2146)
-
-#### Jumpstart ArcBox
-
-- [Bug: ArcBox deployment fails to complete. ArcBox-CAPI-VM custom script extension never finishes. #2162](https://github.com/microsoft/azure_arc/issues/2162)
-- [Documentation: ArcBox readme typos #2187](https://github.com/microsoft/azure_arc/issues/2187)
-
-#### Jumpstart HCIBox
-
-- [Enhancement: HCIBox host nodes still use Az CLI 32bit #2157](https://github.com/microsoft/azure_arc/issues/2157)
-- [Bug: HCIBox Resource Bridge script fails to complete due to change to custom locations cli commands #2158](https://github.com/microsoft/azure_arc/issues/2158)
-- [Bug: HCIBox fails to deploy #2178](https://github.com/microsoft/azure_arc/issues/2178)
-
-#### Azure Arc-enabled servers
-
-- [New scenario: Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server and SQL Server 2012](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_extended_security_updates/)
-
-#### Azure Arc-enabled SQL Server
-
-- [New scenario: Using Azure Arc to deliver Extended Security Updates (ESU) for Windows Server and SQL Server 2012](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/day2/esu/)
-
-#### Azure Arc-enabled Kubernetes
-
-- [Enhancement: Dynamically pull latest AKSEE schema version - Single node scenario #2152](https://github.com/microsoft/azure_arc/issues/2152)
-- [Enhancement: Dynamically pull latest AKSEE schema version - Multi-node scenario #2153](https://github.com/microsoft/azure_arc/issues/2153)
-- [Enhancement: Dynamically pull latest AKSEE schema version - Akri Single node scenario #2154](https://github.com/microsoft/azure_arc/issues/2154)
-- [Enhancement: Dynamically pull latest AKSEE schema version - Akri multi-node scenario #2155](https://github.com/microsoft/azure_arc/issues/2155)
-- [Bug: CAPI Vanilla deployment fails to complete #2170](https://github.com/microsoft/azure_arc/issues/2170)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - Oct release #2147](https://github.com/microsoft/azure_arc/issues/2147)
-
-#### Azure Arc-enabled app services
-
-- [Bug: CAPI Pin down for Arc Data and App Services #2189](https://github.com/microsoft/azure_arc/issues/2189)
-
-#### Jumpstart decks
-
-- [Bug: Some of the images are referring to: Azure Sentinel - its now Microsoft Sentinel #2144](https://github.com/microsoft/azure_arc/issues/2144)
-
-### September 2023
-
-#### Release highlights
-
-- Announcing [Jumpstart HCIBox general availability](https://aka.ms/HCIBoxGABlog)!
-- New scenarios: 0
-- New features: 1
-- Enhancements: 6
-- Bug fixes: 17
-- Documentation updates: 1
-
-#### Cross-scenario
-
-- [Enhancement: September versions bump #2138](https://github.com/microsoft/azure_arc/issues/2138)
-
-#### Jumpstart Agora
-
-- [Enhancement: Upgrade Azure CLI to 64-bit #2128](https://github.com/microsoft/azure_arc/issues/2128)
-- [Enhancement: Bump AKS and AKSEE versions in Agora #2121](https://github.com/microsoft/azure_arc/issues/2121)
-- [Bug: Copy-VMFile failed due to "The device is not ready for use" #2091](https://github.com/microsoft/azure_arc/issues/2091)
-- [Documentation: Azure Data Explorer reports doesn't show data. Principal xxx is not authorized to read database 'Orders'. #2098](https://github.com/microsoft/azure_arc/issues/2098)
-
-#### Jumpstart ArcBox
-
-- [Enhancement: Upgrade Azure CLI to 64-bit #2129](https://github.com/microsoft/azure_arc/issues/2129)
-
-#### Jumpstart HCIBox
-
-- [Enhancement: Upgrade Azure CLI to 64-bit #2127](https://github.com/microsoft/azure_arc/issues/2127)
-- [Bug: The hcibox azd provision scripts is checking DSv5 cores quota instead of ESv5 cores (As documented). #2100](https://github.com/microsoft/azure_arc/issues/2100)
-- [Bug: Deploy-ArcResourceBridge.ps1 fails to install the arcappliance extension #2102](https://github.com/microsoft/azure_arc/issues/2102)
-- [Bug: Deploy-ArcResourceBridge is blocked: Default_Group already exists #2106](https://github.com/microsoft/azure_arc/issues/2106)
-- [Bug: Unable to enable Insights after HCIBox cluster registration #2114](https://github.com/microsoft/azure_arc/issues/2114)
-- [Bug: Update HCIBox vhdx images to latest servicing updates for HCI 22H2 and WinServer 22h2 #2117](https://github.com/microsoft/azure_arc/issues/2117)
-
-#### Azure Arc-enabled Kubernetes
-
-- [Enhancement: AKS Edge Essentials - Scheme Update #2122](https://github.com/microsoft/azure_arc/issues/2122)
-- [Bug: Modify AKS EE Arc onboarding to allow Managed Prometheus Microsoft.AzureMonitor.Containers.Metrics Arc extension deployment #2132](https://github.com/microsoft/azure_arc/issues/2132)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - Sept release #2099](https://github.com/microsoft/azure_arc/issues/2099)
-
-### August 2023
-
-#### Release highlights
-
-- New scenarios: 3
-- New features: 3
-- Enhancements: 5
-- Bug fixes: 11
-- Documentation updates: 3
-
-#### Jumpstart Agora
-
-- [Feature: Agora deployment stuck at stage 14/17 - prometheus-grafana #2052](https://github.com/microsoft/azure_arc/issues/2052)
-- [Enhancement: Agora is using a version of .NET Core which has reached end of support #2062](https://github.com/microsoft/azure_arc/issues/2062)
-- [Bug: UserWarning: You are using cryptography on a 32-bit Python on a 64-bit Windows Operating System #2032](https://github.com/microsoft/azure_arc/issues/2032)
-- [Bug: New-NetNat : You were not connected because a duplicate name exists on the network #2033](https://github.com/microsoft/azure_arc/issues/2033)
-- [Bug: Site filter missing from Freezer Monitoring dashboard in ADX #2038](https://github.com/microsoft/azure_arc/issues/2038)
-- [Documentation: Unable to view Ag-AKS-Staging resources in Azure portal #2053](https://github.com/microsoft/azure_arc/issues/2053)
-
-#### Jumpstart ArcBox
-
-- [Enhancement: ArcBox is using a version of .NET Core which has reached end of support #2060](https://github.com/microsoft/azure_arc/issues/2060)
-- [Enhancement: Update storage account in Azure Arc Jumpstart scenarios and ArcBox #2069](https://github.com/microsoft/azure_arc/issues/2069)
-- [Bug: Adventureworks2019 sample database has the wrong name #2083](https://github.com/microsoft/azure_arc/issues/2083)
-
-#### Jumpstart HCIBox
-
-- [Feature: Add Azure Developer CLI support for HCIBox #2044](https://github.com/microsoft/azure_arc/issues/2044)
-- [Bug: HCIBox Resource bridge fails to deploy due to changes in requirements for nodepool size #2050](https://github.com/microsoft/azure_arc/issues/2050)
-- [Bug: HCIBox doc points to wrong folder #2066](https://github.com/microsoft/azure_arc/issues/2066)
-- [Bug: HCIBox SQL MI sample database is not restoring properly #2081](https://github.com/microsoft/azure_arc/issues/2081)
-- [Documentation: Error while registering HCI-Box Windows Admin Center with Azure #2088](https://github.com/microsoft/azure_arc/issues/2088)
-
-#### Azure Arc-enabled servers
-
-- [New scenario: Monitoring Azure Arc-enabled servers with Datadog](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_datadog/)
-
-#### Azure Arc-enabled Kubernetes
-
-- [New scenario: Discover ONVIF cameras with Akri on AKS Edge Essentials single node deployment](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_single_akri/)
-- [New scenario: Discover ONVIF cameras with Akri on AKS Edge Essentials multi-node deployment](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full_akri/)
-- [Enhancement: ARO scenario should use securestring for SPN credential secret #2058](https://github.com/microsoft/azure_arc/issues/2058)
-- [Bug: update link to deployment folder in AKS Edge Essentials multi-node deployment tutorial #2030](https://github.com/microsoft/azure_arc/issues/2030)
-- [Bug: CAPI Vanilla scenario failing #2041](https://github.com/microsoft/azure_arc/issues/2041)
-- [Bug: AKS Edge Essentials single node deployment failure on Helm and Arc Agent installation #2059](https://github.com/microsoft/azure_arc/issues/2059)
-- [Documentation: Issue with VM Size in supported regions #2065](https://github.com/microsoft/azure_arc/issues/2065)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - August release #1997](https://github.com/microsoft/azure_arc/issues/1997)
-- [Enhancement: Update storage account in Azure Arc Jumpstart scenarios and ArcBox #2069](https://github.com/microsoft/azure_arc/issues/2069)
-- [Bug: Adventureworks2019 sample database has the wrong name #2083](https://github.com/microsoft/azure_arc/issues/2083)
-
-### July 2023
-
-#### Release highlights
-
-- Announcing [Jumpstart Agora](https://aka.ms/AgoraReleaseBlog)!
-- [Philosophy and design principals update](https://azurearcjumpstart.io/#our-philosophy-and-core-design-principals)
-- Scenarios enhancements and bug fixes:
-  - Azure Arc-enabled Kubernetes
-- ArcBox bug fixes
-
-#### Jumpstart ArcBox
-
-- [Bug: UbuntuCAPIDeployment failing with error installscript_CAPI has timed out #1984](https://github.com/microsoft/azure_arc/issues/1984)
-- [Bug: ArcBox DataOps failing due to potential Az CLI connectedk8s issue #1986](https://github.com/microsoft/azure_arc/issues/1986)
-- [Bug: Ubuntu image focal error in ArcBox Bicep deployment #1988](https://github.com/microsoft/azure_arc/issues/1988)
-
-#### Jumpstart HCIBox
-
-No updates in this release.
-
-#### Azure Arc-enabled Kubernetes
-
-- [Bug: AKS Edge Essentials single node deployment #1991](https://github.com/microsoft/azure_arc/issues/1991)
-
-### June 2023
-
-#### Release highlights
-
-- Scenarios enhancements and bug fixes:
-  - Azure Arc-enabled SQL Server
-  - Azure Arc-enabled Kubernetes
-  - Azure Arc-enabled data services
-- ArcBox and HCIBox enhancements and bug fixes
-- Monthly ArcBox Kubernetes-related versions bump
-
-#### Jumpstart ArcBox
-
-- [Versioning: June versions bump #1972](https://github.com/microsoft/azure_arc/issues/1972)
-- [Bug: DataOps deployment failing when using --use-k8s in CAPI #1881](https://github.com/microsoft/azure_arc/issues/1881)
-- [Bug: Failed to remove ArcBox deployment logon script scheduled tasks #1882](https://github.com/microsoft/azure_arc/issues/1882)
-
-#### Jumpstart HCIBox
-
-- [Bug: Arc-enabled SQL Managed Instance script - AutoUpgradeMinorVersion cannot be set to true #1884](https://github.com/microsoft/azure_arc/issues/1884)
-
-#### Azure Arc-enabled SQL Server
-
-- [Bug: SQL Managed Instance ARM Template #1971](https://github.com/microsoft/azure_arc/issues/1971)
-
-#### Azure Arc-enabled Kubernetes
-
-- [Versioning: https://github.com/microsoft/azure_arc/issues/1964](https://github.com/microsoft/azure_arc/issues/1964)
-- [Bug: Deploy GitOps configurations and perform Helm-based GitOps flow on kind as an Azure Arc Connected Cluster #1923](https://github.com/microsoft/azure_arc/issues/1923)
-- [Bug: AKS edge essential unique name for Arc-enabled resource #1928](https://github.com/microsoft/azure_arc/issues/1928)
-- [Bug: AKS EE essential random guid fails #1943](https://github.com/microsoft/azure_arc/issues/1943)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - June release #1898](https://github.com/microsoft/azure_arc/issues/1898)
-
-### May 2023
-
-#### Release highlights
-
-- New Azure Arc-enabled Kubernetes scenario
-- Scenarios enhancements and bug fixes:
-  - Azure Arc-enabled SQL Server
-  - Azure Arc-enabled data services
-- ArcBox and HCIBox enhancements and bug fixes
-- Monthly ArcBox Kubernetes-related versions bump
-
-#### Jumpstart ArcBox
-
-- [Bug: azuredeploy.parameters.json file has incorrect names that do not correlate with the azuredeploy.json file #1827](https://github.com/microsoft/azure_arc/issues/1827)
-- [Bug: patchesstrategicmerge is deprecated in kustomize #1840](https://github.com/microsoft/azure_arc/issues/1840)
-- [Bug: ArcBox deployment fails #1861](https://github.com/microsoft/azure_arc/issues/1861)
-- [Feature: Move ArcBox VHDs to new Jumpstart blob storage #1839](https://github.com/microsoft/azure_arc/issues/1839)
-- [Docs update: Add Nested VMs credentials to guide #1829](https://github.com/microsoft/azure_arc/issues/1829)
-
-#### Jumpstart HCIBox
-
-- [Bug: Invalid parameter in register HCI #1877](https://github.com/microsoft/azure_arc/issues/1877)
-
-#### Azure Arc-enabled Kubernetes
-
-- [New scenario: AKS Edge Essentials multi-node deployment with Azure Arc using Azure Bicep](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials_full/)
-
-#### Azure Arc-enabled SQL Server
-
-- [Bug: azuredeploy.parameters.json file has incorrect names that do not correlate with the azuredeploy.json file #1827](https://github.com/microsoft/azure_arc/issues/1827)
-- [Docs update: Add Nested VMs credentials to guide #1829](https://github.com/microsoft/azure_arc/issues/1829)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - May release #1807](https://github.com/microsoft/azure_arc/issues/1807)
-
-### April 2023
-
-#### Release highlights
-
-- New Azure Arc-enabled servers scenarios
-- Scenarios enhancements and bug fixes:
-  - Azure Arc-enabled SQL Server
-  - Azure Arc-enabled data services
-- ArcBox and HCIBox enhancements and bug fixes
-- Monthly ArcBox Kubernetes-related versions bump
-
-#### Azure Arc-enabled servers
-
-- [New scenario: Create Automanage Machine Configuration custom configurations for Windows](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_windows/)
-- [New scenario: Create Automanage Machine Configuration custom configurations for Linux](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_machine_configuration_custom_linux/)
-
-#### Azure Arc-enabled SQL Server
-
-- [Bug: Arc-enabled SQL Server best practices assessment failing with error #1783](https://github.com/microsoft/azure_arc/issues/1783)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - April release #1762](https://github.com/microsoft/azure_arc/issues/1762)
-- [Bug: Arc data services extension creation requires a --version argument #1780](https://github.com/microsoft/azure_arc/issues/1780)
-- [Bug: Azure Arc-enabled SQL Managed Instance for AKS fails to deploy #1810](https://github.com/microsoft/azure_arc/issues/1810)
-
-#### Jumpstart ArcBox
-
-- [Feature: April Kubernetes-related version bump #1815](https://github.com/microsoft/azure_arc/issues/1815)
-
-#### Jumpstart HCIBox
-
-- [Bug: HCIBox Microsoft.OperationalInsights #1805](https://github.com/microsoft/azure_arc/issues/1805)
-
-### March 2023
-
-#### Release highlights
-
-- New and updated Azure Arc-enabled servers scenarios
-- Multiple enhancements and bug fixes:
-  - Azure Arc-enabled SQL Server
-  - Azure Arc-enabled Kubernetes
-  - Azure Arc-enabled data services
-- Multiple ArcBox and HCIBox enhancements and bug fixes
-- Monthly ArcBox Kubernetes-related versions bump
-
-#### Azure Arc-enabled servers
-
-- [New scenario: Enable Azure Automanage custom profiles on Azure Arc-enabled servers using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_custom_profiles/)
-- [Updated scenario: Enable Azure Automanage built-in profiles on Azure Arc-enabled servers using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/arc_automanage_builtin_profiles/)
-
-#### Azure Arc-enabled SQL Server
-
-- [Bug: Onboarding role requirement is no longer needed for Arc-enabled SQL Server #1729](https://github.com/microsoft/azure_arc/issues/1729)
-
-#### Azure Arc-enabled Kubernetes
-
-- [Bug: Missing two parameters to use Azure Arc with ARO in Azure #1716](https://github.com/microsoft/azure_arc/issues/1716)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - March release #1723](https://github.com/microsoft/azure_arc/issues/1723)
-
-#### Jumpstart ArcBox
-
-- [Feature: March Kubernetes-related version bump #1764](https://github.com/microsoft/azure_arc/issues/1764)
-- [Bug: Onboarding role requirement is no longer needed for Arc-enabled SQL Server #1729](https://github.com/microsoft/azure_arc/issues/1729)
-
-#### Jumpstart HCIBox
-
-- [Bug: When deployAKSHCI is set to false and deployResourceBridge is set to true, RB install fails because of missing az cli path in environment variable #1726](https://github.com/microsoft/azure_arc/issues/1726)
-- [Bug: Resource Bridge deployments failing due to upstream issue #1731](https://github.com/microsoft/azure_arc/issues/1731)
-
-### February 2023
-
-#### Release highlights
-
-- Multiple ArcBox enhancements and bug fixes
-- Multiple HCIBox enhancements and bug fixes
-- Old scenarios deprecation
-- [Updated community decks](https://github.com/microsoft/azure_arc/tree/main/docs/ppt)
-  - Azure Kubernetes Service (AKS) Overview slide library deck v1.1
-
-#### Azure Arc-enabled servers
-
-- [Deprecated: Monitoring Agent Extension scenario #1643](https://github.com/microsoft/azure_arc/issues/1643)
-- [Deprecated: Update Management scenario #1645](https://github.com/microsoft/azure_arc/issues/1645)
-
-#### Azure Arc-enabled SQL Server
-
-- [Bug: SQL Server management studio shortcut is broken #1667](https://github.com/microsoft/azure_arc/issues/1667)
-
-#### Azure Arc-enabled Kubernetes
-
-- [Feature: AKS Edge Essentials Scenario Update #1652](https://github.com/microsoft/azure_arc/issues/1652)
-- [Feature: February Kubernetes-related version bump #1670](https://github.com/microsoft/azure_arc/issues/1670)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - February release #1638](https://github.com/microsoft/azure_arc/issues/1638)
-
-#### Jumpstart ArcBox
-
-- [Feature: ArcBox storage account should enforce HTTPS only #1654](https://github.com/microsoft/azure_arc/issues/1654)
-- [Feature: (P3) Hide Sidebar in Edge Browser #1683](https://github.com/microsoft/azure_arc/issues/1683)
-- [Bug: Fix ArcBox-sql credentials #1677](https://github.com/microsoft/azure_arc/issues/1677)
-- [Bug: Key Vault Portal UI is different from Jumpstart doc #1682](https://github.com/microsoft/azure_arc/issues/1682)
-- [Bug: (P2) Edge Certificate UI is different from Jumpstart doc #1684](https://github.com/microsoft/azure_arc/issues/1684)
-- [Bug: ArcBox DevOps - OSM extension failed #1686](https://github.com/microsoft/azure_arc/issues/1686)
-
-#### Jumpstart HCIBox
-
-- [Feature: Include code example for easily creating k8s service account bearer token #1614](https://github.com/microsoft/azure_arc/issues/1614)
-- [Feature: Switch HCIBox storage account to require HTTPS encryption #1615](https://github.com/microsoft/azure_arc/issues/1615)
-- [Feature: HCIBox - Include script to uninstall resource bridge cleanly #1691](https://github.com/microsoft/azure_arc/issues/1691)
-- [Feature: HCIBox - allow placing Arc server resources into the same resource group as the infrastructure #1699](https://github.com/microsoft/azure_arc/issues/1699)
-- [Bug: A part of WindowsAdminPassword was dropped when set domain user password #1616](https://github.com/microsoft/azure_arc/issues/1616)
-- [Bug: Remove U+2013 character and replace with - #1689](https://github.com/microsoft/azure_arc/issues/1689)
-
-### January 2023
-
-#### Release highlights
-
-- New and updated Jumpstart scenarios:
-  - Azure Arc-enabled SQL Server
-  - Azure Arc-enabled Kubernetes (first one for AKS hybrid)
-  - Azure Arc-enabled app services (first one for Container Apps)
-- Multiple ArcBox enhancements and bug fixes
-- Multiple HCIBox bug fixes
-- [Updated community decks](https://github.com/microsoft/azure_arc/tree/main/docs/ppt)
-  - Azure Arc Overview slide library deck v1.8
-  - Azure Arc Jumpstart overview deck v1.3
-
-#### Azure Arc-enabled SQL Server
-
-- [Updated scenario: Integrate Microsoft Defender for SQL servers with Azure Arc-enabled SQL Server (on Windows) using Hyper-V nested virtualization and ARM templates](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/azure/azure_arm_template_sqlsrv_winsrv_defender/)
-
-#### Azure Arc-enabled Kubernetes
-
-- [New scenario: Deploy an AKS Edge Essentials in Azure Windows Server VM, and connect the Azure VM and AKS Edge Essentials cluster to Azure Arc using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_hybrid/aks_edge_essentials/)
-- [Feature: January Kubernetes-related version bump #1611](https://github.com/microsoft/azure_arc/issues/1611)
-- [Bug: Getting error while installing Azure Key Vault Secrets Provider extension on HCI Arc enabled Cluster #1587](https://github.com/microsoft/azure_arc/issues/1587)
-
-#### Azure Arc-enabled data services
-
-- [Feature: Azure Arc-enabled data services - January release #1585](https://github.com/microsoft/azure_arc/issues/1585)
-- [Feature: January Kubernetes-related version bump #1611](https://github.com/microsoft/azure_arc/issues/1611)
-
-#### Azure Arc-enabled app services
-
-- [New scenario: Deploy Azure Container Apps on AKS using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_container_apps_arm_template/)
-- [Feature: January Kubernetes-related version bump #1611](https://github.com/microsoft/azure_arc/issues/1611)
-
-#### Jumpstart ArcBox
-
-- [Feature: Migrate from MMA to AMA #1569](https://github.com/microsoft/azure_arc/issues/1569)
-- [Feature: January Kubernetes-related version bump #1611](https://github.com/microsoft/azure_arc/issues/1611)
-- [Feature: Install SSH server on the nested Windows VMs #1618](https://github.com/microsoft/azure_arc/issues/1618)
-- [Feature: ArcBox - Microsoft Defender for SQL server #1617](https://github.com/microsoft/azure_arc/issues/1617)
-- [Bug: Ubuntu VMs offline due to full disks #1601](https://github.com/microsoft/azure_arc/issues/1601)
-- [Bug: DevOps Scenario K3sGitOps.ps1 script references the CAPI cluster not the K3s cluster #1607](https://github.com/microsoft/azure_arc/issues/1607)
-- [Bug: ArcBox Full - update API call to get SQLMI primary endpoint #1609](https://github.com/microsoft/azure_arc/issues/1609)
-- [Bug: BadRequest UbuntuCAPIDeployment - Azure Arcbox Full #1712](https://github.com/microsoft/azure_arc/issues/1712)
-
-#### Jumpstart HCIBox
-
-- [Bug: HCIBox deployment fails if passwords contain dollar signs #1590](https://github.com/microsoft/azure_arc/issues/1590)
-- [Bug: HCIBox - HCIBoxLogonScript - NuGet/PS Timeout Errors on Deploy-AKS.ps1 #1591](https://github.com/microsoft/azure_arc/issues/1591)
-- [Bug: HCIBox - HCIBoxLogonScript - NuGet/PS Timeout Errors on Deploy-AKS.ps1 #1591](https://github.com/microsoft/azure_arc/issues/1591)
-- [Bug: HCIBox - Deployment Error- Choco Install Fails - Register-AzSHCI.ps1 #1597](https://github.com/microsoft/azure_arc/issues/1597)
-
-## 2022
-
-The 2022 archived release notes can be found [here](https://github.com/microsoft/azure_arc/tree/main/docs/release_notes/archive/2022.md).
-
-## 2021
-
-The 2021 archived release notes can be found [here](https://github.com/microsoft/azure_arc/tree/main/docs/release_notes/archive/2021.md).
diff --git a/docs/release_notes/archive/2021.md b/docs/release_notes/archive/2021.md
deleted file mode 100644
index 937f05f8d1..0000000000
--- a/docs/release_notes/archive/2021.md
+++ /dev/null
@@ -1,515 +0,0 @@
-## 2021 Archived release notes
-
-### December 2021
-
-All of December 2021 release notes were consolidated to the January 2022 release notes.
-
-### November 2021
-
-#### Release highlights
-
-- New scenario for Azure Key Vault with Cluster API as an Azure Arc Connected Cluster
-
-- Support for Cluster API with Azure Provider v1.0.0
-
-- Support for Azure Arc-enabled data services 11/21 release
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [New Scenario: Integrate Azure Key Vault with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_keyvault_extension/)
-
-- [Enhancement: Update Kubernetes Cluster API scenario to support CAPZ v1.0.0 #862](https://github.com/microsoft/azure_arc/issues/862)
-
-- [Bug fix: gitops scenario uses helm even in "basic" scenario #814](https://github.com/microsoft/azure_arc/issues/814)
-
-#### Azure Arc-enabled data services scenarios
-
-- [Enhancement: Support for Azure Arc-enabled data services 11/21 release #839](https://github.com/microsoft/azure_arc/issues/839)
-
-- [Enhancement: Support for CAPZ 1.0.0 #840](https://github.com/microsoft/azure_arc/issues/840)
-
-#### Azure Arc-enabled app service
-
-- [Bug fix: Logic Apps on AKS scenario fails to complete on client VM #837](https://github.com/microsoft/azure_arc/issues/837)
-
-#### Jumpstart ArcBox
-
-- [Bug fix: Jumpstart ArcBox deployment failure - mgmtArtifactsAndPolicyDeployment FAILED #813](https://github.com/microsoft/azure_arc/issues/813)
-
-### October 2021
-
-#### Release highlights
-
-- New Azure Arc-enabled servers scenario
-
-- New Azure Arc-enabled app service scenario
-
-- Updating all scenarios with Azure CLI version to 2.25.0 or higher prerequisite
-
-- Reliability bugs and docs fixes
-
-#### Azure Arc-enabled servers scenarios
-
-- [New Scenario: Using Managed Identity on an Ubuntu Azure Arc-enabled server](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_managed_identity/linux/)
-
-- [Bug fix: Broken VHD blob link in Azure Arc-enabled servers for HCI scenario #802](https://github.com/microsoft/azure_arc/issues/802)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [Bug fix: The GKE basic gitops scenario screenshots to not match the actual deployments #783](https://github.com/microsoft/azure_arc/issues/783)
-
-- [Bug fix: k3s Azure ARM template - hardcoded iod #785](https://github.com/microsoft/azure_arc/issues/785)
-
-- [Bug fix: EKS K8s onboarding scenario - environment variables mapping to Terraform variables need to be prefixed with TF_VAR #792](https://github.com/microsoft/azure_arc/issues/792)
-
-- [Bug fix: gitops scenario uses helm even in "basic" scenario #814](https://github.com/microsoft/azure_arc/issues/814)
-
-#### Azure Arc-enabled data services scenarios
-
-- [Bug fix: PostgreSQL ARM Template failing #765](https://github.com/microsoft/azure_arc/issues/765)
-
-- [Bug fix: az cli 2.25 bump](https://github.com/microsoft/azure_arc/issues/805)
-
-#### Azure Arc-enabled app service
-
-- [New Scenario: Deploy an Azure API Management gateway on Cluster API (CAPI) using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apimgmt_arm_template/)
-
-#### Jumpstart ArcBox
-
-- [Enhancement: Support for CAPZ 1.0.0 #840](https://github.com/microsoft/azure_arc/issues/840)
-
-- [Bug fix: Azure ArcBox fail to deploy because of bad dependencies between nested templates #809](https://github.com/microsoft/azure_arc/issues/809)
-
-### September 2021
-
-#### Release highlights
-
-- New Azure Arc-enabled app service scenarios
-
-- Multiple security and benchmark enhancements
-
-- Updating all Azure-based scenarios to use Windows Server 2022
-
-- In this release, we introduced open-source version of the [Azure Arc validated architecture diagrams and visualization](https://azurearcjumpstart.io/overview/#diagrams)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [Bug fix: Terraform plan for GKE basic onboarding not compatible with TF 1.0 or with GKE clusters running 1.19 or higher #781](https://github.com/microsoft/azure_arc/issues/781)
-
-#### Azure Arc-enabled data services scenarios
-
-- [Enhancement: Change SQL MI AKS LB port from 1433 to non-standard #763](https://github.com/microsoft/azure_arc/issues/763)
-
-- [Enhancement: Upgrade Client-VM to Windows Server 2022 on Azure-based scenarios #740](https://github.com/microsoft/azure_arc/issues/740)
-
-- [Enhancement: Benchmarking tools for Azure Arc-enabled data services scenarios #739](https://github.com/microsoft/azure_arc/issues/739)
-
-- [Bug fix: PostgreSQL Deployment on EKS - data controller deployment failure #743](https://github.com/microsoft/azure_arc/issues/743)
-
-#### Azure Arc-enabled app service
-
-- [Enhancement: Upgrade Client-VM to Windows Server 2022 on Azure-based scenarios #740](https://github.com/microsoft/azure_arc/issues/740)
-
-- [New Scenario: Deploy an Azure API Management gateway on AKS using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_apimgmt_arm_template/)
-
-- [New Scenario: Deploy an App Service app using custom container on Cluster API using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/apps_service_arm_template/)
-
-- [New Scenario: Deploy an App Service app using custom container on Cluster API using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/cluster_api/capi_azure/azure_function_arm_template/)
-
-#### Azure Arc-enabled machine learning scenarios
-
-- [Enhancement: Upgrade Client-VM to Windows Server 2022 on Azure-based scenarios #740](https://github.com/microsoft/azure_arc/issues/740)
-
-- [Bug fix: error when installing AZURE ML training model piece #758](https://github.com/microsoft/azure_arc/issues/758)
-
-#### Jumpstart ArcBox
-
-- [Enhancement: Change SQL MI and PostgreSQL ports to non standard #767](https://github.com/microsoft/azure_arc/issues/767)
-
-- [Enhancement: Upgrade Client-VM to Windows Server 2022 on Azure-based scenarios #740](https://github.com/microsoft/azure_arc/issues/740)
-
-- [Enhancement: Benchmarking tools for Azure Arc-enabled data services scenarios #739](https://github.com/microsoft/azure_arc/issues/739)
-
-- [Enhancement: Remove custom-locations-oid parameter from connected cluster onboarding scripts and adding _`--kubeconfig`_ parameter to custom location creation #778](https://github.com/microsoft/azure_arc/pull/778)
-
-### August 2021
-
-#### Release highlights
-
-- New version of Jumpstart ArcBox
-
-- New scenarios for Azure Arc-enabled SQL Managed Instance high-availability
-
-- New scenario for Azure Arc-enabled app services with Logic App
-
-- First scenario for Azure Arc-enabled machine learning
-
-- Critical enhancements for Cluster API based scenarios
-
-#### Azure Arc-enabled servers scenarios
-
-- [New demo: Enable Azure Automanage on an Azure Arc-enabled server using an ARM template](https://www.youtube.com/watch?v=Tj1ypT516zM)
-
-- [Bug fix: Update Management #725](https://github.com/microsoft/azure_arc/issues/725)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [Bug fix: Azure Cluster API scenario for Azure Arc-enabled Kubernetes script variables not matching #696](https://github.com/microsoft/azure_arc/issues/696)
-
-#### Azure Arc-enabled data services scenarios
-
-- [New Scenario: Perform database failover with SQL Managed Instance Availability Groups on AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/aks/aks_mssql_ha/)
-
-- [New Scenario: Perform database failover with SQL Managed Instance Availability Groups on Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/day2/cluster_api/capi_azure/capi_mssql_ha/)
-
-- [Bug fix: failed to get file "infrastructure-components.yaml" #688](https://github.com/microsoft/azure_arc/issues/688)
-
-- [Bug fix: Azure Arc-enabled data services for EKS: Failed to load state error #699](https://github.com/microsoft/azure_arc/issues/699)
-
-- [Bug fix: Azure Arc-enabled data services for EKS : logon script does not end #711](https://github.com/microsoft/azure_arc/issues/711)
-
-#### Azure Arc-enabled app service
-
-- [New Scenario: Deploy Azure Logic App on AKS using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_logic_app_arm_template/)
-
-#### Azure Arc-enabled machine learning scenarios
-
-- [New Scenario: Train, Deploy and call inference on an image classification model - MNIST dataset from Azure Blob Storage](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_ml/aks/aks_blob_mnist_arm_template/)
-
-#### Jumpstart ArcBox
-
-- New [Azure Monitor workbook](https://azurearcjumpstart.io/azure_jumpstart_arcbox/workbook/) included that provides single pane of glass monitoring for all ArcBox resources.
-- Remove port 22 from Cluster API control plane Network Security Group
-- Update clusterctl to v0.4.2
-- Update CAPZ provider to v0.5.2
-- Update Kubernetes version to 1.20.10
-- Automation optimizations
-- Documentation revisions
-
-### July 2021
-
-#### Release highlights
-
-- First new scenarios for Azure Arc-enabled app services
-
-- Major updates to support general availability of Azure Arc-enabled data services with SQL Managed Instance
-
-- Critical bug fixes for Cluster API based scenarios
-
-- Jumpstart ArcBox enhancements
-
-#### Azure Arc-enabled servers scenarios
-
-- [New Scenario: Enable Azure Automanage on an Azure Arc-enabled server using an ARM template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_automanage/)
-
-- [Updated Scenario: Enable Update Management on Azure Arc-enabled servers](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_updatemanagement/)
-
-- [Bug fix: az_connect_linux.sh will not work as it is on RHEL/CentOS #613](https://github.com/microsoft/azure_arc/issues/613)
-
-- [Bug fix: ARM Template fails deployment Update Management on Azure Arc-enabled servers #631](https://github.com/microsoft/azure_arc/issues/631)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [New Scenario: Integrate Azure Monitor for Containers with AKS on Azure Stack HCI as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_monitor/aks_hci_monitor_extension/)
-
-- [Bug fix: Cluster API fails with no "cluster" resource available #617](https://github.com/microsoft/azure_arc/issues/617)
-
-#### Azure Arc-enabled data services scenarios
-
-- [Updated Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure/arm_template/dc_vanilla/)
-
-- [Updated Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure/arm_template/mssql_mi/)
-
-- [Updated Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/)
-
-- [Updated Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/)
-
-- [Updated Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/)
-
-- [Updated Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/)
-
-- [Updated Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/)
-
-- [Updated Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/)
-
-- [Updated Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/)
-
-- [Updated Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using GKE](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_dc_vanilla_terraform/)
-
-- [Updated Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using GKE](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_mssql_mi_terraform/)
-
-- [Updated Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using GKE](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_postgres_terraform/)
-
-- [Bug fix: Data Controller ARM Template - Failure when using a service principal scoped to a resource group #624](https://github.com/microsoft/azure_arc/issues/624)
-
-- [Bug fix: Azure Arc using Cluster API Azure provider > 0.5.0 #664](https://github.com/microsoft/azure_arc/issues/664)
-
-#### Azure Arc-enabled app services scenarios
-
-- [New Scenario: Deploy an App Service app using custom container on AKS using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_app_service_arm_template/)
-
-- [New Scenario: Deploy Azure Function application on AKS using an ARM Template](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_app_svc/aks/aks_azure_function_arm_template/)
-
-- [Bug fix: Error when checking initialize status of K8SE stamp with kubectl Unexpected output from kubectl.exe when getting pod statuses #621](https://github.com/microsoft/azure_arc/issues/621)
-
-#### Jumpstart ArcBox
-
-- Improvements to Azure Policy experience. Updated policy names with (ArcBox) callout to easily identify policies created by ArcBox deployment. New policies to support onboarding Dependency Agents and Azure Defender for Kubernetes.
-- Add Change Tracking, Security, VMInsights solutions to deployment.
-- New troubleshooting section in documentation.
-- Add automatic provisioning for Microsoft.HybridCompute and _Microsoft.GuestConfiguration_ resource providers.
-- Various fixes to Cluster API and Data Services components.
-- Automation optimizations and cleanup.
-
-- [Bug fix: Jumpstart ArcBox - Subscription missing Azure ARC server resource providers pre-requisite #672](https://github.com/microsoft/azure_arc/issues/672)
-
-- [Bug fix: Kubernetes Arc Namespace not created - along with resources #674](https://github.com/microsoft/azure_arc/issues/674)
-
-- [Bug fix: failed to get file "infrastructure-components.yaml" #688](https://github.com/microsoft/azure_arc/issues/688)
-
-### June 2021
-
-#### Release highlights
-
-- In this milestone, we introduced our new hosting show ["Jumpstart Lightning"](https://aka.ms/JumpstartLightning-blog), show where you get a chance to share with our team and the world your Azure Arc, Jumpstart contribution and Hybrid cloud awesome stories.
-
-#### Azure Arc-enabled servers scenarios
-
-- [New Scenario: Deploying Windows Server virtual machine in Azure Stack HCI and connect it to Azure Arc using PowerShell](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/azure_stack_hci/azure_stack_hci_windows/)
-
-- [Bug fix: existing linux server onboarding fails #570](https://github.com/microsoft/azure_arc/issues/570)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [Updated Scenario: Deploy Alibaba Cloud Container Service for Kubernetes cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/alibaba/alibaba_terraform/)
-
-- [Bug fix: Deploy GitOps configurations and perform basic GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster #552](https://github.com/microsoft/azure_arc/issues/552)
-
-- [Bug fix: AKS on Azure Stack HCI PowerShell - Preview Note #583](https://github.com/microsoft/azure_arc/issues/583)
-
-- [Bug fix: existing kube config is overwritten instead of merged #586](https://github.com/microsoft/azure_arc/issues/586)
-
-- [Bug fix: Cluster API fails with no "cluster" resource available #617](https://github.com/microsoft/azure_arc/issues/617)
-
-#### Azure Arc-enabled data services scenarios
-
-- [New Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure/arm_template/dc_vanilla/)
-
-- [New Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure/arm_template/mssql_mi/)
-
-- [New Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using Cluster API](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/cluster_api/capi_azure_postgresql_arm_template/)
-
-- [New Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/dc_vanilla/)
-
-- [New Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/mssql_mi/)
-
-- [New Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using MicroK8s](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/microk8s/azure/arm_template/postgresql/)
-
-- [Updated Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_dc_vanilla_arm_template/)
-
-- [Updated Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_mi_arm_template/)
-
-- [Updated Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using AKS](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template/)
-
-- [Updated Scenario: Deploying vanilla Azure Arc-enabled data services in directly connected mode using GKE](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_dc_vanilla_terraform/)
-
-- [Updated Scenario: Deploying SQLMI Azure Arc-enabled data services in directly connected mode using GKE](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_mssql_mi_terraform/)
-
-- [Updated Scenario: Deploying PostgreSQL Azure Arc-enabled data services in directly connected mode using GKE](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_postgres_terraform/)
-
-- [Bug fix: SQL MI Server alias for connection contains wrong value #561](https://github.com/microsoft/azure_arc/issues/561)
-
-#### Jumpstart ArcBox
-
-- Azure Arc-enabled data services components of ArcBox have been updated to use [directly connected mode](https://docs.microsoft.com/azure/azure-arc/data/connectivity#connectivity-modes).
-- Required resource providers are now enabled automatically as part of the automation scripts.
-- Per updated Azure Arc-enabled data services requirements, ArcBox region support is restricted to East US, Northern Europe, and Western Europe.
-- Incorporated streamlined modular automation approach for Azure Arc-enabled data services used by the primary Jumpstart data services scenarios.
-
-#### Azure Arc Jumpstart YouTube channel demos
-
-[New Demo: Deploy SQL Managed Instance on GKE with Azure Arc-enabled data services](https://youtu.be/1jjPmaTa3oc)
-
-### May 2021
-
-#### Release highlights
-
-- In this milestone, we released the ["Jumpstart ArcBox" solution](https://azurearcjumpstart.io/azure_jumpstart_arcbox/), a sandbox environment that allows users to explore all the major capabilities of Azure Arc.
-
-- A new ["Azure Arc and Azure Lighthouse"](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_lighthouse/) was added.
-
-- [Added new disclaimer security best practices](https://github.com/microsoft/azure_arc/pull/531)
-
-- All Terraform-based automation's were updated to support v0.15
-
-#### Azure Arc-enabled servers scenarios
-
-- [Jumpstart enhancement: Added correlation ID to Arc server onboarding scripts](https://github.com/microsoft/azure_arc/pull/537)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [New Scenario: Integrate Azure Defender with Cluster API as an Azure Arc Connected Cluster using Kubernetes extensions](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_defender_extension/)
-
-- [New Scenario: Deploy AKS cluster on Azure IoT Edge and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/iot_uses_cases/aks/)
-
-- [New Scenario: Integrate Open Service Mesh (OSM) with Cluster API as an Azure Arc Connected Cluster using Kubernetes extension](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/cluster_api/cluster_api_osm_extension/)
-
-- [Bug fix: EKS cluster Terraform plan #521](https://github.com/microsoft/azure_arc/issues/521)
-
-#### Azure Arc-enabled data services scenarios
-
-- [Bug fix: adding psql to client vm #519](https://github.com/microsoft/azure_arc/issues/519)
-
-- [Bug fix: Arc DataService on GCP-GKE - no successful deployment - free account is not enough #520](https://github.com/microsoft/azure_arc/issues/520)
-
-- [Bug fix: SQL MI Server alias for connection contains wrong value #561](https://github.com/microsoft/azure_arc/issues/561)
-
-- [Jumpstart enhancement: fetching data services IP's based on kubectl #566](https://github.com/microsoft/azure_arc/issues/566)
-
-#### Azure Arc Jumpstart YouTube channel demos
-
-[New Demo: Azure Defender extension on Azure Arc-enabled Kubernetes](https://www.youtube.com/watch?v=-B1-X4hCR98)
-
-### April 2021
-
-#### Release highlights
-
-- [New Scenario: Integrate Azure Monitor for Containers with GKE as an Azure Arc Connected Cluster using Kubernetes extension](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_monitor_extension/)
-
-- [New Scenario: Deploy Alibaba Cloud Container Service for Kubernetes cluster and connect it to Azure Arc using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/alibaba/alibaba_terraform/)
-
-- [Bug fix: GKE cluster Terraform plan - az_connect_gke.sh link #455](https://github.com/microsoft/azure_arc/issues/455)
-
-- [Bug fix: Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster - Fork vs Clone #459](https://github.com/microsoft/azure_arc/issues/459)
-
-- [Bug fix: Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster - Helm Endpoint #460](https://github.com/microsoft/azure_arc/issues/460)
-
-- [Bug fix: Create cluster with arc_capi_azure.sh hangs when vm SKU of control plane and node are not the same #480](https://github.com/microsoft/azure_arc/issues/480)
-
-- [Bug fix: EKS cluster Terraform plan #521](https://github.com/microsoft/azure_arc/issues/521)
-
-#### Azure Arc-enabled data services scenarios
-
-- [New Scenario: Deploy Azure SQL Managed Instance on AKS using Azure DevOps Release Pipeline](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_mssql_arm_template_ado/)
-
-- [New Scenario: Deploy Azure PostgreSQL on AKS using Azure DevOps Release Pipeline](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/aks/aks_postgresql_arm_template_ado/)
-
-- [New Scenario: Deploy a SQL Managed Instance on EKS using Terraform](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/eks/eks_mssql_mi/)
-
-- [Bug fix: SECURITY Vulnerability : PostgreSQL port 5432 opened to * #396](https://github.com/microsoft/azure_arc/issues/396)
-
-- [Bug fix: GKE default storage class #493](https://github.com/microsoft/azure_arc/issues/493)
-
-- [Bug fix: Data Client VM ARM template has inbound ports open for MSSQL and PostGres #497](https://github.com/microsoft/azure_arc/issues/497)
-
-- [Bug fix: wrong uri #511](https://github.com/microsoft/azure_arc/issues/511)
-
-- [Bug fix: remove quotes in POSTGRES_DATASIZE and POSTGRES_WORKER_NODE_COUNT #512](https://github.com/microsoft/azure_arc/issues/512)
-
-- [Feature request: Adding psql to client vm #519](https://github.com/microsoft/azure_arc/issues/519)
-
-### March 2021
-
-#### Release highlights
-
-- In this milestone, we released our [Jumpstart Scenario Write-up Guidelines](https://azurearcjumpstart.io/scenario_guidelines/) document to help our community with scenarios contribution.
-
-- [Update the "Feature request" template to include new write-up guidelines #473](https://github.com/microsoft/azure_arc/issues/473)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [New Scenario: Deploy GitOps configurations and perform basic GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_basic/)
-
-- [New Scenario: Deploy GitOps configurations and perform Helm-based GitOps flow on AKS on Azure Stack HCI as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_helm/)
-
-- [New Scenario: Integrate Azure Monitor for Containers with MicroK8s as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/aks_stack_hci/aks_hci_gitops_helm/)
-
-- [Bug fix: azure-arc-connectproxy-agent-deployment.yaml #429](https://github.com/microsoft/azure_arc/issues/429)
-
-- [Bug fix: GKE cluster Terraform plan - az_connect_gke.sh link #455](https://github.com/microsoft/azure_arc/issues/455)
-
-- [Bug fix: Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster - Fork vs Clone #459](https://github.com/microsoft/azure_arc/issues/459)
-
-- [Bug fix: Deploy GitOps configurations and perform basic GitOps flow on GKE as an Azure Arc Connected Cluster - Helm Endpoint #460](https://github.com/microsoft/azure_arc/issues/460)
-
-#### Azure Arc-enabled data services scenarios
-
-- [Bug fix: SQL MI AKS ARM Template #437](https://github.com/microsoft/azure_arc/issues/437)
-
-### February 2021
-
-#### Azure Arc Jumpstart YouTube channel demos
-
-In this milestone, we launched our new YouTube channel.
-
-- [New Demo: Apply GitOps Configuration on a kind based cluster with Azure Arc-enabled Kubernetes](https://youtu.be/w1ofpTnRuw4)
-
-- [New Demo: Linux Custom Script Extension integration with Azure Arc-enabled servers](https://youtu.be/srTA97rvOMc)
-
-- [New Demo: Azure Key Vault integration with Azure Arc-enabled servers](https://youtu.be/nKqIn-Cgh8g)
-
-- [New Demo: Azure Arc-enabled Kubernetes with Cluster API and the Azure provider](https://youtu.be/mhHELY6O3VI)
-
-- [New Demo: PostgreSQL on AKS with Azure Arc-enabled data services](https://youtu.be/jSogdbDRcpw)
-
-- [New Demo: Inventory management with Azure Arc-enabled servers](https://youtu.be/fM0WW08LUoQ)
-
-- [New Demo: Onboard Azure Arc-enabled Kubernetes Cluster using kind](https://youtu.be/Xb3mO5vhnGQ)
-
-- [New Demo: Azure Defender integration with Azure Arc-enabled servers](https://youtu.be/PS5YLEOenik)
-
-- [New Demo: Azure Automation Update Management integration with Azure Arc-enabled servers](https://youtu.be/J4WuQC6CmZo)
-
-- [New Demo: Windows Server onboarding with Azure Arc-enabled servers](https://youtu.be/F_0w_fEqx6Y)
-
-- [New Demo: Unified Operations with Azure Arc](https://youtu.be/B2qn_nLDw0k)
-
-- [New Demo: VMware vSphere scaled onboarding with Azure Arc-enabled servers](https://youtu.be/AxmwHJ-w93I)
-
-- [New Demo: Azure Arc-enabled Kubernetes with Azure Red Hat OpenShift](https://youtu.be/928iWrK4QWo)
-
-- [New Demo: AWS EC2 scaled onboarding with Azure Arc-enabled servers using Ansible](https://youtu.be/0Eb2j8XlxUQ)
-
-- [New Demo: Windows Server Custom Script Extension with Azure Arc-enabled servers](https://youtu.be/0TYn5wgQXow)
-
-- [New Demo: Manual Ubuntu server onboarding with Azure Arc-enabled servers](https://youtu.be/0hOPluMVES4)
-
-- [New Demo: Azure Kubernetes Service (AKS) on HCI with Azure Arc-enabled Kubernetes](https://youtu.be/7U3CQnm9SPg)
-
-- [New Demo: Azure Monitor for containers with Azure Arc-enabled Kubernetes](https://youtu.be/8KNu2RSVwCs)
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [New Scenario: Deploy AKS cluster on Azure Stack HCI and connect it to Azure Arc using PowerShell](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/aks_stack_hci/aks_hci_powershell/)
-
-#### Azure Arc-enabled data services scenarios
-
-- [New Scenario: Deploy an Azure PostgreSQL Deployment on GKE using a Terraform plan](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_postgres_terraform/)
-
-### January 2021
-
-#### Azure Arc-enabled servers scenarios
-
-- [New Scenario: Deploy Azure Key Vault Extension to Azure Arc-enabled Ubuntu server and use a Key Vault managed certificate with Nginx](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_keyvault/)
-
-- [Updated Scenario: Connect Azure Arc-enabled servers to Azure Security Center](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_servers/day2/arc_securitycenter/)
-
-#### Azure Arc-enabled SQL Server scenarios
-
-- [All the scenarios](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_sqlsrv/) in this section were updated to support new Azure Arc-enabled SQL Server onboarding script.
-
-#### Azure Arc-enabled Kubernetes scenarios
-
-- [New Scenario: Deploy Kubernetes cluster and connect it to Azure Arc using Cluster API Azure provider](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/cluster_api/capi_azure/)
-
-- [Updated Scenario: Deploy GitOps configurations and perform Helm-based GitOps flow on GKE as an Azure Arc Connected Cluster](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/day2/gke/gke_gitops_helm/)
-
-#### Azure Arc-enabled data services scenarios
-
-- [All the scenarios](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/) in this section were updated to support ["Directly connected"](https://docs.microsoft.com/azure/azure-arc/data/connectivity) mode
-
-- [New Scenario: Deploy an Azure SQL Managed Instance on GKE using a Terraform plan](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/gke/gke_mssql_mi_terraform/)
-
-#### Bug fixes & alignments
-
-- [AKS Arc Disclaimer #336](https://github.com/microsoft/azure_arc/issues/336)
diff --git a/docs/release_notes/archive/2022.md b/docs/release_notes/archive/2022.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docs/scenario_guidelines/_index.md b/docs/scenario_guidelines/_index.md
deleted file mode 100644
index 00b868b693..0000000000
--- a/docs/scenario_guidelines/_index.md
+++ /dev/null
@@ -1,261 +0,0 @@
----
-type: docs
-title: "Scenario Write-up Guidelines"
-linkTitle: "Scenario Write-up Guidelines"
-weight: 7
----
-
-# Jumpstart Scenario Write-up Guidelines
-
-Thank you for considering writing a Jumpstart scenario, we appreciate it, a lot!
-
-The scenarios published as part of the Jumpstart project are high-quality documents and as such we want you to be able to have all the needed guidelines to create one yourself while meeting the project standards and publishing requirements.
-
-In this document, our goal is to provide you with as many details as possible for you to be efficient and successful and as a result, produce an awesome Jumpstart scenario. Our intent here is to give you pointers and tools to achieve just that.
-
-> **IMPORTANT: If you are only getting started with contributing Jumpstart scenarios, it is highly recommended you review the raw code for existing scenarios. These will help you understand what an approved scenario should look like and will represent all the guidelines provided. For any questions, please reach out or tag one of the Jumpstart project maintainers.**
-
-## Code reviews
-
-The Jumpstart project is a mix of various automation, code styles, and high-quality documentation and requires development effort.
-
-Before a scenario is published, it will go through a code review process by one of the project maintainers. We want your scenario to be successful and widely adopted and to meet the highest standards possible and we are here to help get there!
-
-## Pull requests and issues
-
-Whether you are working on a new scenario or updating an existing one, a contribution must be submitted with a dedicated pull request (PR) to make the review process easier.
-
-- New scenario
-
-    For new scenarios, please also create a new issue using the ["Feature request" template](https://github.com/microsoft/azure_arc/issues/new?assignees=&labels=&template=feature_request.md&title=). If needed, multiple examples can be found under the [Jumpstart project GitHub repository](https://github.com/microsoft/azure_arc/projects/1).
-
-    ![Screenshot of "Feature request" template](./feature_request.png)
-
-- Existing scenario
-
-    If you are updating an existing scenario, please create a new issue using the ["Bug report" template](https://github.com/microsoft/azure_arc/issues/new?assignees=&labels=bug&template=bug_report.md&title=).
-
-    ![Screenshot of "Bug report" template](./bug_report.png)
-
-- On the PR, make sure to associate the issue the PR is designed to solve, so once merged, the issue will be closed automatically.
-
-    ![Screenshot of attached issue](./attached_issue.png)
-
-## Folder Structure
-
-The Azure Arc Jumpstart GitHub repository follows a specific folder structure that you should get familiar with before creating or updating a scenario.
-
-- Automation, scripts, templates, JSON & YAML files, etc., must be placed under each Azure Arc technology that corresponds to each scenario.
-- The guide for the scenario must be under docs and follow a similar structure.
-
-![Screenshot of folder structure](./folder_structure.png)
-
-## Indexing
-
-The Azure Arc Jumpstart website is using [HUGO](https://gohugo.io/) as its web framework alongside [Docsy](https://www.docsy.dev/) as its theme of choice.
-
-- Scenarios must be created in its respected "docs" folder in the project GitHub repository and with the "_index.md_" filename for it to get published.
-
-    ![Screenshot of index file location](./index_file_location.png)
-
-- Both the "_title_" and the "_linkTitle_" must be the same.
-
-    ![Screenshot of matching link and linkTitle](./link_title.png)
-
-- The "_Weight_" value number represents the location of the scenario compared to other scenarios on the same page on the website.
-
-    ![Screenshot of weight value in the code](./weight_code.png)
-
-    ![Screenshot of weight value on the website](./weight_web.png)
-
-## Description
-
-All Jumpstart scenarios start with an overview and a description of what will be the result of completing the scenario.
-
-This description should also mention the starting point for the automation, for example for "Unified Operations" (day-2) scenarios you may need an already deployed server or Kubernetes cluster that is onboarded onto Azure Arc, you should also include pointers to scenarios that would allow you to get to that starting point. Below are a couple of examples from existing Jumpstart scenarios:
-
-![Screenshot of description example](./description_example_01.png)
-
-![Screenshot of description example](./description_example_02.png)
-
-## Prerequisites
-
-Every Jumpstart scenario must have a "Prerequisites" section as the first section. Below, you can find guidelines on what to consider for this section.
-
-- The first rule of thumb is to know what should be considered a prerequisite and what can be automated. Generally speaking, if a prerequisite can be automated, it should be incorporated as part of the overall automation flow of the scenario.
-- We would love for you to use good judgment and if the scenario's reviewer finds that a certain prerequisite should be automated he will point that out as part of the pull request code review.
-- As mentioned at the beginning of this guidelines readme, to avoid a situation where you will need to refactor code or make unforced changes, it is highly recommended for you to use existing scenarios as a reference and work from there.
-
-## Markdown linting and style
-
-- All the scenarios and README files follow standard markdown and linting rules. We recommend using [Visual Studio Code (VS Code)](https://code.visualstudio.com/) as it provides a rich IDE experience with support for extensions.
-- Before submitting a PR for a new/updated scenario, make sure to perform markdown linting to avoid errors and typos. If you are using VS Code, we recommend installing the [_markdownlint_ extension] as it provides an easy way of performing an efficient MD lint.
-
-![Screenshot of the markdownlint extension](./markdownlint_extension.png)
-
-- Below, you can find an example of common markdown lint issues that will be presented to you as you are writing your scenario and must be fixed. [Here](https://marketplace.visualstudio.com/items?itemName=DavidAnson.VS Code-markdownlint), you can find detailed explanations of the markdown rules highlighted by the extension and how to fix a violation of these rules.
-
-![Screenshot of the markdown lint errors](./lint_errors.png)
-
-- For bullets (like the one you are just reading), use hyphens, which will be translated to bullet points on the website.
-
-![Screenshot of bullet points in the code](./bullet_points_code.png)
-
-![Screenshot of bullet points on the web](./bullet_points_web.png)
-
-## Screenshots
-
-Quality, accurate, and clean screenshots are critical when it comes to providing a great Jumpstart scenario and reader experience. In this section, you will find examples and guidelines on screenshots standards.
-
-### Format, location and file ordering
-
-- Screenshots must be saved in either a _png_ or _jpg_ file format.
-- Images must include an accurate description for ease of accessibility.
-- When adding screenshots links, keep them in a serial order.
-
-    ![Screenshot of a wrong screenshots order](./wrong_file_order.png)
-
-    ![Screenshot of a correct screenshots order](./correct_file_order.png)
-
-- Image files must be located alongside the scenario _index.md_ file.
-
-    ![Screenshot of a correct screenshots structure](./images_folder.png)
-
-### Boxes, arrows and step numbers
-
-- Either highlighting boxes and/or arrows must be created in a non-freeform fashion. Choose color and line width that make sense so it will be embedded nicely in the screenshot.
-
-    ![Screenshot of a wrong highlighting and arrow](./wrong_highlighting.png)
-
-    ![Screenshot of a correct highlighting and arrow](./correct_highlighting.png)
-
-- When creating step numbers, make sure these are positioned correctly and visible to the reader.
-
-    ![Screenshot of wrong step numbers positioning and color](./wrong_numbers_positioning.png)
-
-    ![Screenshot of correct step numbers positioning and color](./correct_numbers_positioning.png)
-
-- Be aware of sensitive information on your screenshots and be sure to blur it out: subscription ID, passwords, service principals, etc.
-- For Azure portal-related screenshots, we recommend using the ["Az Mask" Edge/Chrome browser extension](https://chrome.google.com/webstore/detail/az-mask/amobeamdmdnloajcaiomgegpakjdiacm).
-
-    ![Screenshot of Az Mask extension page](az_mask.png)
-
-## Code blocks and commands
-
-Jumpstart scenarios include code blocks and commands and as such, for it to meet markdown rules and scenario standards, each code block and command must use the correct markdown language highlighter.
-
-As you can see in the below examples, each block is represented differently, depending on the scenario.
-
-- Shell and JSON code blocks example
-
-    ![Screenshot of a shell+json code block format in the code](./shell_json_code_block_code.png)
-
-    ![Screenshot of shell+json code block format on the website](./shell_json_code_block_web.png)
-
-- PowerShell code blocks example
-
-    ![Screenshot of a PowerShell code block format in the code](./ps_code_block_code.png)
-
-    ![Screenshot of PowerShell code block format on the website](./ps_code_block_web.png)
-
-## Positioning and alignments
-
-### Image positioning
-
-Image link's position must be aligned with their respective bulletining or header. This helps with readability and creates a cleaner look. Below is an example of what such alignment looks like in the code and on the website.
-
-![Screenshot of a correct image positioning in the code](./image_position_code.png)
-
-![Screenshot of a correct image positioning in the website](./image_position_web.png)
-
-### Code block positioning
-
-Code blocks must be positionally aligned with their respective bulletining or header. This helps with readability and creates a cleaner look. Below is an example of how such alignment looks like on the website.
-
-![Screenshot of a wrong code block positioning](./wrong_code_block_positioning.png)
-
-![Screenshot of a correct code block positioning](./correct_code_block_positioning.png)
-
-## Credentials, secrets and passwords
-
-There is no need to mention how important secrets and passwords are. As you are writing your code and the guide for the scenario, be very cognizant of what code you are committing.
-
-Whether it's a credential that should be included or a secret/password as part of a terminal out, make sure these are masked from the reader.
-
-![Screenshot of unwanted credentials files](./unwanted_credentials_files.png)
-
-![Screenshot of masked secrets](./masked_secrets.png)
-
-## Notes, disclaimers and highlighted text
-
-There are many ways for you to emphasize a specific text in your scenario README file.
-
-- To create a note or a disclaimer, below you can find a couple of examples of the format we have been using and how the result would look on the Jumpstart website. **Use capital letters for these types of markdown text**.
-
-    ![Screenshot of NOTE format raw code](./note_code.png)
-
-    ![Screenshot of NOTE format in the website](./note_web.png)
-
-- When you need to either bold or italic a text, use the below markdown characters.
-
-    ![Screenshot of bold text in the code](./bold_text_code.png)
-
-    ![Screenshot of bold text on the website](./bold_text_web.png)
-
-    ![Screenshot of italic text in the code](./italic_code.png)
-
-    ![Screenshot of italic text on the website](./italic_web.png)
-
-## Naming convention and branding
-
-The Jumpstart scenarios include many tech terms, brand names, and various naming conventions. For example, how a company name, a product, or a feature is written down is important.
-
-The project maintainers are keeping a naming convention list which can be found [here](https://github.com/microsoft/azure_arc/tree/main/docs/scenario_guidelines/naming.md).
-
-## Examples
-
-Examples of what a result of output should look like are very useful and contribute to the overall confidence of the reader as well as significantly reduce potential user errors.
-
-Rather if it's in an example code block, a command, or a screenshot, wherever it makes sense, include an example of how something should look like.
-
-[Here](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_k8s/gke/gke_terraform/#deployment) you can find an example of an example :-)
-
-## File trails
-
-Before submitting your PR, make sure not to include unwanted files such as logs, credentials, state files, scripts testing files, etc. If it's not part of the scenario, it shouldn't be included.
-
-![Screenshot of unwanted file trails](./unwanted_file_trails.png)
-
-## Links
-
-Every scenario includes URLs, either to an external or internal source.
-
-- When you want to point the reader to another Jumpstart scenario, make sure you are using the Jumpstart website URL link, meaning _azurearcjumpstart.io/other-scenario_ and not the GitHub repository _index.md_ file. You want to provide an experience that does not force the reader to go outside of the website.
-
-    ![Screenshot of Jumpstart links in the code](./links_code.png)
-
-    ![Screenshot of Jumpstart links on the website](./links_web.png)
-
-- When linking to a script or source code files, use the GitHub repository URL.
-
-    ![Screenshot of source code link in the code](./source_code_link_code.png)
-
-    ![Screenshot of source code link on the website](./source_code_link_web.png)
-
-- When linking to Microsoft documentation, in your browser, the URL address will default to your local language of choice. For accessibility purposes, remove the localization reference from the markdown link.
-
-    ![Screenshot of localization reference](./localization_reference.png)
-
-- To avoid broken links, we recommend using [HTTP/s and relative link checker](https://marketplace.visualstudio.com/items?itemName=blackmist.LinkCheckMD#:~:text=To%20check%20for%20broken%20links,links%20as%20they%20are%20checked.) VS Code extension. Make sure to fix all issues before submitting your PR.
-
-    ![Screenshot of link checker VS Code extension](./link_checker.png)
-
-## Automation flows explanation
-
-Incorporating an explanation of how you designed the automation in your scenario is key and helps the reader understand the "how" and the overall success of the scenario.
-
-- Generally speaking, it makes sense for each scenario to have an "Automation Flow" section right after the "Prerequisites" section. That way, the reader can get a sense of what is happening "behind the scenes".
-- Automation flow section should be accurate and comprehensive but also not too long. Bullet points explaining the flow are ok.
-- Automation flow sections follow specific language and format, there are multiple examples for Automation flow in several scenarios. You can either [take a look at this example](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/kubeadm/kubeadm_dc_vanilla_arm_template/#automation-flow) or search for "Automation Flow" in the Jumpstart homepage.
-
-    ![Screenshot of searching for Automation Flow](./automation_flow.png)
diff --git a/docs/scenario_guidelines/naming.md b/docs/scenario_guidelines/naming.md
deleted file mode 100644
index 227fedaf7f..0000000000
--- a/docs/scenario_guidelines/naming.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Naming convention and branding
-
-| Wrong                              | Correct                            | Comments                       |
-|------------------------------------|------------------------------------|--------------------------------|
-| Azure ARC                          | Azure Arc                          |                                |
-| Azure Arc-enabled Servers          | Azure Arc-enabled servers          |                                |
-| Azure Arc-enabled SQL              | Azure Arc-enabled SQL server       |                                |
-| Azure Arc-enabled Kubernetes       | Azure Arc-enabled Kubernetes       |                                |
-| Azure Arc-enabled Data Services    | Azure Arc-enabled data services    |                                |
-| Azure Arc-enabled App Services     | Azure Arc-enabled app services     |                                |
-| Azure Arc-enabled Machine Learning | Azure Arc-enabled machine learning |                                |
-| Vmware                             | VMware                             |                                |
-| RedHat                             | Red Hat                            |                                |
-| Azure Resource Group               | Azure resource group               | Unless it's in a header/title  |
-| Azure Service Principal            | Azure service principal            |                                |
-| Azure Region                       | Azure region                       |                                |
-| Azure Subscription                 | Azure subscription                 |                                |
-| vagrant                            | Vagrant                            | Unless if it's in a command    |
-| postgresql                         | PostgreSQL                         | Unless if it's in a command    |
-| powershell                         | PowerShell                         | Unless if it's in a code block |
-| python                             | Python                             | Unless if it's in a code block |
-| json                               | JSON                               | Unless if it's in a code block |
-| yaml                               | YAML                               | Unless if it's in a code block |
-| HyperV                             | Hyper-V                            |                                |
-| params                             | parameters                         |                                |
-| Azure cloud shell                  | Azure Cloud Shell                  |                                |
-| kubernetes                         | Kubernetes                         |                                |
diff --git a/docs/security/_index.md b/docs/security/_index.md
deleted file mode 100644
index 29f27d5d39..0000000000
--- a/docs/security/_index.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-type: docs
-title: "Security"
-linkTitle: "Security"
-weight: 12
----
-
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
-
-# Security
-
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
-
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
-
-## Reporting Security Issues
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
-
-If you prefer to submit without logging in, send an email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/msrc/pgp-key-msrc).
-
-You should receive a response within 24 hours. If, for some reason, you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
-  - Type of issue (for example, buffer overflow, SQL injection, cross-site scripting, etc.)
-  - Full paths of source file(s) related to the manifestation of the issue
-  - The location of the affected source code (tag/branch/commit or direct URL)
-  - Any special configuration required to reproduce the issue
-  - Step-by-step instructions to reproduce the issue
-  - Proof-of-concept or exploit code (if possible)
-  - Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/msrc/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->
diff --git a/tests/ArmTemplateCheck.ps1 b/tests/ArmTemplateCheck.ps1
deleted file mode 100644
index 65320a9086..0000000000
--- a/tests/ArmTemplateCheck.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-$ArmFile=$args[0]
-$ExcludeRules=$args[1]
-
-git clone https://github.com/Azure/arm-ttk.git --quiet .\arm-ttk
-Import-Module .\arm-ttk\arm-ttk
-Install-Module Pester -AllowClobber -RequiredVersion 4.10.1 -Force -SkipPublisherCheck -Scope CurrentUser
-Import-Module Pester -RequiredVersion 4.10.1 -ErrorAction Stop
-$results = Invoke-Pester -Script @{Path = ".\tests\TestArmTemplate.ps1"; Parameters = @{TemplatePath = "$ArmFile"; Skip = "$ExcludeRules"}} -OutputFormat NUnitXml -OutputFile TEST-arm_template.xml -PassThru
-if ($results.TestResult.Result -contains "Failed") {Write-Error -Message "Test Failed"}
\ No newline at end of file
diff --git a/tests/BashStaticCheck.sh b/tests/BashStaticCheck.sh
deleted file mode 100644
index 0a8a0c8944..0000000000
--- a/tests/BashStaticCheck.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-ExcludeRules=$1
-RootFiles=$2
-
-for file in $(find "$RootFiles" -iname "*.sh" -type f); do shellcheck --exclude="$ExcludeRules" "$file"; done
diff --git a/tests/CountResources.sh b/tests/CountResources.sh
deleted file mode 100644
index f654319b4f..0000000000
--- a/tests/CountResources.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# It is required to be have azure cli log in
-
-ResourceGroup=$1
-Flavor=$2
-Step=$3
-DeployTestParametersFile=$4
-DeployBastion=$5
-
-# Getting config values
-config=$(cat "$DeployTestParametersFile")
-
-# Getting expected result from config. It depends on the flavor.
-jquery=".$Flavor.$Step"
-resourceExpected=$(echo "$config" | jq "$jquery")
-
-# Apply Bastion difference if needed
-if [ "$DeployBastion" = "true" ]; then
-   jqueryBastion=".$Flavor.deployBastionDifference"
-   deployBastionDifference=$(echo "$config" | jq "$jqueryBastion")
-   resourceExpected=$(($resourceExpected + $deployBastionDifference))
-fi
-
-# Count real resurces
-portalResources=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -v '/extensions/' -c)
-
-# Do the validation
-if [ "$portalResources" -ge "$resourceExpected" ]; then
-   echo "We have $portalResources resources"
-else
-   echo "Error # resources $portalResources"
-   exit 1
-fi
diff --git a/tests/DeployTestParameters.json b/tests/DeployTestParameters.json
deleted file mode 100644
index 915b4e253a..0000000000
--- a/tests/DeployTestParameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "Full": {
-    "initialResourceAmount": 52,
-    "resourcesAfterScriptExecution": 95,
-    "azureArcMachinesExpected": 5,
-    "policiesDeploymentExpected": 6,
-    "workbooksExpected": 1,
-    "deployBastionDifference": 0,
-    "desktopElementsExpected": 8,
-    "connectedK8sClustersExpected": 2,
-    "keyVaultsExpected": 0,
-    "azuredatastudioSettingExpected": 1
-  },
-  "ITPro": {
-    "initialResourceAmount": 13,
-    "resourcesAfterScriptExecution": 21,
-    "azureArcMachinesExpected": 5,
-    "policiesDeploymentExpected": 5,
-    "workbooksExpected": 1,
-    "deployBastionDifference": 2,
-    "desktopElementsExpected": 2,
-    "connectedK8sClustersExpected": 0,
-    "keyVaultsExpected": 0,
-    "azuredatastudioSettingExpected": 0
-  },
-  "DevOps": {
-    "initialResourceAmount": 50,
-    "resourcesAfterScriptExecution": 54,
-    "azureArcMachinesExpected": 0,
-    "policiesDeploymentExpected": 2,
-    "workbooksExpected": 1,
-    "deployBastionDifference": 0,
-    "desktopElementsExpected": 2,
-    "connectedK8sClustersExpected": 2,
-    "keyVaultsExpected": 1,
-    "azuredatastudioSettingExpected": 0
-  }
-}
\ No newline at end of file
diff --git a/tests/DownloadLogs.sh b/tests/DownloadLogs.sh
deleted file mode 100644
index 9a75ac5db2..0000000000
--- a/tests/DownloadLogs.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-windowsAdminUsername=${1}
-resourceGroupName=${2}
-flavor=${3}
-windowsAdminSecret=${4}
-
-# Zip all the log directory
-plink -ssh -P 2204 $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv) -pw "$windowsAdminSecret" -batch '7z a c:\ArcBox\logs\LogsBundle.zip c:\ArcBox\logs\*.*'
-# Get zip file
-sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'c:\ArcBox\logs\LogsBundle.zip' '.' || echo "LogsBundle.zip not able to be downloaded"
-
-# depending on the flavor, download individual logs
-sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\Bootstrap.log' '.' || echo "Bootstrap.log not able to be downloaded"
-if [ $flavor == 'Full' ] || [ $flavor == 'ITPro' ]; then
-  sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\ArcServersLogonScript.log' '.' || echo "ArcServersLogonScript.log not able to be downloaded"
-fi
-if [ $flavor == 'Full' ]; then
-  sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\DataServicesLogonScript.log' '.' || echo "DataServicesLogonScript.log not able to be downloaded"
-fi
-if [ $flavor == 'Full' ] || [ $flavor == 'DevOps' ]; then
-  sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\DevOpsLogonScript.log' '.' || echo "DevOpsLogonScript.log not able to be downloaded"
-  sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\installCAPI.log' '.' || echo "installCAPI.log not able to be downloaded"
-  sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\installK3s.log' '.' || echo "installK3s.log not able to be downloaded"
-fi
-sshpass -p "$windowsAdminSecret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\MonitorWorkbookLogonScript.log' '.' || echo "MonitorWorkbookLogonScript.log not able to be downloaded"
diff --git a/tests/FileValidations.sh b/tests/FileValidations.sh
deleted file mode 100644
index b152825688..0000000000
--- a/tests/FileValidations.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-resourceGroup=${1}
-flavor=${2}
-deployTestParametersFile=${3}
-windowsAdminUsername=${4}
-windowsAdminSecret=${5}
-
-validations=true
-
-# Getting expected values
-config=$(cat "$deployTestParametersFile")
-
-# Count element on  C:\Users\Public\Desktop
-countDesktopFilesPublic=$(plink -ssh -P 2204 $windowsAdminUsername@$(az vm show -d -g "$resourceGroup" -n ArcBox-Client --query publicIps -o tsv) -pw "$windowsAdminSecret" -batch 'dir C:\Users\Public\Desktop /b | find /v /c "::"') || countDesktopFilesPublic=0
-countDesktopFilesPublic=${countDesktopFilesPublic//[$'\t\r\n']/}
-
-# Count element on user Desktop
-countDesktopFilesArcDemo=$(plink -ssh -P 2204 $windowsAdminUsername@$(az vm show -d -g "$resourceGroup" -n ArcBox-Client --query publicIps -o tsv) -pw "$windowsAdminSecret" -batch 'dir c:\Users\'$windowsAdminUsername'\Desktop /b | find /v /c "::"') || countDesktopFilesArcDemo=0
-countDesktopFilesArcDemo=${countDesktopFilesArcDemo//[$'\t\r\n']/}
-
-# Real Desktop elements
-countDesktopFiles=$(($countDesktopFilesPublic + $countDesktopFilesArcDemo))
-
-# Get expected result
-jqueryDesktopElementsExpected=".$flavor.desktopElementsExpected"
-desktopElementsExpected=$(echo "$config" | jq "$jqueryDesktopElementsExpected")
-
-# Do the validation
-if [ "$countDesktopFiles" -ge "$desktopElementsExpected" ]; then
-  echo "Number of element on Desktop: $countDesktopFiles"
-else
-  echo "Unexpected number of element on Desktop: $countDesktopFiles"
-  validations=false
-fi
-
-# validate Azuredatastudio Setting
-
-# Get expected result
-jqueryAzuredatastudioSettingExpected=".$flavor.azuredatastudioSettingExpected"
-azuredatastudioSettingExpected=$(echo "$config" | jq "$jqueryAzuredatastudioSettingExpected")
-
-if [ $azuredatastudioSettingExpected -gt 0 ]; then
-  countAzuredatastudioSetting=$(plink -ssh -P 2204 $windowsAdminUsername@$(az vm show -d -g "$resourceGroup" -n ArcBox-Client --query publicIps -o tsv) -pw "$windowsAdminSecret" -batch 'dir C:\Users\'$windowsAdminUsername'\AppData\Roaming\azuredatastudio\User\settings.json /b | find /v /c "::"') || countAzuredatastudioSetting=0
-  countAzuredatastudioSetting=${countAzuredatastudioSetting//[$'\t\r\n']/}
-
-  countAzuredatastudioSettingSize=$(plink -ssh -P 2204 $windowsAdminUsername@$(az vm show -d -g "$resourceGroup" -n ArcBox-Client --query publicIps -o tsv) -pw "$windowsAdminSecret" -batch 'forfiles /p C:\Users\'$windowsAdminUsername'\AppData\Roaming\azuredatastudio\User /m settings.json /c "cmd /c echo @fsize"')
-  countAzuredatastudioSettingSize=${countAzuredatastudioSettingSize//[$'\t\r\n']/}
-
-  if [ $countAzuredatastudioSetting -gt 0 ]; then
-    if [ $countAzuredatastudioSettingSize -gt 0 ]; then
-      echo "Azuredatastudio Setting exists and size is bigger than 1"
-      azuredatastudioSetting=$(plink -ssh -P 2204 $windowsAdminUsername@$(az vm show -d -g "$resourceGroup" -n ArcBox-Client --query publicIps -o tsv) -pw "$windowsAdminSecret" -batch 'type C:\Users\'$windowsAdminUsername'\AppData\Roaming\azuredatastudio\User\settings.json')
-      connections=$(echo $azuredatastudioSetting | jq '."datasource.connections" | length')
-      if [ $connections = "2" ]; then
-        echo "We detected two connection on azure data studio setting. it is expected"
-        for index in 0 1; do
-          jqQuery='."datasource.connections"['$index'].options.connectionName'
-          connectionName=$(echo $azuredatastudioSetting | jq -r $jqQuery)
-          if [ $connectionName == "ArcSQLMI" ]; then
-            jqQuery='."datasource.connections"['$index'].options.server'
-            server=$(echo $azuredatastudioSetting | jq -r $jqQuery)
-            arrServer=(${server//,/ })
-            port=${arrServer[1]}
-            if [ -z "$port" ] || [ $port == "null" ]; then
-              echo "Azure data studio setting: ArcSQLMI port is null"
-              validations=false
-            else
-              re='^[0-9]+$'
-              if ! [[ $port =~ $re ]]; then
-                echo "Azure data studio setting: ArcSQLMI port is Not a Number"
-                validations=false
-              else
-                echo "Azure data studio setting: ArcSQLMI port has value and it is a number"
-              fi
-            fi
-          fi
-          if [ $connectionName == "ArcPostgres" ]; then
-            jqQuery='."datasource.connections"['$index'].options.port'
-            port=$(echo $azuredatastudioSetting | jq -r $jqQuery)
-            if [ -z "$port" ] || [ $port == "null" ]; then
-              echo "Azure data studio setting: ArcPostgres port is null"
-              validations=false
-            else
-              re='^[0-9]+$'
-              if ! [[ $port =~ $re ]]; then
-                echo "Azure data studio setting: ArcPostgres port is Not a Number"
-                validations=false
-              else
-                echo "Azure data studio setting: ArcPostgres port has value and it is a number"
-              fi
-            fi
-          fi
-        done
-      else
-        echo "Two connections are expected on azure data studio setting and we found $connections"
-      fi
-    else
-      echo "Unexpected size of element on AzuredatastudioSetting: $countAzuredatastudioSettingSize"
-    fi
-  else
-    echo "Unexpected number of element on AzuredatastudioSetting: $countAzuredatastudioSetting"
-    validations=false
-  fi
-fi
-
-# fail if some validation was not reach
-if [ "$validations" = "false" ]; then
-  echo "Something was wrong. Failing"
-  exit 1
-fi
diff --git a/tests/FinalValidation.sh b/tests/FinalValidation.sh
deleted file mode 100644
index 9083d0085d..0000000000
--- a/tests/FinalValidation.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash
-# It is required to be have azure cli log in
-
-ResourceGroup=$1
-Flavor=$2
-DeployTestParametersFile=$3
-DeployBastion=$4
-
-az config set extension.use_dynamic_install=yes_without_prompt
-
-validations=true
-# Getting expected values
-config=$(cat "$DeployTestParametersFile")
-
-# Resource Count Validation after scripts were executed on the VM
-jqueryresourcesAfterScriptExecution=".$Flavor.resourcesAfterScriptExecution"
-resourceExpected=$(echo "$config" | jq "$jqueryresourcesAfterScriptExecution")
-if [ "$DeployBastion" = "true" ]; then
-   jqueryBastion=".$Flavor.deployBastionDifference"
-   deployBastionDifference=$(echo "$config" | jq "$jqueryBastion")
-   # +1 because we added a public ip to connect OpenSSH
-   resourceExpected=$(($resourceExpected + $deployBastionDifference + 1))
-fi
-portalResources=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -v '/extensions/' -c)
-if [ "$portalResources" -ge "$resourceExpected" ]; then
-   echo "We have $portalResources resources after script execution inside VM"
-else
-   echo "Error # resources $portalResources"
-   validations=false
-fi
-
-# Validate Arc enable server amount
-azureArcMachines=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -v '/extensions/' | grep -h '/Microsoft.HybridCompute/machines/' -c)
-jqueryAzureArcMachinesExpected=".$Flavor.azureArcMachinesExpected"
-azureArcMachinesExpected=$(echo "$config" | jq "$jqueryAzureArcMachinesExpected")
-if [ "$azureArcMachines" -ge "$azureArcMachinesExpected" ]; then
-   echo "We have $azureArcMachines Azure Arc Machines"
-else
-   echo "Error # Azure Arc Machine $azureArcMachines"
-   validations=false
-fi
-
-# Validate Arc enable status if there are expected servers
-if [ "$azureArcMachines" -ge "5" ]; then
-   ArcBoxWin2K19=$(az resource show -g "$ResourceGroup" -n ArcBox-Win2K19 --resource-type 'Microsoft.HybridCompute/machines' --query properties.status -o tsv) || ArcBoxWin2K19="NoConnected"
-   ArcBoxWin2K22=$(az resource show -g "$ResourceGroup" -n ArcBox-Win2K22 --resource-type 'Microsoft.HybridCompute/machines' --query properties.status -o tsv) || ArcBoxWin2K22="NoConnected"
-   ArcBoxSQL=$(az resource show -g "$ResourceGroup" -n ArcBox-SQL --resource-type 'Microsoft.HybridCompute/machines' --query properties.status -o tsv) || ArcBoxSQL="NoConnected"
-   ArcBoxUbuntu=$(az resource show -g "$ResourceGroup" -n ArcBox-Ubuntu --resource-type 'Microsoft.HybridCompute/machines' --query properties.status -o tsv) || ArcBoxUbuntu="NoConnected"
-   ArcBoxCentOS=$(az resource show -g "$ResourceGroup" -n ArcBox-CentOS --resource-type 'Microsoft.HybridCompute/machines' --query properties.status -o tsv) || ArcBoxCentOS="NoConnected"
-   if [ "Connected" = "$ArcBoxWin2K19" ] && [ "Connected" = "$ArcBoxWin2K22" ] && [ "Connected" = "$ArcBoxSQL" ] && [ "Connected" = "$ArcBoxUbuntu" ] && [ "Connected" = "$ArcBoxCentOS" ]; then
-      echo "We have 5 Azure Arc Machines with status Connected"
-   else
-      echo "Error Arc Machines status  $ArcBoxWin2K19  $ArcBoxWin2K22  $ArcBoxSQL  $ArcBoxUbuntu  $ArcBoxCentOS"
-      validations=false
-   fi
-fi
-
-# Validate number of policies expected to be deployed
-policiesDeployment=$(az policy assignment list -g "$ResourceGroup" --query '[].id' -o tsv | wc -l)
-jqueryPoliciesDeploymentExpected=".$Flavor.policiesDeploymentExpected"
-policiesDeploymentExpected=$(echo "$config" | jq "$jqueryPoliciesDeploymentExpected")
-if [ "$policiesDeploymentExpected" = "$policiesDeployment" ]; then
-   echo "We have $policiesDeployment policy assignment"
-else
-   echo "Error # policy assignment $policiesDeployment"
-   validations=false
-fi
-
-# Validate number of Workbooks expected to be deployed
-workbooks=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -v '/extensions/' | grep -h '/microsoft.insights/workbooks/' -c)
-jqueryWorkbooksExpected=".$Flavor.workbooksExpected"
-workbooksExpected=$(echo "$config" | jq "$jqueryWorkbooksExpected")
-if [ "$workbooksExpected" = "$workbooks" ]; then
-   echo "We have $workbooks Azure Workbook created"
-else
-   echo "Error #  Azure Workbook $workbooks"
-   validations=false
-fi
-
-# Validate number of Azure Bastion expected to be deployed
-if [ "$deployBastion" = "true" ]; then
-   bastionResource=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -v '/extensions/' | grep -h 'Microsoft.Network/bastionHosts' -c)
-   if [ "1" = "$bastionResource" ]; then
-      echo "We have $bastionResource Azure Bastion created"
-   else
-      echo "Error #  Azure Bastion $bastionResource"
-      validations=false
-   fi
-fi
-
-# Validate number of k8s Connected Clusters expected to be deployed
-connectedK8sClustersExpected=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -h 'Microsoft.Kubernetes/connectedClusters' -c)
-jqueryconnectedK8sClustersExpected=".$Flavor.connectedK8sClustersExpected"
-connectedK8sClustersExpectedExpected=$(echo "$config" | jq "$jqueryconnectedK8sClustersExpected")
-if [ "$connectedK8sClustersExpectedExpected" = "$connectedK8sClustersExpected" ]; then
-   echo "We have $connectedK8sClustersExpected connected k8s clusters"
-else
-   echo "Error # connected k8s clusters $connectedK8sClustersExpected"
-   validations=false
-fi
-
-# Validate k8s Connected Clusters status and extensions expected
-for val in $(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -h 'Microsoft.Kubernetes/connectedClusters'); do
-   readarray -d / -t resourceArray <<<"$val"
-   name="${resourceArray[${#resourceArray[*]} - 1]}"
-   name=${name//[$'\t\r\n']/}
-   echo "------ Processiong $name Kubernetes Connected Cluster ---------"
-   connected=$(az resource show -g "$ResourceGroup" --resource-type 'Microsoft.Kubernetes/connectedClusters' -n $name --query properties.connectivityStatus -o tsv)
-   if [ "Connected" = "$connected" ]; then
-      echo "Status Connected"
-   else
-      echo "Error status: $connected"
-      validations=false
-   fi
-   count=$(az k8s-extension list --cluster-name $name --cluster-type connectedClusters --resource-group "$ResourceGroup" --query '[].extensionType' -o tsv | grep -h 'azuredefender' -c)
-   if [ "$count" = "1" ]; then
-      echo "Defender extension on: $name"
-   else
-      echo "Defender extention not found on: $name"
-      validations=false
-   fi
-   count=$(az k8s-extension list --cluster-name $name --cluster-type connectedClusters --resource-group "$ResourceGroup" --query '[].extensionType' -o tsv | grep -h 'azuremonitor' -c)
-   if [ "$count" = "1" ]; then
-      echo "Azure Monitor extension on: $name"
-   else
-      echo "Azure Monitor extention not found on: $name"
-      validations=false
-   fi
-   count=$(az k8s-extension list --cluster-name $name --cluster-type connectedClusters --resource-group "$ResourceGroup" --query '[].extensionType' -o tsv | grep -h 'policyinsights' -c)
-   if [ "$count" = "1" ]; then
-      echo "policyinsights extension on: $name"
-   else
-      echo "policyinsights extension not found on: $name"
-      validations=false
-   fi
-   if [ "$name" = "ArcBox-CAPI-Data" ] && [ "$Flavor" = "DevOps" ]; then
-      count=$(az k8s-extension list --cluster-name $name --cluster-type connectedClusters --resource-group "$ResourceGroup" --query '[].extensionType' -o tsv | grep -h 'azurekeyvaultsecretsprovider' -c)
-      if [ "$count" = "1" ]; then
-         echo "azurekeyvaultsecretsprovider extension on: $name"
-      else
-         echo "azurekeyvaultsecretsprovider extention not found on: $name"
-         validations=false
-      fi
-      count=$(az k8s-extension list --cluster-name $name --cluster-type connectedClusters --resource-group "$ResourceGroup" --query '[].extensionType' -o tsv | grep -h 'openservicemesh' -c)
-      if [ "$count" = "1" ]; then
-         echo "openservicemesh extension on: $name"
-      else
-         echo "openservicemesh extention not found on: $name"
-         validations=false
-      fi
-      count=$(az k8s-extension list --cluster-name $name --cluster-type connectedClusters --resource-group "$ResourceGroup" --query '[].extensionType' -o tsv | grep -h 'flux' -c)
-      if [ "$count" = "1" ]; then
-         echo "flux extension on: $name"
-      else
-         echo "flux extention not found on: $name"
-         validations=false
-      fi
-   fi
-   echo "------ End Processiong $name Kubernetes Connected Cluster ---------"
-done
-
-# Validate number of Key Vault expected to be deployed
-keyVaultsExpecteds=$(az resource list -g "$ResourceGroup" --query '[].id' -o tsv | grep -h 'Microsoft.KeyVault/vaults' -c)
-jquerykeyVaultsExpecteds=".$Flavor.keyVaultsExpected"
-countkeyVaultsExpectedExpected=$(echo "$config" | jq "$jquerykeyVaultsExpecteds")
-if [ "$countkeyVaultsExpectedExpected" = "$keyVaultsExpecteds" ]; then
-   echo "We have $keyVaultsExpecteds Key Vault resources"
-else
-   echo "Error # Key Vault resources $keyVaultsExpecteds"
-   validations=false
-fi
-
-if [ "$validations" = "false" ]; then
-   echo "Something was wrong. Failing"
-   exit 1
-fi
diff --git a/tests/GHActionDeploy.ps1 b/tests/GHActionDeploy.ps1
deleted file mode 100644
index e269ce123f..0000000000
--- a/tests/GHActionDeploy.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-$Env:ArcBoxDir = "C:\ArcBox"
-$Env:ArcBoxLogsDir = "$Env:ArcBoxDir\Logs"
-
-Start-Transcript -Path $Env:ArcBoxLogsDir\GHActionDeploy.log
-Write-Output "GHActionDeploy log in"
-
-# Deploy ArcServersLogonScript if needed, this script doesn´t work running on openSSH. Refedence on the readme file.
-if ($Env:flavor -eq "Full" -Or $Env:flavor -eq "ITPro") {
-    Write-Output "Deploying ArcServersLogonScript."
-    Write-Output "`n"
-    Invoke-Expression $Env:ArcBoxDir\ArcServersLogonScript.ps1
-    Write-Output "Deployed ArcServersLogonScript."
-    Write-Output "`n"
-}
-
-# Install OpenSSH on port 2204 inside the VM to execute the logOn scripts, download log, query directories for executing validation commands. 
-Invoke-Expression $Env:ArcBoxDir\OpenSSHDeploy.ps1
-
-Write-Output "Deployed OpenSSH"
-
-Write-Output "Deployed OpenSSH" > $Env:ArcBoxLogsDir\OpenSSHDeployed.txt
-exit 0
\ No newline at end of file
diff --git a/tests/GitHubActionDocumentation/ExecuteGitHubActions.md b/tests/GitHubActionDocumentation/ExecuteGitHubActions.md
deleted file mode 100644
index 1b52f6e7aa..0000000000
--- a/tests/GitHubActionDocumentation/ExecuteGitHubActions.md
+++ /dev/null
@@ -1,184 +0,0 @@
-# ArcBox automatic deployment and testing
-
-The goal of the scripts in this folder is to enable the automated deployment and testing of ArcBox in a Continuous Integration / Continuous Deployment (CI/CD) model.
-
-The solution is implemented using [GitHub Actions](https://docs.github.com/actions), and is currently configured to run only when manually invoked.
-
-## Prepare the repo
-
-You need to have permissions to run workflows on the repo where the automation workflow is going to run. You should already have the right level of permissions if you are working on your own fork.
-
-First you need to register some secrets the workflow will consume at run-time.
-
-![image](./secret.PNG)
-
-AZURE_CREDENTIALS is the Azure Service Principal [deployment credentials](https://github.com/marketplace/actions/azure-login#configure-deployment-credentials) the scripts will use to deploy ArcBox to your subscription.  
-The other variables are the secret variables defined on the [Azure Arc Box deployment scripts](https://azurearcjumpstart.io/azure_jumpstart_arcbox/).  
-
-The example below illustrates how to user the Azure CLI to create the service principal (--sdk-auth is important):
-
-```azurecli
-az ad sp create-for-rbac -n "jumpstartArcBox" --role "User Access Administrator" --scopes /subscriptions/xxx --sdk-auth
-```
-
-See possible values for the role parameter on [Azure Arc Box deploys](https://azurearcjumpstart.io/azure_jumpstart_arcbox/).
-
-The complete JSON result must be stored as the value of the AZURE_CREDENTIALS secret
-
-```json
-{
-  "clientId": "xxx",
-  "clientSecret": "xxxx",
-  "subscriptionId": "xxxx",
-  "tenantId": "xxxx",
-  "activeDirectoryEndpointUrl": "https://login.microsoftonline.com",
-  "resourceManagerEndpointUrl": "https://management.azure.com/",
-  "activeDirectoryGraphResourceId": "https://graph.windows.net/",
-  "sqlManagementEndpointUrl": "https://management.core.windows.net:8443/",
-  "galleryEndpointUrl": "https://gallery.azure.com/",
-  "managementEndpointUrl": "https://management.core.windows.net/"
-}
-```
-
-You can set the following secrets with the values from the JSON output: SPN_CLIENT_ID, SPN_CLIENT_SECRET,SPN_SUBSCRIPTION_ID, and SPN_TENANT_ID. The ArcBox resources resources will be created using this account.
-
-You also need to define the secrets SSH_RSA_PUBLIC_KEY (instructions are provided in [Azure Arc Box deploys](https://azurearcjumpstart.io/azure_jumpstart_arcbox/)), and WINDOWS_ADMIN_PASSWORD (any valid Azure VM password)
-
-## Execute the workflow
-
-After setting the secrets we are ready to invoke the workflow. Go to the action tab and select the workflow **Manual ArcBox execution with parameters**. The workflow file can be found at `.\.github\workflows\manual-arcBox-execution-with-parameters.yaml`.
-
-![image](./GHActionExecution.PNG)
-
-After selecting **Run Workflow** in the dropdown, as illustrated in the image above, the following parameters will be shown.
-
-- The first parameter lets you chose the branch containing the definition of the version of the workflow you would like to invoke.
-- ArcBox flavor to deploy. At this point the options are: **Full, ITPro, and DevOps**.
-- Type of deployment: **ARM, Bicep, or Terraform**.
-- Branch containing the ArcBox's scripts to execute.
-- Resource group name.
-- Resource group location.
-- Name of the Log Analytics Workspace.
-- Windows VM admin username.
-- Select if you would like to deploy Azure Bastion to connect to the client VM.
-
-Once all parameters values have been set, you can click the **Run Workflow** button to begin the deployment. During deployment, each step displays information about what is going on.
-![image](./Execution.PNG)
-
-## Information generated by the workflow
-
-### Code analysis tools
-
-One aspect of the workflow focuses on code analysis using a variety of code validators and linters. The code analysis steps of the workflow are configured to **continue on error** to prevent code analysis errors from interrupting the execution of the script. You can always have access to the recommendations generated by the code analysis tools.
-
-- **[ShellCheck](https://github.com/koalaman/shellcheck)** is used to validate Bash scripts.
-- **[ScriptAnalyzer](https://docs.microsoft.com/powershell/utility-modules/psscriptanalyzer/overview?view=ps-modules)** validates Powershell scripts.
-- The **[ARM template test toolkit](https://docs.microsoft.com/azure/azure-resource-manager/templates/test-toolkit)** and **[Pester](https://github.com/pester/Pester)** are used to validate ARM templates.
-- **[tfsec](https://github.com/aquasecurity/tfsec)** and **[checov](https://www.checkov.io/)** support the validation of the Terraform codebase.
-
-![image](./scriptValidation.PNG)
-
-![image](./powershellExample.PNG)
-
-### Deployment validation
-
-As the ArcBox deployment progresses, the workflow validates the output of each step and generate informational messages so you can follow along.
-
-![image](./deployValidations.PNG)
-
-### Downloadable logs
-
-All the log files generated during the deployment of ArcBox are uploaded to the workflow results folder and made available for download, together with the output of the code analysis tools.
-
-![image](./logsToDownload.PNG)
-
-## Adding support to validate new "LogOn" scripts
-
-As the ArcBox continues to evolve, we are expecting new ArcBox flavors or variants to appear. Each new ArcBox flavor would likely introduce a new "LogOn" script as a key component of the deployment. Updating the workflow to support a new LogOn script would require adding steps to invoke the LogOn script, download the log file it generates in the "ClientVM", and uploading the log file as a workflow artifact.  
-
-1. Invoke the LogOn script
-
-    Add a workflow step to invoke the new LogOn script. Pay attention to the flavor reference, the script is only invoked when certain conditions are met.
-
-```
-
-      - name: Open SSH, execute DataServicesLogonScript    // Step Name
-        if: github.event.inputs.flavor == 'Full'           // Invoke only if we are deploying the "Full" flavor 
-
-        // Command to execute. The command opens an ssh connection to the ClientVM and executes a script inside the VM
-        // normally, you would only need to change the script name here
-        run: |
-          plink -ssh -P 2204 ${{ github.event.inputs.windowsAdminUsername }}@$(az vm show -d -g ${{ github.event.inputs.resourceGroupName }}  -n ArcBox-Client --query publicIps -o tsv)  -pw  '${{secrets.WINDOWS_ADMIN_PASSWORD}}' -batch 'powershell -InputFormat None -F C:\ArcBox\DataServicesLogonScript.ps1'
-```
-
-2. Download the execution log.
-
-   Go to the download file step and add your code in the correct place, which also depends on the target ArcBox flavor. As shown in the example below, the command opens an OpenSSH connection, using the scp protocol, to download a specific log file. Pay attention to the way the location of the log inside the vm is specified as relative to the user folder, for example: `..\..\ArcBox\Logs\Bootstrap.log`.
-
-```
-sshpass -p "$secret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\Bootstrap.log' '.'  || echo "Bootstrap.log cannot be downloaded"
-if [ $flavor == 'Full' ] || [ $flavor == 'ITPro' ]; then
-  sshpass -p "$secret" scp -o 'StrictHostKeyChecking no' -P 2204 -T $windowsAdminUsername@$(az vm show -d -g $resourceGroupName -n ArcBox-Client --query publicIps -o tsv):'..\..\ArcBox\Logs\ArcServersLogonScript.log' '.' || echo "ArcServersLogonScript.log cannot be downloaded"
-fi
-```
-
-3. Upload the log file as workflow artifact so it can be later analyzed in the context of the workflow run.
-
-```
-      - name: Upload ArcServersLogonScript.log File
-       uses: actions/upload-artifact@v3
-       if: (github.event.inputs.flavor == 'Full' || github.event.inputs.flavor == 'ITPro') &&  (success() || failure())
-       with:
-         name: ArcServersLogonScript.log
-         path: ArcServersLogonScript.log
-```
-
-_Note:_ It is expected that the new LogOn script is able to run under an OpenSSH connection without errors. If that is not the case, we need evaluate alternatives.
-
-## Workflows execution duration
-
-| Flavor | Bastion | ~Duration |
-| ------ | ------- | --------- |
-| DevOps | no      | 50 min    |
-| DevOps | yes     | 60 min    |
-| ITPro  | no      | 60 min    |
-| ITPro  | yes     | 70 min    |
-| Full   | no      | 110 min   |
-| Full   | yes     | 120 min   |
-
-_Note:_ There is a known issue that causes the [Windows Run Command](https://docs.microsoft.com/azure/virtual-machines/windows/run-command) to not being able to detect the end of the execution of a script under some conditions. Usually the script invoked by that step actually runs successfully to completion but the workflow fails to properly collect the results. When that happens, the workflow step will timeout after 90 minutes and the total workflow execution time increases in about 1 hour for every script execution step that ends via timeout.
-
-## Automatic Validations
-
-Below is a list of the types of validations the workflow performs. Keep in mind that many of these validations are driven by criteria that is flavor-specific. For example the number of resources created before the LogOn script is invoked varies depending on the ArcBox flavor being deployed. The configuration file `DeployTestParameters.json` defines the various flavor-specific settings used for validation.
-
-- We are counting resources just after the initial resource deployment, before the LogOn script is invoked. The actual functionality is implemented in `CountResources.sh`.
-- After the LogOn script executes, we count the number of elements on the Desktop (mainly links). We look into BOTH, the `C:\Users\Public\Desktop` and `C:\Users\${user}\Desktop` folders. This functionality is implemented in `FileValidations.sh`.
-- Verify the Azure Data Studio setting file exist and is properly configured. The code is on the `FileValidations.sh` script.
-- Finally, `FinalValidation.sh` implements a few other validations:
-  - Count again the number of resources in the resource group.
-  - Count the number of Arc-enabled machines and validates each one is in a 'connected' status.
-  - Check the number of polices deployed.
-  - Check expected number of these type of resources:
-    - Log Analytics Workbooks
-    - Azure Bastion
-    - Azure KeyVault
-  - Check the number of Kubernetes clusters
-    - Validates 'connected' status for each one
-    - Validates these extensions are configured on each cluster: Azure Defender, policyinsights, and Azure Monitor.
-    - For the 'ArcBox-CAPI-Data' cluster, it also verifies the extensions KeyVault, Open Service Mesh, and Flux are configured.
-
-## Disclaimer
-
-We are executing four scripts inside the ClientVM on a full deploy to simulate what happens when the user logs on interactively:
-  - **ArcServersLogonScript.ps1** This script is remotely invoked through the [Windows Run Command](https://docs.microsoft.com/azure/virtual-machines/windows/run-command). This is a different approach from the rest of the scripts, which are all invoked using OpenSSH. When trying to run it under an ssh session, we observed the execution will come to a halt when reaching the statement `$result = New-AzConnectedMachineExtension -Name "WindowsAgent.SqlServer".
-  - **DataServicesLogonScript.ps1** This script blocks when invoked using **Windows Run Command**, so it is invoked remotely via OpenSSH.
-  - **DevOpsLogonScript.ps1** and **MonitorWorkbookLogonScript.ps1** work well when invoked either through OpenSSH or the **Windows Run Command**.
-
-In some cases, while the ArcBox scripts are still in the process of creating and configuring its resources, Azure will start applying subscription policies that may interfere with the the correct execution of the deployment script. For example, in subscriptions under the Microsoft tenant we noticed that some times the [Windows Run Command](https://docs.microsoft.com/azure/virtual-machines/windows/run-command) would start to fail randomly. We were able verify from the logs that the command had executed successfully, but the azure cli command would finish with a timeout after 90 minutes. The reason for this failure is described on a note inside the documentation:
-
-    "To function correctly, Run Command requires connectivity (port 443) to Azure public IP addresses. If the extension doesn't have access to these endpoints, **the scripts might run successfully but not return the results**. If you're blocking traffic on the virtual machine, you can use service tags to allow traffic to Azure public IP addresses by using the AzureCloud tag."
-
-As a workaround we are ignoring timeout errors on that step, and explicitly checking environmental conditions that indicate the script finished the execution successfully. The only secondary effect is that the execution time is increased in those situations.
-
-[Open SSH](https://docs.microsoft.com/windows-server/administration/openssh/openssh_install_firstuse) is installed using [Windows Run Command](https://docs.microsoft.com/azure/virtual-machines/windows/run-command), and it listens on port 2204 because of subscription security polices.
diff --git a/tests/GitHubActionDocumentation/Execution.PNG b/tests/GitHubActionDocumentation/Execution.PNG
deleted file mode 100644
index 10f4a8a5c6..0000000000
Binary files a/tests/GitHubActionDocumentation/Execution.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/FinalValidationDevopsScenario.PNG b/tests/GitHubActionDocumentation/FinalValidationDevopsScenario.PNG
deleted file mode 100644
index a1bbf60f81..0000000000
Binary files a/tests/GitHubActionDocumentation/FinalValidationDevopsScenario.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/GHActionExecution.PNG b/tests/GitHubActionDocumentation/GHActionExecution.PNG
deleted file mode 100644
index 5026a2f12a..0000000000
Binary files a/tests/GitHubActionDocumentation/GHActionExecution.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/deployValidations.PNG b/tests/GitHubActionDocumentation/deployValidations.PNG
deleted file mode 100644
index b64627f92d..0000000000
Binary files a/tests/GitHubActionDocumentation/deployValidations.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/logsToDownload.PNG b/tests/GitHubActionDocumentation/logsToDownload.PNG
deleted file mode 100644
index c2f70cfc05..0000000000
Binary files a/tests/GitHubActionDocumentation/logsToDownload.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/powershellExample.PNG b/tests/GitHubActionDocumentation/powershellExample.PNG
deleted file mode 100644
index a7b0bea254..0000000000
Binary files a/tests/GitHubActionDocumentation/powershellExample.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/scriptValidation.PNG b/tests/GitHubActionDocumentation/scriptValidation.PNG
deleted file mode 100644
index 5cc677cad2..0000000000
Binary files a/tests/GitHubActionDocumentation/scriptValidation.PNG and /dev/null differ
diff --git a/tests/GitHubActionDocumentation/secret.PNG b/tests/GitHubActionDocumentation/secret.PNG
deleted file mode 100644
index 8af119a083..0000000000
Binary files a/tests/GitHubActionDocumentation/secret.PNG and /dev/null differ
diff --git a/tests/OpenSSHDeploy.ps1 b/tests/OpenSSHDeploy.ps1
deleted file mode 100644
index 719caf35b2..0000000000
--- a/tests/OpenSSHDeploy.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-#Install open SSH
-Get-WindowsCapability -Online | Where-Object Name -like 'OpenSSH*'
-Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
-Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
-
-# Start the sshd service
-Start-Service sshd
-Stop-Service sshd
-#Changing port
-((Get-Content -path C:\ProgramData\ssh\sshd_config -Raw) -replace '#Port 22',"Port 2204") | Set-Content -Path C:\ProgramData\ssh\sshd_config
-Start-Service sshd
-
-Set-Service -Name sshd -StartupType 'Automatic'
-
-# Confirm the Firewall rule is configured. It should be created automatically by setup. Run the following to verify
-if ((Get-NetFirewallRule -Name "OpenSSH-Server-In-TCP" -ErrorAction SilentlyContinue | Select-Object Name, Enabled)) {
-   Remove-NetFirewallRule -Name "OpenSSH-Server-In-TCP"
-}
-New-NetFirewallRule -Name sshd -DisplayName 'OpenSSH Server (sshd)' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 2204
\ No newline at end of file
diff --git a/tests/PowerShellStaticCheck.ps1 b/tests/PowerShellStaticCheck.ps1
deleted file mode 100644
index 24827fbeac..0000000000
--- a/tests/PowerShellStaticCheck.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$ExcludeRules=$args[0]
-$RootFiles=$args[1]
-
-$skip = $ExcludeRules.split(',')
-$results = Invoke-ScriptAnalyzer -Recurse -ExcludeRule $skip "$RootFiles\*.ps1"
-Write-Output $results
-if ($results.Severity -contains "Error" -or $results.Severity -contains "Warning") {Write-Error -Message "Test Failed"}
diff --git a/tests/QueryReleases.py b/tests/QueryReleases.py
deleted file mode 100644
index da26e19903..0000000000
--- a/tests/QueryReleases.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import requests
-import re
-
-# read list of repositories from config file
-with open("tests/repositories.txt") as f:
-    repositories = [line.strip() for line in f]
-
-# create and open the output file for writing
-with open("tests/QueryReleases.txt", "w") as f:
-    for repo in repositories:
-        url = f"https://api.github.com/repos/{repo}/releases/latest"
-        response = requests.get(url)
-
-        if response.status_code == 200:
-            data = response.json()
-            latest_release = data["name"]
-            # extract version number using regular expression
-            version_number = re.search(r"\d+(\.\d+)*", latest_release).group()
-            # write the output to the file
-            f.write(f"Latest release for {repo}: {version_number}\n")
-        else:
-            # write error message to the file
-            f.write(f"Error retrieving latest release for {repo}\n")
diff --git a/tests/TerraformDeploy.sh b/tests/TerraformDeploy.sh
deleted file mode 100644
index a4f3a1d806..0000000000
--- a/tests/TerraformDeploy.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-terraformFolder=$1
-resource_group_name=$2
-azure_location=$3
-spn_client_id=$4
-spn_client_secret=$5
-spn_tenant_id=$6
-client_admin_ssh=$7
-client_admin_username=$8
-client_admin_password=${9}
-deployment_flavor=${10}
-workspace_name=${11}
-github_repo=${12}
-github_branch=${13}
-deploy_bastion=${14}
-spn_tenant_subcriptionid=${15}
-
-cd "$terraformFolder" || exit
-
-terraformVasrs=./terraform.tfvars
-
-echo "$client_admin_ssh" >./rsa.pub
-path=$(realpath ./rsa.pub)
-echo "" >"$terraformVasrs"
-echo "resource_group_name=\"$resource_group_name\"" >>"$terraformVasrs"
-echo "azure_location=\"$azure_location\"" >>"$terraformVasrs"
-echo "spn_client_id=\"$spn_client_id\"" >>"$terraformVasrs"
-echo "spn_client_secret=\"$spn_client_secret\"" >>"$terraformVasrs"
-echo "spn_tenant_id=\"$spn_tenant_id\"" >>"$terraformVasrs"
-echo "client_admin_ssh=\"$path\"" >>"$terraformVasrs"
-echo "client_admin_username=\"$client_admin_username\"" >>"$terraformVasrs"
-echo "client_admin_password=\"$client_admin_password\"" >>"$terraformVasrs"
-echo "deployment_flavor=\"$deployment_flavor\"" >>"$terraformVasrs"
-echo "workspace_name=\"$workspace_name\"" >>"$terraformVasrs"
-echo "github_repo=\"$github_repo\"" >>terraform.tfvars
-echo "github_branch=\"$github_branch\"" >>"$terraformVasrs"
-echo "deploy_bastion=\"$deploy_bastion\"" >>"$terraformVasrs"
-
-export ARM_CLIENT_ID="$spn_client_id"
-export ARM_CLIENT_SECRET="$spn_client_secret"
-export ARM_SUBSCRIPTION_ID="$spn_tenant_subcriptionid"
-export ARM_TENANT_ID="$spn_tenant_id"
-
-terraform init -input=false
-terraform plan -out=infra.out
-terraform apply -input=false "infra.out"
-
-#back to the root
-cd ..
-cd ..
diff --git a/tests/TestArmTemplate.ps1 b/tests/TestArmTemplate.ps1
deleted file mode 100644
index 7599be0f22..0000000000
--- a/tests/TestArmTemplate.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-param (
-    [Parameter()]
-    [String]$TemplatePath,
-    [string]$skipTests
-)
-$skip = $skipTests.split(',')
-Test-AzTemplate -TemplatePath $TemplatePath -Skip $skip -Pester
\ No newline at end of file
diff --git a/tests/repositories.txt b/tests/repositories.txt
deleted file mode 100644
index 408ebb9f6b..0000000000
--- a/tests/repositories.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-azure/azure-cli
-kubernetes/kubernetes
-kubernetes-sigs/cluster-api
-kubernetes-sigs/cluster-api-provider-azure
-kubernetes-sigs/azuredisk-csi-driver
-k3s-io/k3s
-azure/osm-azure
-openservicemesh/osm
\ No newline at end of file