diff --git a/checklists/waf_checklist.en.json b/checklists/waf_checklist.en.json
index f043ee3f..c65719ee 100644
--- a/checklists/waf_checklist.en.json
+++ b/checklists/waf_checklist.en.json
@@ -203,7719 +203,7766 @@
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.App/containerApps",
-            "checklist": "Container Apps Review",
-            "guid": "af416482-663c-4ed6-b195-b44c7068e09c",
-            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#availability-zone-support",
-            "query": "resources | where type =~ 'Microsoft.App/managedEnvironments' | project name, resourceGroup, location, zoneRedundancy = tolower(tostring(properties.zoneRedundant)) | extend Compliance = iff(zoneRedundancy == 'true', true, false)",
-            "service": "Container Apps",
-            "severity": "High",
-            "text": "Leverage Availability Zones if regionally applicable",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "Azure Data Factory Review Checklist",
+            "guid": "ab91932c-9fc9-4d1b-a881-37f5e6c0cb9e",
+            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/paas-foundations-playbooks-ADF_v1.docx",
+            "service": "Azure Data Factory",
+            "severity": "Medium",
+            "text": "Leverage FTA Resiliency Playbook for Azure Data Factory",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.App/containerApps",
-            "checklist": "Container Apps Review",
-            "guid": "95bc80ec-6499-4d14-a7d2-7d296b1d8abc",
-            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#set-up-zone-redundancy-in-your-container-apps-environment",
-            "query": "resources | where type =~ 'Microsoft.App/containerApps' | project name, resourceGroup, location, minReplicas = toint(properties.template.scale.minReplicas), maxReplicas = toint(properties.template.scale.maxReplicas) | extend Compliance = iff(minReplicas >= 1, true, false)",
-            "service": "Container Apps",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "Azure Data Factory Review Checklist",
+            "guid": "e503547c-d447-4e82-9138-a7200f1cac6d",
+            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/analytics/pipelines-disaster-recovery",
+            "service": "Azure Data Factory",
             "severity": "High",
-            "text": "Use more than one replica and enable Zone Redundancy.",
+            "text": "Use zone redundant pipelines in regions that support Availability Zones",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.App/containerApps",
-            "checklist": "Container Apps Review",
-            "guid": "ccaa4fc2-fdbc-4432-8bb7-f7e6469e4dc3",
-            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#cross-region-disaster-recovery-and-business-continuity",
-            "service": "Container Apps",
-            "severity": "High",
-            "text": "For cross-region DR, deploy container apps in multiple regions and follow active/active or active/passive application guidance.",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "Azure Data Factory Review Checklist",
+            "guid": "9ef1d6e8-32e5-42e3-911c-818b1a0bc511",
+            "link": "https://learn.microsoft.com/azure/data-factory/source-control",
+            "service": "Azure Data Factory",
+            "severity": "Medium",
+            "text": "Use DevOps to Backup the ARM templates with Github/Azure DevOps integration ",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.App/containerApps",
-            "checklist": "Container Apps Review",
-            "guid": "2ffada86-c031-4933-bf7d-0c45bc4e5919",
-            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#cross-region-disaster-recovery-and-business-continuity",
-            "service": "Container Apps",
-            "severity": "High",
-            "text": "Use Front Door or Traffic Manager to route traffic to the closest region",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "Azure Data Factory Review Checklist",
+            "guid": "e43a18a9-cd29-49cf-b7b1-7db8255562f2",
+            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/analytics/pipelines-disaster-recovery",
+            "service": "Azure Data Factory",
+            "severity": "Medium",
+            "text": "Make sure you replicate the Self-Hosted Integration Runtime VMs in another region ",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "1fc2fc14-eea6-4e69-b8d9-a3edc218e687",
-            "link": "https://polite-sea-0995b240f.2.azurestaticapps.net/technical-delivery-playbook/azure-services/analytics/purview/",
-            "service": "Purview",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "Azure Data Factory Review Checklist",
+            "guid": "aee4563a-fd83-4393-98b2-62d6dc5f512a",
+            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/analytics/pipelines-disaster-recovery",
+            "service": "Azure Data Factory",
             "severity": "Medium",
-            "text": "Leverage FTA Resillency Handbook",
+            "text": "Make sure you replicate or duplicate your network in the sister region. You have to make a copy of your Vnet in another region",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "ab067acb-49e5-4b96-8332-4ecf8cc13318",
-            "link": "https://learn.microsoft.com/purview/disaster-recovery",
-            "service": "Purview",
-            "severity": "High",
-            "text": "Plan for Data Center level outage",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "Azure Data Factory Review Checklist",
+            "description": "If your ADF Pipelines use Key Vault you don't have to do anything to replicate Key Vault. Key Vault is a managed service and Microsoft takes care of it for you",
+            "guid": "25498f6d-bad3-47da-a43b-c6ce1d7aa9b2",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/disaster-recovery-guidance",
+            "service": "Azure Data Factory",
+            "severity": "Low",
+            "text": "If using Keyvault integration, use SLA of Keyvault to understand your availablity",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "description": "1. Create the new account 2. Migrate configuration items 3. Run scans 4. Migrate custom typedefs and custom assets 5. Migrate relationships 6. Migrate glossary terms 7. Assign classifications to assets 8. Assign contacts to assets",
-            "guid": "da611702-69f4-4fb4-aa3d-3ef7f3176c4b",
-            "link": "https://learn.microsoft.com/purview/disaster-recovery",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Practice Failover for BCDR",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "Using the correct approach to feed a datalake with cold data and having the Kusto query engine at your disposal at the same time, as in the short-term storage",
+            "guid": "ba7da7be-9951-4914-a384-5d997cb39132",
+            "link": "https://learn.microsoft.com/azure/data-explorer/kusto/management/data-export/continuous-data-export",
+            "service": "Azure Data Explorer",
+            "text": "Leverage External Tables and Continuous data export overview to reduce costs",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "97b15b8a-219a-44ab-bb57-879024d22678",
-            "link": "https://learn.microsoft.com/purview/disaster-recovery",
-            "service": "Purview",
-            "severity": "High",
-            "text": "Plan a backup strategy and take regular backups",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "Azure Data Explorer provides an optional follower capability for a leader cluster to be followed by other follower clusters for read-only access to the leader's data and metadata. Changes in the leader, such as create, append, and drop are automatically synchronized to the follower. While the leaders could span Azure regions, the follower clusters should be hosted in the same region(s) as the leader. If the leader cluster is down or databases or tables are accidentally dropped, the follower clusters will lose access until access is recovered in the leader.",
+            "guid": "56a22586-f490-4641-addd-ea8a377cdeb3",
+            "link": "https://learn.microsoft.com/azure/data-explorer/follower?tabs=csharp",
+            "service": "Azure Data Explorer",
+            "text": "To share data, explore Leader-follower cluster configuration",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "6d20b56c-56a9-4581-89bf-8d8e5c586b7d",
-            "link": "https://learn.microsoft.com/purview/manage-kafka-dotnet",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Use Microsoft Purview's Event Hubs to subscribe and create entities to another account",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "Azure Data Explorer doesn't support automatic protection against the outage of an entire Azure region. This disruption can happen during a natural disaster, like an earthquake. If you require a solution for a disaster recovery situation, do the following steps to ensure business continuity. In these steps, you'll replicate your clusters, management, and data ingestion in two Azure paired regions.",
+            "guid": "861bb2bc-14ae-4a6e-95d8-d9a3adc218e6",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-create-solution#create-multiple-independent-clusters",
+            "service": "Azure Data Explorer",
+            "text": "To protect against regional failure, create Multiple independent clusters, preferably in two Azure Paired regions",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "8cdc15ac-c075-4ee9-a130-a8889579e76b",
-            "link": "https://learn.microsoft.com/purview/deployment-best-practices",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Purview accounts architectures and deployment best practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "guid": "436b0635-cb45-4e57-a603-324ace8cc123",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-create-solution#replicate-management-activities",
+            "service": "Azure Data Explorer",
+            "text": "Replicate all management activities such as creating new tables or managing user roles on each cluster.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "896e710a-7da7-4be9-a56d-14d3c49d997c",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-collections",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Collection Architectures and best practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "guid": "18ca6017-0265-4f4b-a46a-393af7f31728",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-create-solution",
+            "service": "Azure Data Explorer",
+            "text": "Ingest data into each cluster in parallel",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "b3d1325a-a225-4c6f-9e06-85edddea8a4b",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-asset-lifecycle",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Assest lifecycle best practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "This configuration is also called 'always-on'. For critical application deployments with no tolerance for outages, you should use multiple Azure Data Explorer clusters across Azure paired regions.",
+            "guid": "58a9c279-9c42-4bb6-9d0c-65556246b338",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#active-active-active-configuration",
+            "service": "Azure Data Explorer",
+            "text": "For critical application with no tolerance for outages, create Active-Active-Active (always-on) configuration",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "7cdeb3c6-1fc2-4fc1-9eea-6e69d8d9a3ed",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-automation",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow automation best practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "This configuration is identical to the active-active-active configuration, but only involves two Azure paired regions. Configure dual ingestion, processing, and curation. Users are routed to the nearest region. The cluster SKU must be the same across regions.",
+            "guid": "563a4dc7-4a74-48b6-922a-d190916a6649",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#active-active-configuration",
+            "service": "Azure Data Explorer",
+            "text": "For critical applications, create Active-Active configuration in two paired regions",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "c218e687-ab06-47ac-a49e-5b9603324ecf",
-            "link": "https://learn.microsoft.com/purview/disaster-recovery",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Backup and Migration Best practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "The Active-Hot configuration is similar to the Active-Active configuration in dual ingest, processing, and curation. While the standby cluster is online for ingestion, process, and curation, it isn't available to query. The standby cluster doesn't need to be in the same SKU as the primary cluster. It can be of a smaller SKU and scale, which may result in it being less performant. In a disaster scenario, users are redirected to the standby cluster, which can optionally be scaled up to increase performance.",
+            "guid": "8fadfe27-7de2-483b-8ac3-52baa9b75708",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#active-hot-standby-configuration",
+            "service": "Azure Data Explorer",
+            "text": "For applications, which required only read during failure, create Active-Hot standby configuration",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "8cc13318-da61-4170-869f-4fb4aa3d3ef7",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-glossary",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Purview Glossary Best Practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "This solution offers the least resiliency (highest RPO and RTO), is the lowest in cost and highest in effort. In this configuration, there's no data recovery cluster. Configure continuous export of curated data (unless raw and intermediate data is also required) to a storage account that is configured GRS (Geo Redundant Storage). A data recovery cluster is spun up if there is a disaster recovery scenario. At that time, DDLs, configuration, policies, and processes are applied. Data is ingested from storage with the ingestion property kustoCreationTime to over-ride the ingestion time that defaults to system time.",
+            "guid": "49aa8092-dc8e-4b9d-8bb7-3b26a5a67eba",
+            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#on-demand-data-recovery-configuration",
+            "service": "Azure Data Explorer",
+            "text": "For applications, where cost is a concern and can withstand some downtime during failure, create on-demand data recovery cluster configuration",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "f3176c4b-97b1-45b8-a219-a4abeb578790",
-            "link": "https://learn.microsoft.com/purview/concept-workflow",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Leverage Workflows ",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "description": "All database objects, policies, and configurations should be persisted in source control so they can be released to the cluster from your release automation tool.",
+            "guid": "5a907e1e-348e-4f25-9c27-d32e8bbac757",
+            "link": "https://learn.microsoft.com/azure/data-explorer/devops",
+            "service": "Azure Data Explorer",
+            "text": "Wrap DevOps and source control around all your code",
+            "training": "https://learn.microsoft.com/learn/paths/secure-your-cloud-data/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "24d22678-6d20-4b56-a56a-958119bf8d8e",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-security",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Purview Security Best Practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "guid": "1559ab91-53e8-4908-ae28-b84c33b6b780",
+            "link": "https://learn.microsoft.com/azure/data-explorer/devops",
+            "service": "Azure Data Explorer",
+            "text": "Design, develop, and implement validation routines to ensure all clusters are in-sync from a data perspective.",
+            "training": "https://learn.microsoft.com/learn/modules/azure-active-directory/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "5c586b7d-8cdc-415a-ac07-5ee9b130a888",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-lineage-azure-data-factory",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Follow Purview Data Lineage Best Practices",
+            "arm-service": "Microsoft.Kusto/clusters",
+            "checklist": "Azure Data Explorer Review Checklist",
+            "guid": "8b9fe5c4-1049-4d40-9a82-2c3474d00f18",
+            "link": "https://learn.microsoft.com/azure/data-explorer/devops",
+            "service": "Azure Data Explorer",
+            "text": "Be fully cognizant of what it takes to build a cluster from scratch. Leverage Infrastructure as a Code for your deployments",
+            "training": "https://learn.microsoft.com/learn/modules/implement-hybrid-identity-windows-server/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "9579e76b-896e-4710-a7da-7be9956d14d3",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-scanning",
-            "service": "Purview",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.Cdn/profiles/secrets' | extend frontDoorId = substring(id, 0, indexof(id, '/secrets')) | where properties.parameters.type =~ 'CustomerCertificate' | extend compliant = properties.parameters.useLatestVersion == true | project compliant, id=frontDoorId, certificateName = name | distinct id, certificateName, compliant",
+            "guid": "f00a69de-7076-4734-a734-6e4552cad9e1",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-latest-version-for-customer-managed-certificates",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Follow Best Practices for Scanning Registered Sources",
-            "waf": "Reliability"
+            "text": "If you use customer-managed TLS certificates with Azure Front Door, use the 'Latest' certificate version. Reduce the risk of outages caused by manual certificate renewal.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "c49d997c-b3d1-4325-aa22-5c6f4e0685ed",
-            "link": "https://learn.microsoft.com/purview/concept-best-practices-classification",
-            "service": "Purview",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.cdn/profiles' and sku has 'AzureFrontDoor' | project name, cdnprofileid=tolower(id), tostring(tags), resourceGroup, subscriptionId,skuname=tostring(sku.name) | join kind= fullouter ( cdnresources | where type == 'microsoft.cdn/profiles/securitypolicies' | extend wafpolicyid=tostring(properties['parameters']['wafPolicy']['id']) | extend splitid=split(id, '/') | extend cdnprofileid=tolower(strcat_array(array_slice(splitid, 0, 8), '/')) | project secpolname=name, cdnprofileid, wafpolicyid ) on cdnprofileid | project name, cdnprofileid, secpolname, wafpolicyid,skuname | join kind = fullouter ( resources | where type == 'microsoft.network/frontdoorwebapplicationfirewallpolicies' | extend managedrulesenabled=iff(tostring(properties.managedRules.managedRuleSets) != '[]', true, false), enabledState = tostring(properties.policySettings.enabledState) | project afdwafname=name, managedrulesenabled, wafpolicyid=id, enabledState, tostring(tags) ) on wafpolicyid | where name != '' | summarize associatedsecuritypolicies=countif(secpolname != ''), wafswithmanagedrules=countif(managedrulesenabled == 1) by name, id=cdnprofileid, tags,skuname | extend compliant = (associatedsecuritypolicies > 0 and wafswithmanagedrules > 0) | project id, compliant",
+            "guid": "e79d17b7-3b22-4a5a-97e7-a8ed4b30e38c",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Follow Classification Best Practices in Governance Portal",
-            "waf": "Reliability"
+            "text": "Use Azure Front Door with WAF policies to deliver and help protect global HTTP/S apps that span multiple Azure regions.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "ddea8a4b-7cde-4b3c-91fc-2fc14eea6e69",
-            "link": "https://learn.microsoft.com/purview/sensitivity-labels-frequently-asked-questions",
-            "service": "Purview",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "3f29812b-2363-4cef-b179-b599de0d5973",
+            "link": "https://learn.microsoft.com/azure/frontdoor/origin-security?tabs=application-gateway&pivots=front-door-standard-premium#example-configuration",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Perform Sensitivity Labelling in the Purview Data Map",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "d8d9a3ed-c218-4e68-9ab0-67acb49e5b96",
-            "link": "https://learn.microsoft.com/purview/concept-data-share",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Leverage Azure Storage in-place data sharing with Microsoft Purview",
-            "waf": "Reliability"
+            "text": "When using Front Door and Application Gateway to help protect HTTP/S apps, use WAF policies in Front Door. Lock down Application Gateway to receive traffic only from Front Door.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "03324ecf-8cc1-4331-ada6-1170269f4fb4",
-            "link": "https://learn.microsoft.com/purview/concept-insights",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Leverage Data Estate Insights",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type == 'microsoft.network/frontdoorwebapplicationfirewallpolicies' | project policyName=name, policyId=id,policySku=sku.name, links=properties.securityPolicyLinks, enabledState=properties.policySettings.enabledState, mode=properties.policySettings.mode | mvexpand links | extend securityPolicy=links.id | extend securityPolicyParts=split(securityPolicy, '/') | extend profileId=strcat_array(array_slice(securityPolicyParts, 0, -3), '/') | project id=profileId, compliant=((enabledState=='Enabled') and (mode=='Prevention')), enabledState, mode",
+            "guid": "ae248989-b306-4591-9186-de482e3f0f0e",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-policy-settings",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Deploy your WAF policy for Front Door in 'Prevention' mode' so that Web Application Firewall takes appropriate action to allow or deny traffic.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "aa3d3ef7-f317-46c4-a97b-15b8a219a4ab",
-            "link": "https://learn.microsoft.com/purview/catalog-adoption-insights",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Use Data stewardship and Catalog adoption",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/origins' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend compliant = properties['hostName'] !endswith '.trafficmanager.net' | project compliant, id=frontDoorId",
+            "guid": "062d5839-4d36-402f-bfa4-02811eb936e9",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#avoid-combining-traffic-manager-and-front-door",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Avoid placing Traffic Manager behind Front Door.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "eb578790-24d2-4267-a6d2-0b56c56a9581",
-            "link": "https://learn.microsoft.com/purview/concept-insights",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Use Inventory and Ownership",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/origins' | extend frontDoorId = substring(id, 0, indexof(id, '/origins')) | extend compliant = isempty(properties.originHostHeader) or (tostring(properties.hostName) =~ tostring(properties.originHostHeader)) | project id=frontDoorId, originName = name, compliant",
+            "guid": "5efeb96a-003f-4b18-8fcd-b4d84459c2b2",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-the-same-domain-name-on-front-door-and-your-origin",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Use the same domain name on Azure Front Door and your origin. Mismatched host names can cause subtle bugs.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "19bf8d8e-5c58-46b7-b8cd-c15acc075ee9",
-            "link": "https://learn.microsoft.com/purview/glossary-insights",
-            "service": "Purview",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/origins' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend originGroupId = substring(id, 0, indexof(id, '/origins')) | join kind=inner (cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend originGroupName = name | extend hasHealthProbe = isnotnull(properties.healthProbeSettings)) on $left.originGroupId == $right.id | summarize numberOrigins = count() by originGroupId, subscriptionId, frontDoorId, hasHealthProbe, originGroupName | extend compliant = not(numberOrigins == 1 and hasHealthProbe) | project id = frontDoorId, compliant",
+            "guid": "0b5a380c-4bfb-47bc-b1d7-dcfef363a61b",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#disable-health-probes-when-theres-only-one-origin-in-an-origin-group",
+            "service": "Front Door",
             "severity": "Low",
-            "text": "Leverage Insights for Glossary, Classifications, Sensitivity Labels",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "b130a888-9579-4e76-a896-e710a7da7be9",
-            "link": "https://learn.microsoft.com/purview/compliance-manager",
-            "service": "Purview",
-            "severity": "Medium",
-            "text": "Generate assessment scores",
-            "waf": "Reliability"
+            "text": "Disable health probes when there is only one origin in an Azure Front Door origin group.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "956d14d3-c49d-4997-ab3d-1325aa225c6f",
-            "link": "https://learn.microsoft.com/purview/compliance-manager-scoring",
-            "service": "Purview",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "5567048e-e5d7-4206-9c55-b5ed45d2cc0c",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#select-good-health-probe-endpoints",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Profiling- get summaries of data content",
+            "text": "Select good health probe endpoints for Azure Front Door. Consider building health endpoints that check all of your application's dependencies.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "4e0685ed-ddea-48a4-a7cd-eb3c61fc2fc1",
-            "link": "https://learn.microsoft.com/purview/concept-policies-data-owner#microsoft-purview-policy-concepts",
-            "service": "Purview",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups/')) | extend compliant = (isnull(properties['healthProbeSettings']['probeRequestType']) or toupper(properties['healthProbeSettings']['probeRequestType']) == 'HEAD') | project compliant, id=frontDoorId",
+            "guid": "a13f72f3-8f5c-4864-95e5-75bf37fbbeb1",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-head-health-probes",
+            "service": "Front Door",
             "severity": "Low",
-            "text": "Follow Microsoft Purview Data Owner access policies",
-            "waf": "Reliability"
+            "text": "Use HEAD health probes with Azure Front Door, to reduce the traffic that Front Door sends to your application.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "4eea6e69-d8d9-4a3e-bc21-8e687ab067ac",
-            "link": "https://learn.microsoft.com/purview/concept-self-service-data-access-policy",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Follow Self-service access policies",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/customdomains' | extend frontDoorId = substring(id, 0, indexof(id, '/customdomains')) | extend compliant = (isnull(properties['tlsSettings']['certificateType']) or tolower(properties['tlsSettings']['certificateType']) =~ 'customercertificate') | project compliant, id = frontDoorId",
+            "guid": "af95c92d-d723-4f4a-98d7-8722324efd4d",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-managed-tls-certificates",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Use managed TLS certificates with Azure Front Door. Reduce operational cost and risk of outages due to certificate renewals.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Purview/accounts",
-            "checklist": "Microsoft Purview Review Checklist",
-            "guid": "b49e5b96-0332-44ec-b8cc-13318da61170",
-            "link": "https://learn.microsoft.com/purview/concept-policies-devops",
-            "service": "Purview",
-            "severity": "Low",
-            "text": "Follow DevOps policies",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "189ea962-3969-4863-8f5a-5ad808c2cf4b",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#define-your-waf-configuration-as-code",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Define your Azure Front Door WAF configuration as code. By using code, you can more easily adopt new rule set version and gain additional protection.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachineScaleSets",
-            "checklist": "Resiliency Review",
-            "description": "Automatic instance repairs ensure that unhealthy instances are promptly identified and replaced, maintaining a set of healthy instances within your scale set.",
-            "guid": "7e13c105-675c-41e9-95b4-59837ff7ae7c",
-            "link": "https://learn.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-automatic-instance-repairs",
-            "service": "VMSS",
-            "severity": "Low",
-            "text": "Enable automatic instance repairs for enhanced VM Scale Sets resiliency",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type == 'microsoft.cdn/profiles/afdendpoints/routes' | extend frontDoorId = substring(id, 0, indexof(id, '/afdendpoints')) | extend forwardingProtocol=tostring(properties.forwardingProtocol),supportedProtocols=properties.supportedProtocols,httpsRedirect=properties.httpsRedirect | extend compliant = forwardingProtocol =~ 'httpsonly' and (supportedProtocols has 'https' or httpsRedirect =~ 'enabled') | project id = frontDoorId, compliant",
+            "guid": "2e30abab-5478-417c-81bf-bf1ad4ed1ed4",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-end-to-end-tls",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Use end-to-end TLS with Azure Front Door. Use TLS for connections from your clients to Front Door, and from Front Door to your origin.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Ensure that Azure Backup is utilized appropriately to meet your organization's resiliency requirements for Azure virtual machines (VMs).",
-            "guid": "4d874a74-8b66-42d6-b150-512a66498f6d",
-            "link": "https://learn.microsoft.com/azure/backup/backup-azure-vms-introduction",
-            "service": "VM",
-            "severity": "High",
-            "text": "Consider Azure Backup to meet your resiliency requirements for Azure VMs",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type == 'microsoft.cdn/profiles/afdendpoints/routes' | extend frontDoorId = substring(id, 0, indexof(id, '/afdendpoints')) | extend forwardingProtocol=tostring(properties.forwardingProtocol),supportedProtocols=properties.supportedProtocols,httpsRedirect=properties.httpsRedirect | extend compliant = httpsRedirect =~ 'enabled' | project id = frontDoorId, compliant",
+            "guid": "10aa45af-166f-44c4-9f36-b6d592dac2ca",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-http-to-https-redirection",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Use HTTP to HTTPS redirection with Azure Front Door. Support older clients by redirecting them to an HTTPS request automatically.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Single Instance VMs using Premium SSD or Ultra Disk for all Operating System Disks and Data Disks are guaranteed to have Virtual Machine Connectivity of at least 99.9%",
-            "guid": "8052d88e-79d1-47b7-9b22-a5a67e7a8ed4",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/disks-types",
-            "service": "VM",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.network/frontdoorwebapplicationfirewallpolicies' | project policyName=name, policyId=id,policySku=sku.name, links=properties.securityPolicyLinks, enabledState=properties.policySettings.enabledState, mode=properties.policySettings.mode | mvexpand links | extend securityPolicy=links.id | extend securityPolicyParts=split(securityPolicy, '/') | extend profileId=strcat_array(array_slice(securityPolicyParts, 0, -3), '/') | project id=profileId, compliant=((enabledState=~'Enabled') and (mode=~'Prevention')), enabledState, mode",
+            "guid": "28b9ee82-b2c7-45aa-bc98-6de6f59a095d",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#enable-the-waf",
+            "service": "Front Door",
             "severity": "High",
-            "text": "Use Premium or Ultra disks for production VMs",
-            "waf": "Reliability"
+            "text": "Enable the Azure Front Door WAF. Protect your application from a range of attacks.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Azure automatically replicates managed disks within a region to ensure data durability and protect against single-point failures.",
-            "guid": "b31e38c3-f298-412b-8363-cffe179b599d",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview",
-            "service": "VM",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "2902d8cc-1b0c-4495-afad-624ab70f7bd6",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#tune-your-waf",
+            "service": "Front Door",
             "severity": "High",
-            "text": "Ensure Managed Disks are used for all VMs",
-            "waf": "Reliability"
+            "text": "Tune the Azure Front Door WAF for your workload by configuring the WAF in Detection mode to reduce and fix false positive detections.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Temporary disks are intended for short-term storage of non-persistent data such as page files, swap files, or SQL Server tempdb. Storing persistent data on temporary disks can lead to data loss during maintenance events or VM redeployment.",
-            "guid": "e0d5973c-d4ce-432c-8881-37f6f7c4c0d4",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview#temporary-disk",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Do not use the Temp disk for anything that is not acceptable to be lost",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Co-locate your compute, storage, networking, and data resources across an availability zone, and replicate this arrangement in other availability zones.",
-            "guid": "e514548d-2447-4ec6-9138-b8200f1ce16e",
-            "link": "https://learn.microsoft.com/azure/reliability/availability-zones-overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Leverage Availability Zones for your VMs in regions where they are supported",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "17ba124b-127d-42b6-9322-388d5b2bbcfc",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/application-gateway-waf-request-size-limits#request-body-inspection",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Enable request body inspection feature enabled in Azure Front Door WAF policy.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Use at least two VMs in Availability Sets to isolate VMs on different fault and update domains.",
-            "guid": "5a785d6f-e96c-496a-b884-4cf3b2b38c88",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/availability-set-overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "For regions that do not support Availability Zones deploy VMs into Availability Sets",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "49a98f2b-ec22-4a87-9415-6a10b00d6555",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#enable-default-rule-sets",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Enable the Azure Front Door WAF default rule sets. The default rule sets detect and block common attacks.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Azure provides multiple options for VM redundancy to meet different requirements (Availability Zones, Virtual Machine Scale Sets, Availability Sets, Azure Site Recovery)",
-            "guid": "6ba2c021-4991-414a-9d3c-e574dccbd979",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/availability",
-            "service": "VM",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "147a13d4-2a2f-4824-a524-f5855b52b946",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#enable-bot-management-rules",
+            "service": "Front Door",
             "severity": "High",
-            "text": "Avoid running a production workload on a single VM",
-            "waf": "Reliability"
+            "text": "Enable the Azure Front Door WAF bot protection rule set. The bot rules detect good and bad bots.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Azure Site Recovery enables you to achieve low RTO (Recovery Time Objective) for your Azure and hybrid VMs by providing continuous replication and failover capabilities.",
-            "guid": "2a6bcca2-b5fe-4a1e-af3d-d95d48c7c891",
-            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-overview",
-            "service": "VM",
-            "severity": "High",
-            "text": "For Azure and on-premises VMs (Hyper-V/Phyiscal/VMware) with low RTO requirements use Azure Site Recovery",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "d7dcdcb9-0d99-44b9-baab-ac7570ede79a",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#use-the-latest-ruleset-versions",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Use the latest Azure Front Door WAF rule set version. Rule set updates are regularly updated to take account of the current threat landscape.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "By using Capacity Reservations, you can effectively manage capacity for critical workloads, ensuring resource availability in specified regions.",
-            "guid": "bd7bb012-f7b9-45e0-9e15-8e3ea3992c2d",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/capacity-reservation-overview",
-            "service": "VM",
-            "severity": "Low",
-            "text": "Use Capacity Reservations for critical workloads that require guaranteed capacity",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "b9620385-1cde-418f-914b-a84a06982ffc",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#add-rate-limiting",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Add rate limiting to the Azure Front Door WAF. Rate limiting blocks clients accidentally or intentionally sending large amounts of traffic in a short period of time.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "By ensuring that the necessary quotas are increased in your DR region before testing failover with ASR, you can avoid any potential resource constraints during the recovery process for failed over VMs.",
-            "guid": "e6e2065b-3a76-4af4-a691-e8939ada4666",
-            "link": "https://learn.microsoft.com/azure/quotas/per-vm-quota-requests",
-            "service": "VM",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "6dc36c52-0124-4ffe-9eaf-23ec1282dedb",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#use-a-high-threshold-for-rate-limits",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Increase quotas in DR region before testing failover with ASR",
-            "waf": "Reliability"
+            "text": "Use a high threshold for Azure Front Door WAF rate limits. High rate limit thresholds avoid blocking legitimate traffic, while still providing protection against extremely high numbers of requests that might overwhelm your infrastructure.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "Scheduled Events is an Azure Metadata Service that provides information about upcoming maintenance events for virtual machines (VMs). By leveraging Scheduled Events, you can proactively prepare your applications for VM maintenance, minimizing disruption and improving the availability of your VMs.",
-            "guid": "6d3b475a-5c7a-4cbe-99bb-e64dd8902e87",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/windows/scheduled-events",
-            "service": "VM",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "388a3d0e-0a43-4367-90b2-3dd2aeece5ee",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#geo-filter-traffic",
+            "service": "Front Door",
             "severity": "Low",
-            "text": "Utilize Scheduled Events to prepare for VM maintenance",
-            "waf": "Reliability"
+            "text": "If you are not expecting traffic from all geographical regions, use geo-filters to block traffic from non-expected countries.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Resiliency Review",
-            "description": "Use Zone-redundant Storage (ZRS) in the primary region for scenarios that require high availability and for restricting replication to a particular country or region. For protection against regional disasters, use Geo-zone-redundant Storage (GZRS), which combines ZRS in the primary region with geo-replication to a secondary region?.",
-            "guid": "48c7c891-dcb1-4f7d-9769-ae568ba38d4a",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-redundancy",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "00acd8a9-6975-414f-8491-2be6309893b8",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#specify-the-unknown-zz-location",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Choose the most appropriate data redundancy option for Azure Storage based on your requirements",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Resiliency Review",
-            "description": "Assigning a Delete lock to your storage account helps protect the availability of your data, minimizing the risk of disruptions to your business operations.",
-            "guid": "85e2213d-bd7b-4b01-8f7b-95e06e158e3e",
-            "link": "https://learn.microsoft.com/azure/storage/common/lock-account-resource",
-            "service": "Storage",
-            "severity": "Low",
-            "text": "Apply a Delete lock to prevent accidental or malicious deletion of storage accounts",
-            "waf": "Reliability"
+            "text": "Specify the unknown (ZZ) location when geo-filtering traffic with the Azure Front Door WAF. Avoid accidentally blocking legitimate requests when IP addresses can't be geo-matched.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Resiliency Review",
-            "description": "Container soft delete protects your data from being accidentally deleted by maintaining the deleted data in the system for a specified period of time.",
-            "guid": "a3992c2d-e6e2-4065-a3a7-6af4a691e893",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-container-enable",
-            "service": "Storage",
-            "severity": "Low",
-            "text": "Enable soft delete for Storage Account Containers",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "4cea4050-7946-4a7c-89e6-b021b73c352d",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#add-diagnostic-settings-to-save-your-wafs-logs",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Capture logs and metrics by turning on Diagnostic Settings. Include resource activity logs, access logs, health probe logs, and WAF logs. Set up alerts.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Resiliency Review",
-            "description": "Blob soft delete protects an individual blob and its versions, snapshots, and metadata from accidental deletes or overwrites by maintaining the deleted data in the system for a specified period of time.",
-            "guid": "9ada4666-7e13-4c10-96b9-153d89f89dc7",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-enable",
-            "service": "Storage",
-            "severity": "Low",
-            "text": "Enable soft delete for blobs",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "845f5f91-9c21-4674-a725-5ce890850e20",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#send-logs-to-microsoft-sentinel",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Send Azure Front Door WAF logs to Microsoft Sentinel.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Resiliency Review",
-            "description": "Azure Backup enhanced soft delete provides critical protection against ransomware attacks by retaining deleted backups, enabling recovery from potential ransomware encryption or deletion.",
-            "guid": "b44be3b1-a27f-48b9-b91b-e1038df03a82",
-            "link": "https://learn.microsoft.com/azure/backup/backup-azure-enhanced-soft-delete-about",
-            "service": "Backup",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "3bb0a854-ea3d-4212-bd8e-3f0cb7792b02",
+            "link": "https://learn.microsoft.com/azure/frontdoor/routing-methods",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Enable Azure Backup enhanced soft delete for improved data protection and recovery",
+            "text": "Choose a routing method that supports your deployment strategy. The weighted method, which distributes traffic based on the configured weight coefficient, supports active-active models. A priority-based value that configures the primary region to receive all traffic and send traffic to the secondary region as a backup supports active-passive models. Combine the preceding methods with latency so that the origin with the lowest latency receives traffic.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Resiliency Review",
-            "description": "Azure Backup's multi-user authorization enables fine-grained control over user access to backup resources, allowing you to restrict privileges and ensure proper authentication and authorization for backup operations.",
-            "guid": "2cd463cb-bbc8-4ac2-a9eb-c92a43da1dae",
-            "link": "https://learn.microsoft.com/azure/backup/multi-user-authorization-concept",
-            "service": "Backup",
-            "severity": "Low",
-            "text": "Implement multi-user authorization for Azure Backup to ensure secure and controlled access to backup resources",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend healthprobe=tostring(properties.healthProbeSettings) | project origingroupname=name, id, tags, resourceGroup, subscriptionId, healthprobe, frontDoorId | join ( cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/Origins' | extend origingroupname = tostring(properties.originGroupName) ) on origingroupname | summarize origincount=count(), enabledhealthprobecount=countif(healthprobe != '') by origingroupname, id, tostring(tags), resourceGroup, subscriptionId, frontDoorId | extend compliant = origincount > 1 | project id = frontDoorId, compliant",
+            "guid": "c3a769e4-cc78-40a9-b36a-f9bcab19ec2d",
+            "link": "https://learn.microsoft.com/azure/frontdoor/quickstart-create-front-door",
+            "service": "Front Door",
+            "severity": "High",
+            "text": "Support redundancy by having multiple origins in one or more back-end pools. Always have redundant instances of your application and make sure each instance exposes an endpoint or origin. You can place those origins in one or more back-end pools.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Resiliency Review",
-            "description": "Azure Immutable Storage provides an additional layer of security by ensuring that backup data stored in the vault cannot be modified or deleted for a specified retention period. This helps safeguard your backups from ransomware attacks that may attempt to compromise or manipulate your backup data.",
-            "guid": "2cc88147-0607-4c1c-aa0e-614658dd458e",
-            "link": "https://learn.microsoft.com/azure/backup/backup-azure-immutable-vault-concept?source=recommendations&tabs=recovery-services-vault",
-            "service": "Backup",
-            "severity": "Low",
-            "text": "Implement Immutable Storage for your vaults to protect against ransomware and prevent unauthorized modifications to backups",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "999852be-2137-4179-8fc3-30d1df6fed1d",
+            "link": "https://learn.microsoft.com/azure/frontdoor/troubleshoot-issues#troubleshooting-steps",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Set a timeout on forwarding requests to the back end. Adjust the timeout setting according to your endpoints' needs. If you don't, Azure Front Door might close the connection before the origin sends the response. You can also lower the default timeout for Azure Front Door if all of your origins have a shorter timeout.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/dnsZones",
-            "checklist": "Resiliency Review",
-            "description": "To eliminate a single point of failure in your on-premises DNS services and ensure reliable DNS resolution during business continuity and disaster recovery scenarios, it is recommended to utilize Azure DNS Private Resolvers in multiple regions. By deploying two or more Azure DNS private resolvers across different regions, you can enable DNS failover and achieve resiliency in your DNS infrastructure.",
-            "guid": "43da1dae-2cc8-4814-9060-7c1cca0e6146",
-            "link": "https://learn.microsoft.com/azure/dns/tutorial-dns-private-resolver-failover",
-            "service": "DNS",
-            "severity": "Low",
-            "text": "Implement DNS Failover using Azure DNS Private Resolvers",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "17bf6351-3e5e-41f1-87bb-d5ad0b4e3de6",
+            "link": "https://learn.microsoft.com/azure/frontdoor/routing-methods#23session-affinity",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Decide if your application requires session affinity. If you have high reliability requirements, we recommend that you disable session affinity.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.PowerBI/gateways",
-            "checklist": "Resiliency Review",
-            "description": "Use an on-premises data gateway cluster to avoid single points of failure and to load balance traffic across gateways.",
-            "guid": "89f89dc7-b44b-4e3b-8a27-f8b9e91be103",
-            "link": "https://learn.microsoft.com/data-integration/gateway/service-gateway-high-availability-clusters",
-            "service": "Data Gateways",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "425bfb31-94c4-4007-b9ae-46da9fe57cc7",
+            "link": "https://learn.microsoft.com/azure/frontdoor/origin?pivots=front-door-standard-premium#origin-host-header",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Use on-premises data gateway clusters to ensure high availability for business-critical data",
-            "waf": "Reliability"
+            "text": "Send the host header to the back end. The back-end services should be aware of the host name so that they can create rules to accept traffic only from that host.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Resiliency Review",
-            "description": "When choosing the best option for deploying NVAs in Azure, it is crucial to consider the vendor's recommendations and validate that the specific design has been vetted and validated by the NVA vendor. The vendor should also provide the necessary NVA configuration for seamless integration in Azure.",
-            "guid": "8b1188b3-c6a4-46ce-a544-451e192d3442",
-            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/dmz/nva-ha",
-            "service": "NVA",
-            "severity": "High",
-            "text": "Deploy Network Virtual Appliances (NVAs) in a vendor supported configuration for High Availability",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Apply guidance from the Microsoft cloud security benchmark related to Storage",
-            "guid": "d237de14-3b16-4c21-b7aa-9b64604489a8",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/storage-security-baseline",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "81a5398a-2414-450f-9fc3-e048bc65784c",
+            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-caching",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Consider the 'Azure security baseline for storage'",
-            "waf": "Security"
+            "text": "Use caching for endpoints that support it.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Azure Storage by default has a public IP address and is Internet-reachable. Private endpoints allow to securely expose Azure Storage only to those Azure Compute resources that need access, thus eliminating exposure to the public Internet",
-            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | where isnull(properties.privateEndpointConnections) or properties.privateEndpointConnections[0].properties.provisioningState != ('Succeeded') or (isnull(properties.networkAcls) and properties.publicNetworkAccess == 'Enabled') | extend compliant = (isnotnull(properties.privateEndpointConnections) and properties.privateEndpointConnections[0].properties.provisioningState == 'Succeeded' and properties.publicNetworkAccess == 'Disabled') | distinct id, compliant",
-            "guid": "f42d78e7-9d17-4a73-a22a-5a67e7a8ed4b",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-private-endpoints",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Consider using private endpoints for Azure Storage",
-            "waf": "Security"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend healthprobe=tostring(properties.healthProbeSettings) | project origingroupname=name, id, tags, resourceGroup, subscriptionId, healthprobe, frontDoorId | join ( cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/Origins' | extend origingroupname = tostring(properties.originGroupName) ) on origingroupname | summarize origincount=count(), enabledhealthprobecount=countif(healthprobe != '') by origingroupname, id, tostring(tags), resourceGroup, subscriptionId, frontDoorId | extend compliant = origincount > 1 or (origincount == 1 and enabledhealthprobecount == 0) | project id = frontDoorId, compliant",
+            "guid": "34069d73-e4de-46c5-a36f-625f87575a56",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#disable-health-probes-when-theres-only-one-origin-in-an-origin-group",
+            "service": "Front Door",
+            "severity": "Low",
+            "text": "Disable health checks in single back-end pools. If you have only one origin configured in your Azure Front Door origin group, these calls are unnecessary. This is only recommended if you can't have multiple origins in your endpoint.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Newly created storage accounts are created using the ARM deployment model, so that RBAC, auditing etc. are all enabled. Ensure that there are no old storage accounts with classic deployment model in a subscription",
-            "guid": "30e37c3e-2971-41b2-963c-eee079b598de",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/migration-classic-resource-manager-overview#migration-of-storage-accounts",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "c92d6786-cdd1-444d-9cad-934a192a276a",
+            "link": "https://learn.microsoft.com/azure/frontdoor/standard-premium/how-to-reports",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Ensure older storage accounts are not using 'classic deployment model'",
-            "waf": "Security"
+            "text": "We recommend using the Premium Tier for leveraging the Security reports while the Standard Azure Front Door Profile provides only traffic reports under built-in analytics/reports.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Leverage Microsoft Defender to learn about suspicious activity and misconfigurations.",
-            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | project storageAccountId = id | join kind=leftouter (resourceContainers | where type == 'microsoft.security/pricings' | where name == 'StorageAccounts' | project resourceId = id, pricingTier = properties.pricingTier) on $left.storageAccountId == $right.resourceId | where isnull(pricingTier) or pricingTier != 'Standard' | extend compliant = false | distinct storageAccountId, compliant",
-            "guid": "fc5972cd-4cd2-41b0-a803-7f5e6b4bfd3d",
-            "link": "https://learn.microsoft.com/azure/storage/common/azure-defender-storage-configure",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Enable Microsoft Defender for all of your storage accounts",
-            "waf": "Security"
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "440cf7de-30a1-4550-ab50-c9f6eac140cd",
+            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-wildcard-domain",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "Use wildcard TLS certificates when possible.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "The soft-delete mechanism allows to recover accidentally deleted blobs.",
-            "guid": "503547c1-447e-4c66-828a-7100f1ce16dd",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-overview",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "556e2733-6ca9-4edd-9cc7-26de66d46c2e",
+            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-caching",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Enable 'soft delete' for blobs",
-            "waf": "Security"
+            "text": "Optimize your application query string for caching. For purely static content, ignore query strings to maximize your use of the cache. If your application uses query strings, consider including them in the cache key. Including the query strings in the cache key allows Azure Front Door to serve cached responses or other responses, based on your configuration.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Consider selectively disabling 'soft delete' for certain blob containers, for example if the application must ensure that deleted information is immediately deleted, e.g. for confidentiality, privacy or compliance reasons. ",
-            "guid": "3f1d5e87-2e52-4e36-81cc-58b4a4b1510e",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-enable",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "c0b7e55e-fcab-4e66-bdae-bd0290f6aece",
+            "link": "https://learn.microsoft.com/azure/frontdoor/standard-premium/how-to-compression",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Disable 'soft delete' for blobs",
-            "waf": "Security"
+            "text": "Use file compression when you're accessing downloadable content.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Soft delete for containers enables you to recover a container after it has been deleted, for example recover from an accidental delete operation.",
-            "guid": "43a58a9c-2289-4c3d-9b57-d0c655462f2a",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-container-overview",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.network/frontdoors' and properties['resourceState'] !~ 'migrated' | extend compliant = false | project id, compliant",
+            "guid": "cb8eb8c0-aa73-4a26-a495-6eba8dc4a243",
+            "link": "https://learn.microsoft.com/azure/cdn/tier-migration",
+            "service": "Front Door",
             "severity": "High",
-            "text": "Enable 'soft delete' for containers",
-            "waf": "Security"
+            "text": "Consider migrating to Standard or Premium SKU if you are using Classic Azure Front Door currently as Classic Azure Front Door will be deprecated by March 2027.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Consider selectively disabling 'soft delete' for certain blob containers, for example if the application must ensure that deleted information is immediately deleted, e.g. for confidentiality, privacy or compliance reasons. ",
-            "guid": "3e3453a3-c863-4964-ab65-2d6c15f51296",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-container-enable",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "67c33697-15b1-4752-aeee-0b9b588defc4",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/networking/global-web-applications/mission-critical-content-delivery",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Disable 'soft delete' for containers",
-            "waf": "Security"
+            "text": "Consider using Traffic Manager load balancing Azure Front Door and a third party CDN provider CDN profile for mission critical high availability scenario. ",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Prevents accidental deletion of a storage account, by forcing the user to first remove the deletion lock, prior to deletion",
-            "guid": "5398e6de-d227-4dd1-92b0-6c21d7999a64",
-            "link": "https://learn.microsoft.com/azure/storage/common/lock-account-resource",
-            "service": "Storage",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "972cd4cd-25b0-4b70-96e9-eab4bfd32907",
+            "link": "https://learn.microsoft.com/azure/app-service/app-service-ip-restrictions?tabs=azurecli#restrict-access-to-a-specific-azure-front-door-instance",
+            "service": "Front Door",
             "severity": "High",
-            "text": "Enable resource locks on storage accounts",
+            "text": "When using Front Door with origin as App services, consider locking down the traffic to app services only through Azure Front Door using access restrictions. ",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Consider 'legal hold' or 'time-based retention' policies for blobs, so that is is impossible to delete the blob, the container, or the storage account. Please note that 'impossible' actually means 'impossible'; once a storage account contains an immutable blob, the only way to 'get rid' of that storage account is by cancelling the Azure subscription.",
-            "guid": "6f4389a8-f42c-478e-98c0-6a73a22a4956",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/immutable-storage-overview",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Consider immutable blobs",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "ab5351f6-383a-45ed-9c5e-b143b16db40a",
+            "link": "https://learn.microsoft.com/azure/aks/use-windows-hpc",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required for AKS Windows workloads HostProcess containers can be used",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Consider disabling unprotected HTTP/80 access to the storage account, so that all data transfers are encrypted, integrity protected, and the server is authenticated. ",
-            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | extend compliant = (properties.supportsHttpsTrafficOnly == false) | distinct id, compliant",
-            "guid": "e7a8dc4a-20e2-47c3-b297-11b1352beee0",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-require-secure-transfer",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Require HTTPS, i.e. disable port 80 on the storage account",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "a280dcf5-90ce-465d-b8e1-3f9ccbd46926",
+            "link": "https://learn.microsoft.com/azure/azure-functions/functions-kubernetes-keda",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use KEDA if running event-driven workloads",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "When configuring a custom domain (hostname) on a storage account, check whether you need TLS/HTTPS; if so, you might have to put Azure CDN in front of your storage account.",
-            "guid": "79b588de-fc49-472c-b3cd-21bf77036e5e",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/storage-custom-domain-name",
-            "service": "Storage",
-            "severity": "High",
-            "text": "When enforcing HTTPS (disabling HTTP), check that you do not use custom domains (CNAME) for the storage account.",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "26886d20-b66c-457b-a591-19bf8e8f5c58",
+            "link": "https://dapr.io/",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use Dapr to ease microservice development",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Requiring HTTPS when a client uses a SAS token to access blob data helps to minimize the risk of credential loss.",
-            "guid": "6b4bed3d-5035-447c-8347-dc56028a71ff",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-sas-overview",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Limit shared access signature (SAS) tokens to HTTPS connections only",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (sku.tier=='Paid') | distinct id,compliant",
+            "guid": "71d41e36-10cc-457b-9a4b-1410d4395898",
+            "link": "https://learn.microsoft.com/azure/aks/uptime-sla",
+            "service": "AKS",
+            "severity": "High",
+            "text": "Use the SLA-backed AKS offering",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": ". Enforcing the latest TLS version will reject request from clients using the older version. ",
-            "graph": "resources | where type == 'microsoft.storage/storageaccounts' | extend compliant = (isnull(properties.minimumTlsVersion) == false and properties.minimumTlsVersion in ('TLS1_2', 'TLS1_3')) | distinct id, compliant",
-            "guid": "e12be569-a18f-4562-8d5d-ce151b9e7d55",
-            "link": "https://learn.microsoft.com/azure/storage/common/transport-layer-security-configure-minimum-version",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Enforce the latest TLS version for a storage account",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c1288b3c-6a57-4cfc-9444-51e1a3d3453a",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-scheduler",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use Disruption Budgets in your pod and deployment definitions",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Microsoft Entra ID tokens should be favored over shared access signatures, wherever possible",
-            "guid": "e1ce15dd-3f0d-45e7-92d4-1e3611cc57b4",
-            "link": "https://learn.microsoft.com/azure/storage/common/authorize-data-access",
-            "service": "Storage",
+            "arm-service": "microsoft.containerregistry/registries",
+            "checklist": "Azure AKS Review",
+            "guid": "3c763963-7a55-42d5-a15e-401955387e5c",
+            "link": "https://learn.microsoft.com/azure/container-registry/container-registry-geo-replication",
+            "service": "ACR",
             "severity": "High",
-            "text": "Use Microsoft Entra ID tokens for blob access",
-            "waf": "Security"
+            "text": "If using a private registry, configure region replication to store images in multiple regions",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "When assigning a role to a user, group, or application, grant that security principal only those permissions that are necessary for them to perform their tasks. Limiting access to resources helps prevent both unintentional and malicious misuse of your data.",
-            "guid": "a4b1410d-4395-48a8-a228-9b3d6b57cfc6",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Least privilege in IaM permissions",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "f82cb8eb-8c0a-4a63-a25a-4956eaa8dc4a",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/aks/eslz-cost-governance-with-kubecost",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use an external application such as kubecost to allocate costs to different users",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "A user delegation SAS is secured with Azure Active Directory (Azure AD) credentials and also by the permissions specified for the SAS. A user delegation SAS is analogous to a service SAS in terms of its scope and function, but offers security benefits over the service SAS. ",
-            "guid": "55461e1a-3e34-453a-9c86-39648b652d6c",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-sas-overview?toc=%2Fazure%2Fstorage%2Fblobs%2Ftoc.json#best-practices-when-using-sas",
-            "service": "Storage",
-            "severity": "High",
-            "text": "When using SAS, prefer 'user delegation SAS' over storage-account-key based SAS.",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "4d3dfbab-9924-4831-a68d-fdf0d72f462c",
+            "link": "https://learn.microsoft.com/azure/aks/scale-down-mode",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use scale down mode to delete/deallocate nodes",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Storage account keys ('shared keys') have very little audit capabilities. While it can be monitored on who/when fetched a copy of the keys, once the keys are in the hands of multiple people, it is impossible to attribute usage to a specific user. Solely relying on Entra ID authentication makes it easier to tie storage access to a user. ",
-            "graph": "resources | where type == 'microsoft.storage/storageaccounts' | extend allowSharedKeyAccess = tostring(properties.allowSharedKeyAccess) | extend compliant = (isnotempty(allowSharedKeyAccess) and allowSharedKeyAccess == 'false') | distinct id, compliant",
-            "guid": "15f51296-5398-4e6d-bd22-7dd142b06c21",
-            "link": "https://learn.microsoft.com/rest/api/storageservices/authorize-with-shared-key",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Consider disabling storage account keys, so that only Microsoft Entra ID access (and user delegation SAS) is supported.",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "87e651ea-bc4a-4a87-a6df-c06a4b570ebc",
+            "link": "https://learn.microsoft.com/azure/aks/gpu-multi-instance",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "When required use multi-instance partitioning GPU on AKS Clusters",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Use Activity Log data to identify 'when', 'who', 'what' and 'how' the security of your storage account is being viewed or changed (i.e. storage account keys, access policies, etc.).",
-            "guid": "d7999a64-6f43-489a-af42-c78e78c06a73",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/blob-storage-monitoring-scenarios#audit-account-activity",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Consider using Azure Monitor to audit control plane operations on the storage account",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "2b72a08b-0410-4cd6-9093-e068a5cf27e8",
+            "link": "https://learn.microsoft.com/azure/aks/start-stop-nodepools",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If running a Dev/Test cluster use NodePool Start/Stop",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "A key expiration policy enables you to set a reminder for the rotation of the account access keys. The reminder is displayed if the specified interval has elapsed and the keys have not yet been rotated.",
-            "guid": "a22a4956-e7a8-4dc4-a20e-27c3e29711b1",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-account-keys-manage?tabs=azure-portal#create-a-key-expiration-policy",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.addonProfiles.azurepolicy) and properties.addonProfiles.azurepolicy.enabled==true) | distinct id,compliant",
+            "guid": "9ca48e4a-85e2-4223-bce8-bb12307ca5f1",
+            "link": "https://learn.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "When using storage account keys, consider enabling a 'key expiration policy'",
+            "text": "Use Azure Policy for Kubernetes to ensure cluster compliance",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "A SAS expiration policy specifies a recommended interval over which the SAS is valid. SAS expiration policies apply to a service SAS or an account SAS. When a user generates service SAS or an account SAS with a validity interval that is larger than the recommended interval, they'll see a warning.",
-            "guid": "352beee0-79b5-488d-bfc4-972cd3cd21bf",
-            "link": "https://learn.microsoft.com/azure/storage/common/sas-expiration-policy",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | project id,resourceGroup,name,pools=properties.agentPoolProfiles | project id,name,resourceGroup,poolcount=array_length(pools) | extend compliant = (poolcount > 1)",
+            "guid": "6f158e3e-a3a9-42c2-be7e-2165c3a87af4",
+            "link": "https://learn.microsoft.com/azure/aks/use-system-pools",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Consider configuring an SAS expiration policy",
+            "text": "Separate applications from the control plane with user/system node pools",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Stored access policies give you the option to revoke permissions for a service SAS without having to regenerate the storage account keys. ",
-            "guid": "77036e5e-6b4b-4ed3-b503-547c1347dc56",
-            "link": "https://learn.microsoft.com/rest/api/storageservices/define-stored-access-policy",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Consider linking SAS to a stored access policy",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "a7a1f893-9bda-4477-98f2-4c116775c2ea",
+            "link": "https://learn.microsoft.com/azure/aks/use-system-pools",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Add taint to your system nodepool to make it dedicated",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "028a71ff-e1ce-415d-b3f0-d5e772d41e36",
-            "link": "https://microsoft.github.io/code-with-engineering-playbook/continuous-integration/dev-sec-ops/secret-management/recipes/detect-secrets-ado/",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "55b46a94-8008-4ae7-b7e4-b475b6c8bdbf",
+            "link": "https://learn.microsoft.com/azure/container-registry/",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Consider configuring your application's source code repository to detect checked-in connection strings and storage account keys.",
+            "text": "Use a private registry for your images, such as ACR",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Ideally, your application should be using a managed identity to authenticate to Azure Storage. If that is not possible, consider having the storage credential (connection string, storage account key, SAS, service principal credential) in Azure KeyVault or an equivalent service.",
-            "guid": "11cc57b4-a4b1-4410-b439-58a8c2289b3d",
-            "link": "https://learn.microsoft.com/azure/architecture/framework/security/design-storage-keys",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Consider storing connection strings in Azure KeyVault (in scenarios where managed identities are not possible)",
+            "arm-service": "microsoft.containerregistry/registries",
+            "checklist": "Azure AKS Review",
+            "guid": "59bce65d-e8a0-43f9-9879-468d66a786d6",
+            "link": "https://learn.microsoft.com/azure/security-center/container-security",
+            "service": "ACR",
+            "severity": "Medium",
+            "text": "Scan your images for vulnerabilities",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Use near-term expiration times on an ad hoc SAS service SAS or account SAS. In this way, even if a SAS is compromised, it's valid only for a short time. This practice is especially important if you cannot reference a stored access policy. Near-term expiration times also limit the amount of data that can be written to a blob by limiting the time available to upload to it.",
-            "guid": "27138b82-1102-4cac-9eae-01e6e842e52f",
-            "link": "https://learn.microsoft.com/rest/api/storageservices/delegate-access-with-shared-access-signature",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "d167dd18-2b0a-4c24-8b99-9a646f8389a7",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-cluster-isolation",
+            "service": "AKS",
             "severity": "High",
-            "text": "Strive for short validity periods for ad-hoc SAS",
+            "text": "Define app separation requirements (namespace/nodepool/cluster)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "When creating a SAS, be as specific and restrictive as possible. Prefer a SAS for a single resource and operation over a SAS which gives much broader access.",
-            "guid": "4721d928-c1b1-4cd5-81e5-4a29a9de399c",
-            "link": "https://learn.microsoft.com/rest/api/storageservices/delegate-access-with-shared-access-signature",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "5e3df584-eccc-4d97-a3b6-bcda3b50eb2e",
+            "link": "https://github.com/Azure/secrets-store-csi-driver-provider-azure",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Apply a narrow scope to a SAS",
+            "text": "Store your secrets in Azure Key Vault with the CSI Secrets Store driver",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "A SAS can include parameters on which client IP addresses or address ranges are authorized to request a resource using the SAS. ",
-            "guid": "fd7b28dc-9355-4562-82bf-e4564b0d834a",
-            "link": "https://learn.microsoft.com/rest/api/storageservices/create-account-sas",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Consider scoping SAS to a specific client IP address, wherever possible",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "b03dda6d-58d7-4c89-8ddb-107d5769ae66",
+            "link": "https://learn.microsoft.com/azure/aks/update-credentials",
+            "service": "AKS",
+            "severity": "High",
+            "text": "If using Service Principals for the cluster, refresh credentials periodically (like quarterly)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "A SAS cannot constrain how much data a client uploads; given the pricing model of amount of storage over time, it might make sense to validate whether clients uploaded maliciously large contents.",
-            "guid": "348b263e-6dd6-4051-8a36-498f6dbad38e",
-            "service": "Storage",
-            "severity": "Low",
-            "text": "Consider checking uploaded data, after clients used a SAS to upload a file. ",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "e7ba73a3-0508-4f80-806f-527db30cee96",
+            "link": "https://learn.microsoft.com/azure/aks/use-kms-etcd-encryption",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "If required add Key Management Service etcd encryption",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "When accessing blob storage via SFTP using a 'local user account', the 'usual' RBAC controls do not apply. Blob access via NFS or REST might be more restrictive than SFTP access. Unfortunately, as of early 2023, local users are the only form of identity management that is currently supported for the SFTP endpoint",
-            "guid": "ad53cc7c-e1d7-4aaa-a357-1449ab8053d8",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/secure-file-transfer-protocol-support#sftp-permission-model",
-            "service": "Storage",
-            "severity": "High",
-            "text": "SFTP: Limit the amount of 'local users' for SFTP access, and audit whether access is needed over time.",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "ec8e4e42-0344-41b0-b865-9123e8956d31",
+            "link": "https://learn.microsoft.com/azure/confidential-computing/confidential-nodes-aks-overview",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required consider using Confidential Compute for AKS",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "9f89dc7b-33be-42a1-a27f-7b9e91be1f38",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/secure-file-transfer-protocol-known-issues#authentication-and-authorization",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c9e95ffe-6dd1-4a17-8c5f-110389ca9b21",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/defender-for-containers-enable",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "SFTP: The SFTP endpoint does not support POSIX-like ACLs.",
+            "text": "Consider using Defender for Containers",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Storage supports CORS (Cross-Origin Resource Sharing), i.e. an HTTP feature that enables web apps from a different domain to loosen the same-origin policy. When enabling CORS, keep the CorsRules to the least privilege.",
-            "guid": "cef39812-bd46-43cb-aac8-ac199ebb91a3",
-            "link": "https://learn.microsoft.com/rest/api/storageservices/cross-origin-resource-sharing--cors--support-for-the-azure-storage-services",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.servicePrincipalProfile.clientId=='msi') | distinct id,compliant",
+            "guid": "ed127dd1-42b0-46b2-8c69-99a646f3389a",
+            "link": "https://learn.microsoft.com/azure/aks/use-managed-identity",
+            "service": "AKS",
             "severity": "High",
-            "text": "Avoid overly broad CORS policies",
+            "text": "Use managed identities instead of Service Principals",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Data at rest is always encrypted server-side, and in addition might be encrypted client-side as well. Server-side encryption might happen using a platform-managed key (default) or customer-managed key. Client-side encryption might happen by either having the client supply an encryption/decryption key on a per-blob basis to Azure storage, or by completely handling encryption on the client-side. thus not relying on Azure Storage at all for confidentiality guarantees.",
-            "guid": "3d90cae2-cc88-4137-86f7-c0cbafe61464",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-service-encryption",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Determine how data at rest should be encrypted. Understand the thread model for data.",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = isnotnull(properties.aadProfile) | distinct id,compliant",
+            "guid": "7e42c78e-78c0-46a6-8a21-94956e698dc4",
+            "link": "https://learn.microsoft.com/azure/aks/managed-aad",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Integrate authentication with AAD (using the managed integration)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "8dd457e9-2713-48b8-8110-2cac6eae01e6",
-            "link": "https://learn.microsoft.com/azure/storage/common/customer-managed-keys-overview?toc=%2Fazure%2Fstorage%2Fblobs%2Ftoc.json&bc=%2Fazure%2Fstorage%2Fblobs%2Fbreadcrumb%2Ftoc.json",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Determine which/if platform encryption should be used.",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "a2fe27b2-e287-401a-8352-beedf79b488d",
+            "link": "https://learn.microsoft.com/azure/aks/control-kubeconfig-access",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Limit access to admin kubeconfig (get-credentials --admin)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "e842e52f-4721-4d92-ac1b-1cd521e54a29",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/encryption-customer-provided-keys",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "eec4962c-c3bd-421b-b77f-26e5e6b3bec3",
+            "link": "https://learn.microsoft.com/azure/aks/manage-azure-rbac",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Determine which/if client-side encryption should be used.",
+            "text": "Integrate authorization with AAD RBAC",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "description": "Anonymous access may present a security risk. We recommend that you disable anonymous access for optimal security. Disallowing anonymous access helps to prevent data breaches caused by undesired anonymous access.",
-            "graph": "resources | where type == 'microsoft.storage/storageaccounts' | extend compliant = (properties.allowBlobPublicAccess == 'false') | distinct id, compliant",
-            "guid": "659ae558-b937-4d49-a5e1-112dbd7ba012",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/anonymous-read-access-configure?tabs=portal#allow-or-disallow-public-read-access-for-a-storage-account",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "d4f3537c-1346-4dc5-9027-a71ffe1bd05d",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-identity",
+            "service": "AKS",
             "severity": "High",
-            "text": "Consider whether public blob anonymous access is needed, or whether it can be disabled for certain storage accounts. ",
+            "text": "Use namespaces for restricting RBAC privilege in Kubernetes",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "cb8eb8c0-aa62-4a25-a495-6eaa8dc4a243",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-account-upgrade?tabs=azure-portal",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Leverage a storagev2 account type for better performance and reliability",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | extend compliant = (sku.name != 'Standard_LRS' and sku.name != 'Premium_LRS') | distinct id, compliant",
-            "guid": "e05bbe20-9d49-4fda-9777-8424d116785c",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-redundancy",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Leverage GRS, ZRS or GZRS storage for the highest availability",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "d2e0d5d7-71d4-41e3-910c-c57b4a4b1410",
+            "link": "https://learn.microsoft.com/azure/aks/workload-identity-migration-sidecar",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "For Pod Identity Access Management use Azure AD Workload Identity (preview)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "2fa56c56-ad48-4408-be72-734c486ba280",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "f4dcf690-1b30-407d-abab-6f8aa780d3a3",
+            "link": "https://learn.microsoft.com/azure/aks/managed-aad#non-interactive-sign-in-with-kubelogin",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "For write operation after failover, use customer-Managed Failover ",
-            "waf": "Reliability"
+            "text": "For AKS non-interactive logins use kubelogin (preview)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "dc0590cf-65de-48e1-909c-cbd579266bcc",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance#microsoft-managed-failover",
-            "service": "Storage",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.disableLocalAccounts==true) | distinct id,compliant",
+            "guid": "b085b1f2-3119-4771-8c9a-bbf4411810ec",
+            "link": "https://learn.microsoft.com/azure/aks/managed-aad#disable-local-accounts",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Understand Microsoft-Managed Failover details",
-            "waf": "Reliability"
+            "text": "Disable AKS local accounts",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Storage Review Checklist",
-            "guid": "a274faa1-abfe-49d5-9d04-c3c4919cb1b3",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-enable?tabs=azure-portal",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Enable Soft Delete",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "36abb0db-c118-4f4c-9880-3f30f9a2deb6",
+            "link": "https://learn.microsoft.com/azure/aks/managed-aad#configure-just-in-time-cluster-access-with-azure-ad-and-aks",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Configure if required Just-in-time cluster access",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "4620dc87-e948-4ce8-8426-f3e6e5d7bd85",
-            "link": "https://learn.microsoft.com/azure/sap/center-sap-solutions/overview",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Azure Center for SAP solutions (ACSS) is an Azure offering that makes SAP a top-level workload on Azure. ACSS is an end-to-end solution that enables you to create and run SAP systems as a unified workload on Azure and provides a more seamless foundation for innovation. You can take advantage of the management capabilities for both new and existing Azure-based SAP systems.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-center-sap-solutions/?source=recommendations",
-            "waf": "Operations"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c4d7f4c6-79bf-45d0-aa05-ce8fc717e150",
+            "link": "https://learn.microsoft.com/azure/aks/managed-aad#use-conditional-access-with-azure-ad-and-aks",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Configure if required AAD conditional access for AKS",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5d75e99d-624d-4afe-91d9-e17adc580790",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-platform-automation-and-devops",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Azure supports automating SAP deployments in Linux and Windows. SAP Deployment Automation Framework is an open-source orchestration tool that can deploy, install, and maintain SAP environments.",
-            "training": "https://github.com/Azure/sap-automation",
-            "waf": "Operations"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "e1123a7c-a333-4eb4-a120-4ee3f293c9f3",
+            "link": "https://learn.microsoft.com/azure/aks/use-group-managed-service-accounts",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required for Windows AKS workloads configure gMSA ",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "d17f6f39-a377-48a2-931f-5ead3ebe33a8",
-            "link": "https://learn.microsoft.com/azure/well-architected/sap/design-areas/data-platform",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "1f711a74-3672-470b-b8b8-a2148d640d79",
+            "link": "https://learn.microsoft.com/azure/aks/use-managed-identity#use-a-pre-created-kubelet-managed-identity",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Perform a point-in-time recovery for your production databases at any point and in a time frame that meets your RTO; point-in-time recovery typically includes operator errors deleting data either on the DBMS layer or through SAP, incidentally",
-            "waf": "Reliability"
+            "text": "For finer control consider using a managed Kubelet Identity",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "c4b8e117-930b-4dbd-ae50-7bc5faf6f91a",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "cbd8ac2a-aebc-4a2a-94da-1dbf3dc99248",
+            "link": "https://azure.github.io/application-gateway-kubernetes-ingress/setup/install-existing/",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Test the backup and recovery times to verify that they meet your RTO requirements for restoring all systems simultaneously after a disaster.",
+            "text": "If using AGIC, do not share an AppGW across clusters",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "b651423c-8552-42db-a545-5cb50c05527a",
-            "link": "https://learn.microsoft.com/azure/reliability/cross-region-replication-azure",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnull(properties.addonProfiles.httpApplicationRouting) or properties.addonProfiles.httpApplicationRouting.enabled==false) | distinct id,compliant",
+            "guid": "8008ae7d-7e4b-4475-a6c8-bdbf59bce65d",
+            "link": "https://learn.microsoft.com/azure/aks/http-application-routing",
+            "service": "AKS",
             "severity": "High",
-            "text": "You can replicate standard storage between paired regions, but you can't use standard storage to store your databases or virtual hard disks. You can replicate backups only between paired regions that you use. For all your other data, run your replication by using native DBMS features like SQL Server Always On or SAP HANA System Replication. Use a combination of Site Recovery, rsync or robocopy, and other third-party software for the SAP application layer.",
-            "training": "https://learn.microsoft.com/training/paths/ensure-business-continuity-implement-disaster-recovery/",
+            "text": "Do not use AKS HTTP Routing Add-On, use instead the managed NGINX ingress with the application routing add-on.",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "aa208dca-784f-46c6-9014-cc919c542dc9",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-zones",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "7bacd7b9-c025-4a9d-a5d2-25d6bc5439d9",
+            "link": "https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "When using Azure Availability Zones to achieve high availability, you must consider latency between SAP application servers and database servers. For zones with high latencies, operational procedures need to be in place to ensure that SAP application servers and database servers are running in the same zone at all times.",
-            "training": "https://learn.microsoft.com/training/modules/implement-high-availability-for-sap-workloads-azure/?source=recommendations",
-            "waf": "Reliability"
+            "text": "For Windows workloads use Accelerated Networking",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources| where type =~ 'microsoft.network/virtualnetworkgateways'| where properties.gatewayType =~ 'vpn' or properties.gatewayType =~ 'ExpressRoute'| extend SKUName = properties.sku.name, SKUTier = properties.sku.tier, Type = properties.gatewayType| extend compliant = SKUTier contains 'AZ'| project name, id, subscriptionId, resourceGroup, Type, compliant",
-            "guid": "ba07c007-1f90-43e9-aa4f-601346b80352",
-            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (tolower(properties.networkProfile.loadBalancerSku)=='standard') | distinct id,compliant",
+            "guid": "ba7da7be-9952-4914-a384-5d997cb39132",
+            "link": "https://learn.microsoft.com/azure/aks/load-balancer-standard",
+            "service": "AKS",
             "severity": "High",
-            "text": "Set up ExpressRoute connections from on-premises to the primary and secondary Azure disaster recovery regions. Also, as an alternative to using ExpressRoute, consider setting up VPN connections from on-premises to the primary and secondary Azure disaster recovery regions.",
-            "training": "https://learn.microsoft.com/azure/expressroute/use-s2s-vpn-as-backup-for-expressroute-privatepeering",
-            "waf": "Reliability"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "d2b30195-b11d-4a8f-a672-28b2b4169a7c",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/disaster-recovery-guidance",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "Replicate key vault contents like certificates, secrets, or keys across regions so you can decrypt data in the DR region.",
+            "text": "Use the standard ALB (as opposed to the basic one)",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "05f1101d-250f-40e7-b2a1-b674ab50edbd",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-s4hana",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "22fbe8d6-9b40-47ef-9011-25bb1a555a6b",
+            "link": "https://learn.microsoft.com/azure/aks/use-multiple-node-pools#add-a-node-pool-with-a-unique-subnet",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Peer the primary and disaster recovery virtual networks. For example, for HANA System Replication, an SAP HANA DB virtual network needs to be peered to the disaster recovery site's SAP HANA DB virtual network.",
-            "waf": "Reliability"
+            "text": "If using Azure CNI, consider using different Subnets for NodePools",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "d3351bf7-628a-46de-917d-dfc11d3b6b40",
-            "link": "https://learn.microsoft.com/azure/azure-netapp-files/azure-netapp-files-service-levels",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "If you use Azure NetApp Files storage for your SAP deployments, at a minimum, create two Azure NetApp Files accounts in the Premium tier, in two regions.",
-            "training": "https://learn.microsoft.com/training/modules/choose-service-level-azure-netapp-files-hpc-applications/2-identify-decision-criteria",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c3c39c98-6bb2-4c12-859a-114b5e3df584",
+            "link": "https://learn.microsoft.com/azure/private-link/private-link-overview",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Use Private Endpoints (preferred) or Virtual Network Service Endpoints to access PaaS services from the cluster",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "726a1d3e-5508-4a06-9d54-93f4b50040c1",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/disaster-recovery-sap-guide?tabs=windows",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.networkProfile.networkPlugin=='azure') | distinct id,compliant",
+            "guid": "a0f61565-9de5-458f-a372-49c831112dbd",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-network",
+            "service": "AKS",
             "severity": "High",
-            "text": "Native database replication technology should be used to synchronize the database in a HA pair.",
-            "training": "https://learn.microsoft.com/training/modules/implement-disaster-recovery-for-sap-workloads-azure/?source=recommendations",
+            "text": "Choose the best CNI network plugin for your requirements (Azure CNI recommended)",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources | where type =~ 'microsoft.network/virtualnetworks' | extend addressSpace = todynamic(properties.addressSpace) | extend addressPrefix = todynamic(properties.addressSpace.addressPrefixes) | mvexpand addressSpace | mvexpand addressPrefix | project name, id, location, resourceGroup, subscriptionId, cidr = addressPrefix | extend compliant = (cidr matches regex @'^(10\\.|172\\.(1[6-9]|2[0-9]|3[01])\\.|192\\.168\\.)')  | project id, compliant, cidr",
-            "guid": "6561f847-3db5-4ff8-9200-5ad3c3b436ad",
-            "link": "https://learn.microsoft.com/ja-jp/azure/virtual-network/virtual-networks-faq",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "7faf12e7-0943-4f63-8472-2da29c2b1cd6",
+            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
+            "service": "AKS",
             "severity": "High",
-            "text": "The CIDR for the primary virtual network (VNet) shouldn't conflict or overlap with the CIDR of the DR site's VNet",
-            "training": "https://learn.microsoft.com/training/paths/azure-fundamentals-describe-azure-architecture-services/?source=recommendations",
-            "waf": "Reliability"
+            "text": "If using Azure CNI, size your subnet accordingly considering the maximum number of pods per node",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "0258ed30-fe42-434f-87b9-58f91f908e0a",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "22f54b29-bade-43aa-b1e8-c38ec9366673",
+            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
+            "service": "AKS",
             "severity": "High",
-            "text": "Use Site Recovery to replicate an application server to a DR site. Site Recovery can also help with replicating central-services cluster VMs to the DR site. When you invoke DR, you'll need to reconfigure the Linux Pacemaker cluster on the DR site (for example, replace the VIP or SBD, run corosync.conf, and more).",
-            "training": "https://learn.microsoft.com/training/paths/ensure-business-continuity-implement-disaster-recovery/",
-            "waf": "Reliability"
+            "text": "If using Azure CNI, check the maximum pods/node (default 30)",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "8300cb30-766b-4084-b126-0dd8fb1269a1",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Consider the availability of SAP software against single points of failure. This includes single points of failure within applications such as DBMSs utilized in SAP NetWeaver and SAP S/4HANA architectures, SAP ABAP and ASCS + SCS. Also, other tools such as SAP Web Dispatcher.",
-            "training": "https://learn.microsoft.com/training/modules/implement-high-availability-for-sap-workloads-azure/2-explore-high-availability-disaster-recovery-support-azure-for-sap-workloads?source=recommendations",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "description": "For internal apps organizations often open the whole AKS subnet in their firewalls. This opens network access to the nodes too, and potentially to the pods as well (if using Azure CNI). If LoadBalancer IPs are in a different subnet, only this one needs to be available to the app clients. Another reason is that if the IP addresses in the AKS subnet are a scarce resource, consuming its IP addresses for services will reduce the maximum scalability of the cluster .",
+            "guid": "13c00567-4b1e-4945-a459-c373e7ed6162",
+            "link": "https://learn.microsoft.com/azure/aks/internal-lb",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If using private-IP LoadBalancer services, use a dedicated subnet (not the AKS subnet)",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "56402f11-ccbe-42c3-a2f6-c6f6f38ab579",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-supported-configurations",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "43f63047-22d9-429c-8b1c-d622f54b29ba",
+            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
+            "service": "AKS",
             "severity": "High",
-            "text": "For SAP and SAP databases, consider implementing automatic failover clusters. In Windows, Windows Server Failover Clustering supports failover. In Linux, Linux Pacemaker or third-party tools like SIOS Protection Suite and Veritas InfoScale support failover.",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "text": "Size the service IP address range accordingly (it is going to limit the cluster scalability)",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "afae6bec-2671-49ae-bc69-140b8ec8d320",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/disaster-recovery-sap-guide?tabs=windows",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Azure doesn't support architectures in which the primary and secondary VMs share storage for DBMS data. For the DBMS layer, the common architecture pattern is to replicate databases at the same time and with different storage stacks than the ones that the primary and secondary VMs use.",
-            "training": "https://learn.microsoft.com/training/paths/ensure-business-continuity-implement-disaster-recovery/?source=recommendationshttps%3A%2F%2Flearn.microsoft.com%2Fja-jp%2Ftraining%2Fpaths%2Fensure-business-continuity-implement-disaster-recovery%2F%3Fsource%3Drecommendations",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "57bf217f-6dc8-481c-81e2-785773e9c00f",
+            "link": "https://learn.microsoft.com/azure/aks/use-byo-cni",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required add your own CNI plugin",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "ac614e95-6767-4bc3-b8a4-9953533da6ba",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/dbms-guide-general",
-            "service": "SAP",
-            "severity": "High",
-            "text": "The DBMS data and transaction/redo log files are stored in Azure supported block storage or Azure NetApp Files. Azure Files or Azure Premium Files isn't supported as storage for DBMS data and/or redo log files with SAP workload.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-databases/2-explore-database-support-azure-for-sap-workloads",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "4b3bb365-9458-44d9-9ed1-5c8f52890364",
+            "link": "https://learn.microsoft.com/azure/aks/use-multiple-node-pools#assign-a-public-ip-per-node-for-your-node-pools",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required configure Public IP per node in AKS",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "1f737179-8e7f-4e1a-a30c-e5a649a3092b",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/sap-high-availability-guide-wsfc-shared-disk",
-            "service": "SAP",
-            "severity": "High",
-            "text": "You can use Azure shared disks in Windows for ASCS + SCS components and specific high-availability scenarios. Set up your failover clusters separately for SAP application layer components and the DBMS layer. Azure doesn't currently support high-availability architectures that combine SAP application layer components and the DBMS layer into one failover cluster.",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "b3808b9f-a1cf-4204-ad01-3a923ce474db",
+            "link": "https://learn.microsoft.com/azure/aks/concepts-network",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Use an ingress controller to expose web-based apps instead of exposing them with LoadBalancer-type services",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources | where type =~ 'Microsoft.Network/loadBalancers' | extend bep = properties.backendAddressPools | extend BackEndPools = array_length(bep) | where BackEndPools =~ 0 | project name, id, Param1='backendPools', Param2=toint(0), tags | union (resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name =~ 'Standard' | extend bep = properties.backendAddressPools | extend BackEndPools = toint(array_length(bep)) | mv-expand bip = properties.backendAddressPools | extend BackendAddresses = array_length(bip.properties.loadBalancerBackendAddresses) | where toint(BackendAddresses) <= 1 | project name, id, tags, Param1='backendAddresses', Param2=toint(BackendAddresses)) | union ( resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name =~ 'Basic' | mv-expand properties.backendAddressPools | extend backendPoolId = properties_backendAddressPools.id | project id, name, tags, tostring(backendPoolId), Param1='BackEndPools' | join kind = leftouter ( resources | where type =~ 'Microsoft.Network/networkInterfaces' | mv-expand properties.ipConfigurations | mv-expand properties_ipConfigurations.properties.loadBalancerBackendAddressPools | extend backendPoolId = tostring(properties_ipConfigurations_properties_loadBalancerBackendAddressPools.id) | summarize poolMembers = count() by backendPoolId | project tostring(backendPoolId), poolMembers ) on backendPoolId | where toint(poolMembers) <= 1 | extend BackendAddresses = poolMembers | project id, name, tags, Param1='backendAddresses', Param2=toint(BackendAddresses))",
-            "guid": "a78b3d31-3170-44f2-b5d7-651a29f4ccf5",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-standard-load-balancer-outbound-connections",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Most failover clusters for SAP application layer components (ASCS) and the DBMS layer require a virtual IP address for a failover cluster.  Azure Load Balancer should handle the virtual IP address for all other cases. One design principle is to use one load balancer per cluster configuration. We recommend that you use the standard version of the load balancer (Standard Load Balancer SKU).",
-            "training": "https://learn.microsoft.com/training/modules/implement-high-availability-for-sap-workloads-azure/?source=recommendations",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "ccb534e7-416e-4a1d-8e93-533b53199085",
+            "link": "https://learn.microsoft.com/azure/aks/nat-gateway",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use Azure NAT Gateway as outboundType for scaling egress traffic",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "1a541741-5833-4fb4-ae3c-2df743165c3a",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-ha-ports-overview?source=recommendations",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Make sure the Floating IP is enabled on the Load balancer",
-            "training": "https://learn.microsoft.com/training/modules/load-balancing-non-https-traffic-azure/?source=recommendations",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "8ee9a69a-1b58-4b1e-9c61-476e110a160b",
+            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni#dynamic-allocation-of-ips-and-enhanced-subnet-support",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Use Dynamic allocations of IPs in order to avoid Azure CNI IP exhaustion",
             "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "c47cc4f3-f105-452c-845e-9b307b3856c1",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/availability",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.networkProfile.outboundType=='userDefinedRouting') | distinct id,compliant",
+            "guid": "3b365a91-7ecb-4e48-bbe5-4cd7df2e8bba",
+            "link": "https://learn.microsoft.com/azure/aks/limit-egress-traffic",
+            "service": "AKS",
             "severity": "High",
-            "text": "Before you deploy your high-availability infrastructure, and depending on the region you choose, determine whether to deploy with an Azure availability set or an availability zone.",
-            "training": "https://learn.microsoft.com/training/modules/configure-virtual-machine-availability/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Filter egress traffic with AzFW/NVA if your security requirements mandate it",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "844f69c3-07e5-4ec1-bff7-4be27bcf5fea",
-            "link": "https://www.microsoft.com/licensing/docs/view/Service-Level-Agreements-SLA-for-Online-Services?lang=1",
-            "service": "SAP",
-            "severity": "High",
-            "text": "If you want to meet the infrastructure SLAs for your applications for SAP components (central services, application servers, and databases), you must choose the same high availability options (VMs, availability sets, availability zones) for all components.",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = ((isnull(properties.apiServerAccessProfile.enablePrivateCluster) or properties.apiServerAccessProfile.enablePrivateCluster==false) and isnotnull(properties.apiServerAccessProfile.authorizedIPRanges)) | distinct id,compliant",
+            "guid": "c4581559-bb91-463e-a908-aed8c44ce3b2",
+            "link": "https://learn.microsoft.com/azure/aks/api-server-authorized-ip-ranges",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "If using a public API endpoint, restrict the IP addresses that can access it",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "cbe05bbe-209d-4490-ba47-778424d11678",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/availability-set-overview",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | where isnotnull(properties.apiServerAccessProfile.enablePrivateCluster) | extend compliant = (properties.apiServerAccessProfile.enablePrivateCluster==true) | distinct id, compliant",
+            "guid": "ecccd979-3b6b-4cda-9b50-eb2eb03dda6d",
+            "link": "https://learn.microsoft.com/azure/aks/private-clusters",
+            "service": "AKS",
             "severity": "High",
-            "text": "Do not mix servers of different roles in the same availability set. Keep central services VMs, database VMs, application VMs in their own availability sets",
-            "training": "https://learn.microsoft.com/training/modules/configure-virtual-machine-availability/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Use private clusters if your requirements mandate it",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "f2201000-d045-40a6-a79a-d7cdc01b4d86",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/co-location",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | where isnotnull(properties.apiServerAccessProfile.enablePrivateCluster) | extend compliant = (properties.apiServerAccessProfile.enablePrivateCluster==true) | distinct id, compliant",
+            "guid": "ce7f2a7c-297c-47c6-adea-a6ff838db665",
+            "link": "https://learn.microsoft.com/azure/aks/use-network-policies",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "You can't deploy Azure availability sets within an Azure availability zone unless you use proximity placement groups.",
-            "training": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
-            "waf": "Reliability"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "9674e7c7-7796-4181-8920-09f4429543ba",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/availability-set-overview",
-            "service": "SAP",
-            "severity": "High",
-            "text": "When you create availability sets, use the maximum number of fault domains and update domains available. For example, if you deploy more than two VMs in one availability set, use the maximum number of fault domains (three) and enough update domains to limit the effect of potential physical hardware failures, network outages, or power interruptions, in addition to Azure planned maintenance. The default number of fault domains is two, and you can't change it online later.",
-            "training": "https://learn.microsoft.com/training/modules/configure-virtual-machine-availability/?source=recommendations",
-            "waf": "Reliability"
+            "text": "For Windows 2019 and 2022 AKS nodes Calico Network Policies can be used ",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "ae4ecb95-b70f-428f-8b9a-4c5b7e3478a2",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = isnotnull(properties.networkProfile.networkPolicy) | distinct id,compliant",
+            "guid": "58d7c892-ddb1-407d-9769-ae669ca48e4a",
+            "link": "https://learn.microsoft.com/azure/aks/use-network-policies",
+            "service": "AKS",
             "severity": "High",
-            "text": "When you use Azure proximity placement groups in an availability set deployment, all three SAP components (central services, application server, and database) should be in the same proximity placement group.",
-            "waf": "Reliability"
+            "text": "Enable a Kubernetes Network Policy option (Calico/Azure)",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5d2fa56c-56ad-4484-88fe-72734c486ba2",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "85e2223e-ce8b-4b12-907c-a5f16f158e3e",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-network",
+            "service": "AKS",
             "severity": "High",
-            "text": "Use one proximity placement group per SAP SID. Groups don't span across Availability Zones or Azure regions",
-            "waf": "Reliability"
+            "text": "Use Kubernetes network policies to increase intra-cluster security",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "bca3b10e-0ff5-4aec-ac16-4c4bd1a1c13f",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "a3a92c2d-e7e2-4165-a3a8-7af4a7a1f893",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-network",
+            "service": "AKS",
             "severity": "High",
-            "text": "Use one of the following services to run SAP central services clusters, depending on the operating system.",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Use a WAF for web workloads (UIs or APIs)",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "ed46b937-913e-4018-9c62-8393ab037e53",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-suse-multi-sid",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "Resources | where type=~'microsoft.containerservice/managedclusters' | project resourceGroup,name,pools=properties.agentPoolProfiles | mv-expand pools | project subnetId=tostring(pools.vnetSubnetID) | where isnotempty(subnetId) | join (Resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,enableDdosProtection=tostring(properties.enableDdosProtection),subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,enableDdosProtection,subnetId=tostring(subnets.id)) on subnetId | distinct id,resourceGroup,name,enableDdosProtection | extend compliant = (enableDdosProtection == 'true')",
+            "guid": "9bda4776-8f24-4c11-9775-c2ea55b46a94",
+            "link": "https://learn.microsoft.com/azure/virtual-network/ddos-protection-overview",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Azure doesn't currently support combining ASCS and DB HA in the same Linux Pacemaker cluster; separate them into individual clusters. However, you can combine up to five multiple central-services clusters into a pair of VMs.",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Use DDoS Standard in the AKS Virtual Network",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | where type =~ 'Microsoft.Storage/storageAccounts' | where sku.name in~ ('Standard_LRS', 'Premium_LRS') | project name, id, tags, param1 = strcat('sku: ', sku.name)",
-            "guid": "f656e745-0cfb-453e-8008-0528fa21c933",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Deploy both VMs in the high-availability pair in an availability set or in availability zones. These VMs should be the same size and have the same storage configuration.",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "Resources | where type=~'microsoft.containerservice/managedclusters' | project resourceGroup,name,pools=properties.agentPoolProfiles | mv-expand pools | project subnetId=tostring(pools.vnetSubnetID) | where isnotempty(subnetId) | join (Resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,enableDdosProtection=tostring(properties.enableDdosProtection),subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,enableDdosProtection,subnetId=tostring(subnets.id)) on subnetId | distinct id,resourceGroup,name,enableDdosProtection | extend compliant = (enableDdosProtection == 'true')",
+            "guid": "6c46b91a-1107-4485-ad66-3183e2a8c266",
+            "link": "https://learn.microsoft.com/azure/aks/http-proxy",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required add company HTTP Proxy",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "7f684ebc-95da-425e-b329-e782dbed050f",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-rhel-with-hana-ascs-ers-dialog-instance",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "e9855d04-c3c3-49c9-a6bb-2c12159a114b",
+            "link": "https://learn.microsoft.com/azure/aks/servicemesh-about",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Azure supports installing and configuring SAP HANA and ASCS/SCS and ERS instances on the same high availability cluster running on Red Hat Enterprise Linux (RHEL).",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Consider using a service mesh for advanced microservice communication management",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "07991f7d-6598-4d90-9431-45c62605d3a5",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-guide-storage",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "67f7a9ed-5b31-4f38-a3f3-9812b2463cff",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/container-insights-metric-alerts",
+            "service": "AKS",
             "severity": "High",
-            "text": "Run all production systems on Premium managed SSDs and use Azure NetApp Files or Ultra Disk Storage. At least the OS disk should be on the Premium tier so you can achieve better performance and the best SLA.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-storage/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Configure alerts on the most critical metrics (see Container Insights for recommendations)",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "73cdaecc-7d74-48d8-a040-88416eebc98c",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-operations-storage",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "337453a3-cc63-4963-9a65-22ac19e80696",
+            "link": "https://learn.microsoft.com/azure/advisor/advisor-get-started",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Check regularly Azure Advisor for recommendations on your cluster",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "3aa70560-e7e7-4968-be3d-628af35b2ced",
+            "link": "https://learn.microsoft.com/azure/aks/certificate-rotation",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Enable AKS auto-certificate rotation",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "e189c599-df0d-45a7-9dd4-ce32c1881370",
+            "link": "https://learn.microsoft.com/azure/aks/supported-kubernetes-versions",
+            "service": "AKS",
             "severity": "High",
-            "text": "You should run SAP HANA on Azure only on the types of storage that are certified by SAP. Note that certain volumes must be run on certain disk configurations, where applicable. These configurations include enabling Write Accelerator and using Premium storage. You also need to ensure that the file system that runs on storage is compatible with the DBMS that runs on the machine.",
-            "training": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-premium-ssd-v1?source=recommendations",
-            "waf": "Reliability"
+            "text": "Have a regular process to upgrade your kubernetes version periodically (quarterly, for example), or use the AKS autoupgrade feature",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "51904867-a70e-4fa0-b4ff-3e6292846d7c",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/disaster-recovery-overview-guide#storage",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "6f7c4c0d-4e51-4464-ad24-57ed67138b82",
+            "link": "https://learn.microsoft.com/azure/aks/node-updates-kured",
+            "service": "AKS",
             "severity": "High",
-            "text": "Consider configuring high availability depending on the type of storage you use for your SAP workloads. Some storage services available in Azure are not supported by Azure Site Recovery, so your high availability configuration may differ.",
-            "training": "https://learn.microsoft.com/training/modules/implement-disaster-recovery-for-sap-workloads-azure/2-explore-disaster-recovery-sap-workloads",
-            "waf": "Reliability"
+            "text": "Use kured for Linux node upgrades in case you are not using node-image upgrade",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "1ac2d928-c9b7-42c6-ba18-23b1aea78693",
-            "link": "https://azure.microsoft.com/ja-jp/explore/global-infrastructure/products-by-region/",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "139c9580-ade3-426a-ba09-cf157d9f6477",
+            "link": "https://learn.microsoft.com/azure/aks/node-image-upgrade",
+            "service": "AKS",
             "severity": "High",
-            "text": "Different native Azure storage services (like Azure Files, Azure NetApp Files, Azure Shared Disk) may not be available in all regions. So to have similar SAP setup on the DR region after failover, ensure the respective storage service is offered in DR site.",
-            "waf": "Reliability"
+            "text": "Have a regular process to upgrade the cluster node images periodically (weekly, for example)",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "925d1f8c-01f3-4a67-948e-aabf0a1fad60",
-            "link": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/optimize-your-azure-costs-by-automating-sap-system-start-stop/ba-p/2120675",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Automate SAP System Start-Stop to manage costs.",
-            "waf": "Cost"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "0102ce16-ee30-41e6-b882-e52e4621dd68",
+            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/bedrock/bedrock-automated-deployments",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Consider gitops to deploy applications or cluster configuration to multiple clusters",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "71dc00cd-4392-4262-8949-20c05e6c0333",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-premium-ssd-v1",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "d7672c26-7602-4482-85a4-14527fbe855c",
+            "link": "https://learn.microsoft.com/azure/aks/command-invoke",
+            "service": "AKS",
             "severity": "Low",
-            "text": "In the case of using Azure Premium Storage with SAP HANA, Azure Standard SSD storage can be used to select a cost-conscious storage solution. However, please note that choosing Standard SSD or Standard HDD Azure storage will affect the SLA of the individual VMs. Also, for systems with lower I/O throughput and low latency, such as non-production environments, lower series VMs can be used.",
-            "waf": "Cost"
+            "text": "Consider using AKS command invoke on private clusters",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "9877f353-2591-4e8b-8381-e9043fed1010",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-premium-ssd-v1",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "31d7aaab-7571-4449-ab80-53d89e89d17b",
+            "link": "https://learn.microsoft.com/azure/aks/node-auto-repair#node-autodrain",
+            "service": "AKS",
             "severity": "Low",
-            "text": "As a lower-cost alternative configuration (multipurpose), you can choose a low-performance SKU for your non-production HANA database server VMs. However, it is important to note that some VM types, such as E-series, are not HANA certified (SAP HANA Hardware Directory) or cannot achieve storage latency of less than 1ms.",
-            "waf": "Cost"
+            "text": "For planned events consider using Node Auto Drain",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources | where type =~ 'microsoft.aad/domainservices' | extend replicaSets = properties.replicaSets | where array_length(replicaSets) < 2 | project name=name, id=id, tags=tags, param1=strcat('replicaSetLocation:', replicaSets[0].location)",
-            "guid": "fda1dbf3-dc95-4d48-a7c7-91dca0f6c565",
-            "link": "https://learn.microsoft.com/azure/well-architected/sap/design-areas/security",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "ed0fda7f-211b-47c7-8b6e-c18873fb473c",
+            "link": "https://learn.microsoft.com/azure/aks/faq",
+            "service": "AKS",
             "severity": "High",
-            "text": "Enforce a RBAC model for management groups, subscriptions, resource groups and resources",
-            "training": "https://learn.microsoft.com/training/paths/implement-resource-mgmt-security/",
-            "waf": "Security"
+            "text": "Develop own governance practices to make sure no changes are performed by operators in the node RG (aka 'infra RG')",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "45911475-e39e-4530-accc-d979366bcda2",
-            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/scenario-azure-first-sap-identity-integration",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Enforce Principal propagation for forwarding the identity from SAP cloud application to SAP on-premises (Including IaaS) through cloud connector",
-            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/2-explore-azure-virtual-machine-auth-access-control",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.nodeResourceGroup !startswith 'MC_') | distinct id,compliant",
+            "guid": "73b32a5a-67f7-4a9e-b5b3-1f38c3f39812",
+            "link": "https://learn.microsoft.com/azure/aks/cluster-configuration",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Use custom Node RG (aka 'Infra RG') name",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "750ab1ab-039d-495d-94c7-c8929cb107d5",
-            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/scenario-azure-first-sap-identity-integration",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "b2463cff-e189-4c59-adf0-d5a73dd4ce32",
+            "link": "https://kubernetes.io/docs/setup/release/notes/",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Implement SSO to SAP SaaS applications like SAP Analytics Cloud, SAP Cloud Platform, Business by design, SAP Qualtrics and SAP C4C with Azure AD using SAML.",
-            "waf": "Security"
+            "text": "Do not use deprecated Kubernetes APIs in your YAML manifests",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "325ae525-ba34-4d46-a5e2-213ace7bb122",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-netweaver-tutorial",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Implement SSO to SAP NetWeaver-based web applications like SAP Fiori and SAP Web GUI by using SAML.",
-            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/8-exercise-integrate-azure-active-directory-sap-netweaver",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c1881370-6f7c-44c0-b4e5-14648d2457ed",
+            "link": "https://learn.microsoft.com/azure-stack/aks-hci/adapt-apps-mixed-os-clusters",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Taint Windows nodes",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "9eb54dad-7861-4e1c-973a-f3bb003fc9c1",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Implement SSO to SAP NetWeaver-based web applications like SAP Fiori and SAP Web GUI by using SAML.",
-            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/6-exercise-integrate-azure-active-directory-sap-fiori",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "67138b82-0102-4ce1-9ee3-01e6e882e52e",
+            "link": "https://learn.microsoft.com/virtualization/windowscontainers/deploy-containers/version-compatibility?tabs=windows-server-20H2%2Cwindows-10-20H2",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Keep windows containers patch level in sync with host patch level",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "f29676ef-0c9c-4c4d-ab21-a55504c0c829",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-netweaver-tutorial",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "You can implement SSO to SAP GUI by using SAP NetWeaver SSO or a partner solution.",
-            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/8-exercise-integrate-azure-active-directory-sap-netweaver",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "description": "Via Diagnostic Settings at the cluster level",
+            "guid": "5b56ad48-408f-4e72-934c-476ba280dcf5",
+            "link": "https://learn.microsoft.com/azure/aks/monitor-aks",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Send master logs (aka API logs) to Azure Monitor or your preferred log management solution",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "23181aa4-1742-4694-9ff8-ae7d7d474317",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "For SSO for SAP GUI and web browser access, implement SNC / Kerberos/SPNEGO (simple and protected GSSAPI negotiation mechanism) due to its ease of configuration and maintenance. For SSO with X.509 client certificates, consider the SAP Secure Login Server, which is a component of the SAP SSO solution.",
-            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/9-exercise-integrate-active-directory-sap-single-sign-on",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "64d1a846-e28a-4b6b-9a33-22a635c15a21",
+            "link": "https://learn.microsoft.com/azure/aks/node-pool-snapshot",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "If required use nodePool snapshots",
+            "waf": "Cost"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "6c8bcbf4-5bbe-4609-b8a0-3e97778424d6",
-            "link": "https://blogs.sap.com/2017/07/12/sap-single-sign-on-protect-your-sap-landscape-with-x.509-certificates/",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "For SSO for SAP GUI and web browser access, implement SNC / Kerberos/SPNEGO (simple and protected GSSAPI negotiation mechanism) due to its ease of configuration and maintenance. For SSO with X.509 client certificates, consider the SAP Secure Login Server, which is a component of the SAP SSO solution.",
-            "waf": "Security"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "16785d6f-a96c-496a-b885-18f482734c88",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-netweaver-tutorial#configure-sap-netweaver-for-oauth",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Implement SSO by using OAuth for SAP NetWeaver to allow third-party or custom applications to access SAP NetWeaver OData services.",
-            "waf": "Security"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "a747c350-8d4c-449c-93af-393dbca77c48",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/saphana-tutorial",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Implement SSO to SAP HANA",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c5a5b252-1e44-4a59-a9d2-399c4d7b68d0",
+            "link": "https://learn.microsoft.com/azure/aks/spot-node-pool",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Consider spot node pools for non time-sensitive workloads",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "c7bae5bf-daf9-4761-9c56-f92891890aa4",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/rise-integration#connectivity-with-sap-rise",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Consider Azure AD an identity provider for SAP systems hosted on RISE. For more information, see Integrating the Service with Azure AD.",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.addonProfiles.aciConnectorLinux) and properties.addonProfiles.aciConnectorLinux.enabled==true) | distinct id,compliant",
+            "guid": "c755562f-2b4e-4456-9b4d-874a748b662e",
+            "link": "https://learn.microsoft.com/azure/aks/concepts-scale",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Consider AKS virtual node for quick bursting",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "e4e48226-ce54-44b6-bb6b-bfa15bd8f753",
-            "link": "https://github.com/azuredevcollege/SAP/blob/master/sap-oauth-saml-flow/README.md",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "For applications that access SAP, you might want to use principal propagation to establish SSO.",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "6f8389a7-f82c-4b8e-a8c0-aa63a25a4956",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/container-insights-overview",
+            "service": "AKS",
+            "severity": "High",
+            "text": "Monitor your cluster metrics with Container Insights (or other tools like Prometheus)",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "59921095-4980-4fc1-a5b6-524a5a560c79",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-hana-cloud-platform-identity-authentication-tutorial",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "If you're using SAP BTP services or SaaS solutions that require SAP Identity Authentication Service (IAS), consider implementing SSO between SAP Cloud Identity Authentication Services and Azure AD to access those SAP services. This integration lets SAP IAS act as a proxy identity provider and forwards authentication requests to Azure AD as the central user store and identity provider.",
-            "waf": "Security"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.addonProfiles.omsagent) and properties.addonProfiles.omsagent.enabled==true) | distinct id,compliant",
+            "guid": "eaa8dc4a-2436-47b3-9697-15b1752beee0",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/container-insights-overview",
+            "service": "AKS",
+            "severity": "High",
+            "text": "Store and analyze your cluster logs with Container Insights (or other tools like Telegraf/ElasticSearch)",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "a709c664-317e-41e4-9e34-67d9016a86f4",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-hana-cloud-platform-tutorial",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "4621dd68-c5a5-4be2-bdb1-1726769ef669",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/containers/container-insights-analyze",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Implement SSO to SAP BTP",
-            "waf": "Security"
+            "text": "Monitor CPU and memory utilization of the nodes",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "01f11b7f-38df-4251-9c76-4dec19abd3e8",
-            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-successfactors-inbound-provisioning-cloud-only-tutorial",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "1a4835ac-9422-423e-ae80-b123081a5417",
+            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "If you're using SAP SuccessFactors, consider using the Azure AD automated user provisioning. With this integration, as you add new employees to SAP SuccessFactors, you can automatically create their user accounts in Azure AD. Optionally, you can create user accounts in Microsoft 365 or other SaaS applications that are supported by Azure AD. Use write-back of the email address to SAP SuccessFactors.",
-            "waf": "Security"
+            "text": "If using Azure CNI, monitor % of pod IPs consumed per node",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "description": "Keep your management group hierarchy reasonably flat, no more than four.",
-            "graph": "resourcecontainers| where type =~ 'microsoft.resources/subscriptions'| extend ManagementGroup = tostring(tags),mgmtChain = properties.managementGroupAncestorsChain| extend compliant =( array_length(mgmtChain) <= 4 and array_length(mgmtChain) > 1)",
-            "guid": "6ba28021-4591-4147-9e39-e5309cccd979",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/resource-org-management-groups",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "description": "I/O in the OS disk is a critical resource. If the OS in the nodes gets throttled on I/O, this could lead to unpredictable behavior, typically ending up in node being declared NotReady",
+            "guid": "415833ea-3ad3-4c2d-b733-165c3acbe04b",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/premium-storage-performance",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "enforce existing Management Group policies to SAP Subscriptions",
-            "training": "https://learn.microsoft.com/training/modules/enterprise-scale-organization/4-management-group-subscription-organization",
+            "text": "Monitor OS disk queue depth in nodes",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | summarize count()",
-            "guid": "366bcda2-750a-4b1a-a039-d95d54c7c892",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-whole-landscape",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Integrate tightly coupled applications into the same SAP subscription to avoid additional routing and management complexity",
-            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/resource-org-subscriptions",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "be209d39-fda4-4777-a424-d116785c2fa5",
+            "link": "https://learn.microsoft.com/azure/aks/load-balancer-standard",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "If not using egress filtering with AzFW/NVA, monitor standard ALB allocated SNAT ports",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | where type contains 'publicIPAddresses' and isnotempty(properties.ipAddress) | summarize count () by subscriptionId",
-            "guid": "9cb107d5-325a-4e52-9ba3-4d4685e2213a",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-whole-landscape",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Leverage Subscription as scale unit and scaling our resources, consider deploying subscription per environment eg. Sandbox, non-prod, prod ",
-            "training": "https://learn.microsoft.com/training/modules/configure-subscriptions/?source=recommendations",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "74c2ee76-569b-4a79-a57e-dedf91b022c9",
+            "link": "https://learn.microsoft.com/azure/aks/aks-resource-health",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Subscribe to resource health notifications for your AKS cluster",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "QuotaResources | where type =~ 'microsoft.compute/locations/usages' | where subscriptionId in~ ('<Subscription1>','<Subscription2>') | mv-expand json = properties.value limit 400 | extend usagevCPUs = json.currentValue, QuotaLimit = json['limit'], quotaName = tostring(json['name'].localizedValue) | extend usagePercent = toint(usagevCPUs)*100 / toint(QuotaLimit) |where quotaName =~ 'Total Regional vCPUs' or quotaName =~ 'Total Regional Low-priority vCPUs' |project subscriptionId,quotaName,usagevCPUs,QuotaLimit,usagePercent,location,['json'] | order by ['usagePercent'] desc",
-            "guid": "ce7bb122-f7c9-45f0-9e15-4e3aa3592829",
-            "link": "https://learn.microsoft.com/azure/quotas/quotas-overview",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "b54eb2eb-03dd-4aa3-9927-18e2edb11726",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-scheduler",
+            "service": "AKS",
             "severity": "High",
-            "text": "Ensure quota increase as a part of subscription provisioning (e.g. total available VM cores within a subscription)",
-            "training": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits",
+            "text": "Configure requests and limits in your pod specs",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "ce4fab2f-433a-4d59-a5a9-3d1032e03ebc",
-            "link": "https://learn.microsoft.com/rest/api/reserved-vm-instances/quotaapi?branch=capacity",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "The Quota API is a REST API that you can use to view and manage quotas for Azure services. Consider using it if necessary.",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "769ef669-1a48-435a-a942-223ece80b123",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-scheduler",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "Enforce resource quotas for namespaces",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "cbfad17b-f240-42bf-a1d8-f4f4cee661c8",
-            "link": "https://learn.microsoft.com/azure/quotas/quickstart-increase-quota-portal",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "081a5417-4158-433e-a3ad-3c2de733165c",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits",
+            "service": "AKS",
             "severity": "High",
-            "text": "If deploying to an availability zone, ensure that the VM's zone deployment is available once the quota has been approved. Submit a support request with the subscription, VM series, number of CPUs and availability zone required.",
+            "text": "Ensure your subscription has enough quota to scale out your nodepools",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "e6e20617-3686-4af4-9791-f8935ada4332",
-            "link": "https://azure.microsoft.com/explore/global-infrastructure/products-by-region/",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "f4fd0602-7ab5-46f1-b66a-e9dea9654a65",
+            "link": "https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/",
+            "service": "AKS",
             "severity": "High",
-            "text": "Ensure required services and features are available within the chosen deployment regions eg. ANF , Zone etc.",
-            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/migrate/azure-best-practices/multiple-regions?source=recommendations",
+            "text": "Configure Liveness and Readiness probes for all deployments",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources | extend compliant = isnotnull(['tags']) | project name, id, subscriptionId, resourceGroup, tags, compliant",
-            "guid": "4e138115-2318-41aa-9174-26943ff8ae7d",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-resource-organization",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.autoScalerProfile)) | distinct id,compliant",
+            "guid": "90ce65de-8e13-4f9c-abd4-69266abca264",
+            "link": "https://learn.microsoft.com/azure/aks/concepts-scale",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Leverage Azure resource tag for cost categorization and resource grouping (: BillTo, Department (or Business Unit), Environment (Production, Stage, Development), Tier (Web Tier, Application Tier), Application Owner, ProjectName)",
-            "training": "https://learn.microsoft.com/training/paths/implement-resource-mgmt-security/",
-            "waf": "Operations"
+            "text": "Use the Cluster Autoscaler",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "2f7c95f0-6e15-44e3-aa35-92829e6e2061",
-            "link": "https://learn.microsoft.com/azure/backup/sap-hana-database-about",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Help protect your HANA database by using the Azure Backup service.",
-            "training": "https://learn.microsoft.com/training/modules/implement-azure-backup-sap-workloads-azure-virtual-machines/?source=recommendations",
-            "waf": "Reliability"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.austoscalerProfile)) | distinct id,compliant",
+            "guid": "831c2872-c693-4b39-a887-a561bada49bc",
+            "link": "https://learn.microsoft.com/azure/aks/custom-node-configuration",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Customize node configuration for AKS node pools",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "302a2fbf-3745-4a5f-a365-c9d1a16ca22c",
-            "link": "https://learn.microsoft.com/azure/azure-netapp-files/azacsnap-introduction",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "faa19bfe-9d55-4d04-a3c4-919ca1b2d121",
+            "link": "https://learn.microsoft.com/azure/aks/concepts-scale",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "If you deploy Azure NetApp Files for your HANA, Oracle, or DB2 database, use the Azure Application Consistent Snapshot tool (AzAcSnap) to take application-consistent snapshots. AzAcSnap also supports Oracle databases. Consider using AzAcSnap on a central VM rather than on individual VMs.",
-            "waf": "Reliability"
+            "text": "Use the Horizontal Pod Autoscaler when required",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "42d37218-a3a7-45df-bff6-1173e7f249ea",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-management-and-monitoring",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "description": "Larger nodes will bring higher performance and features such as ephemeral disks and accelerated networking, but they will increase the blast radius and decrease the scaling granularity",
+            "guid": "5ae124ba-34df-4585-bcdc-e9bd3bb0cdb3",
+            "link": "https://blog.cloudtrooper.net/2020/10/23/which-vm-size-should-i-choose-as-aks-node/",
+            "service": "AKS",
             "severity": "High",
-            "text": "Ensure time-zone matches between the operating system and the SAP system.",
-            "waf": "Operations"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "c3c7abc0-716c-4486-893c-40e181d65539",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-rhel-multi-sid",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Don't group different application services in the same cluster. For example, don't combine DRBD and central services clusters on the same cluster. However, you can use the same Pacemaker cluster to manage approximately five different central services (multi-SID cluster).",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Consider an appropriate node size, not too large or too small",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "a491dfc4-9353-4213-9217-eef0949f9467",
-            "link": "https://azure.microsoft.com/pricing/offers/dev-test/",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "38800e6a-ae01-40a2-9fbc-ae5a06e5462d",
+            "link": "https://learn.microsoft.com/azure/aks/quotas-skus-regions#service-quotas-and-limits",
+            "service": "AKS",
             "severity": "Low",
-            "text": "Consider running dev/test systems in a snooze model to save and optimize Azure run costs.",
-            "waf": "Cost"
+            "text": "If more than 5000 nodes are required for scalability then consider using an additional AKS cluster",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "b7056168-6199-4732-a514-cdbb2d5c9c54",
-            "link": "https://learn.microsoft.com/azure/lighthouse/overview",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "If you partner with customers by managing their SAP estates, consider Azure Lighthouse. Azure Lighthouse allows managed service providers to use Azure native identity services to authenticate to the customers' environment. It puts the control in the hands of customers, because they can revoke access at any time and audit service providers' actions.",
-            "waf": "Operations"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "9583c0f6-6083-43f6-aa6b-df7102c901bb",
+            "link": "https://learn.microsoft.com/azure/event-grid/event-schema-aks",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "Consider subscribing to EventGrid Events for AKS automation",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "4d116785-d2fa-456c-96ad-48408fe72734",
-            "link": "https://learn.microsoft.com/azure/update-manager/scheduled-patching?tabs=schedule-updates-single-machine%2Cschedule-updates-scale-overview",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Use Azure Update Manager to check the status of available updates for a single VM or multiple VMs and consider scheduling regular patching.",
-            "training": "https://learn.microsoft.com/training/modules/keep-your-virtual-machines-updated/?source=recommendations",
-            "waf": "Operations"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c5016d8c-c6c9-4165-89ae-673ef0fff19d",
+            "link": "https://learn.microsoft.com/azure/aks/manage-abort-operations",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "For long running operation on an AKS cluster consider event termination",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "76c8bcbf-45bb-4e60-ad8a-03e97778424d",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/lama-installation",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "c4e37133-f186-4ce1-aed9-9f1b32f6e021",
+            "link": "https://learn.microsoft.com/azure/aks/use-azure-dedicated-hosts",
+            "service": "AKS",
             "severity": "Low",
-            "text": "Optimize and manage SAP Basis operations by using SAP Landscape Management (LaMa). Use the SAP LaMa connector for Azure to relocate, copy, clone, and refresh SAP systems.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-remote-management/?source=recommendations",
-            "waf": "Operations"
+            "text": "If required consider using Azure Dedicated Hosts for AKS nodes",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "14591147-5e39-4e53-89cc-cd979366bcda",
-            "link": "https://learn.microsoft.com/azure/sap/monitor/about-azure-monitor-sap-solutions",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Use Azure Monitor for SAP solutions to monitor your SAP workloads(SAP HANA, high-availability SUSE clusters, and SQL systems) on Azure. Consider supplementing Azure Monitor for SAP solutions with SAP Solution Manager.",
-            "training": "https://learn.microsoft.com/training/modules/implement-azure-monitoring-sap-workloads-azure-virtual-machines/?source=recommendations",
-            "waf": "Operations"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "graph": "where type=='microsoft.containerservice/managedclusters' | project id,resourceGroup,name,pools=properties.agentPoolProfiles | mvexpand pools | extend compliant = (pools.osDiskType=='Ephemeral') | project id,name=strcat(name,'-',pools.name), resourceGroup, compliant",
+            "guid": "24367b33-6971-45b1-952b-eee0b9b588de",
+            "link": "https://learn.microsoft.com/azure/aks/cluster-configuration",
+            "service": "AKS",
+            "severity": "High",
+            "text": "Use ephemeral OS disks",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "2750ab1a-b039-4d95-b54c-7c8929cb107d",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/vm-extension-for-sap",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "f0ce315f-1120-4166-8206-94f2cf3a4d07",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/disks-types",
+            "service": "AKS",
             "severity": "High",
-            "text": "Run a VM Extension for SAP check. VM Extension for SAP uses the assigned managed identity of a virtual machine (VM) to access VM monitoring and configuration data. The check ensures that all performance metrics in your SAP application come from the underlying Azure Extension for SAP.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-enhanced-monitoring-extension-for-sap/?source=recommendations",
-            "waf": "Operations"
+            "text": "For non-ephemeral disks, use high IOPS and larger OS disks for the nodes when running many pods/node since it requires high performance for running multiple pods and will generate huge logs with default AKS log rotation thresholds",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5325ae52-5ba3-44d4-985e-2213ace7bb12",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Use Azure Policy for access control and compliance reporting. Azure Policy provides the ability to enforce organization-wide settings to ensure consistent policy adherence and fast violation detection. ",
-            "training": "https://learn.microsoft.com/learn/paths/architect-infrastructure-operations/",
-            "waf": "Operations"
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "39c486ce-d5af-4062-89d5-18bb5fd795db",
+            "link": "https://learn.microsoft.com/azure/aks/use-ultra-disks",
+            "service": "AKS",
+            "severity": "Low",
+            "text": "For hyper performance storage option use Ultra Disks on AKS",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "523181aa-4174-4269-93ff-8ae7d7d47431",
-            "link": "https://learn.microsoft.com/azure/network-watcher/connection-monitor-overview",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "9f7547c1-747d-4c56-868a-714435bd19dd",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-multi-region",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Use Connection Monitor in Azure Network Watcher to monitor latency metrics for SAP databases and application servers. Or collect and display network latency measurements by using Azure Monitor.",
-            "training": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/collecting-and-displaying-niping-network-latency-measurements/ba-p/1833979",
-            "waf": "Operations"
+            "text": "Avoid keeping state in the cluster, and store data outside (AzStorage, AzSQL, Cosmos, etc)",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "73686af4-6791-4f89-95ad-a43324e13811",
-            "link": "https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/QualityCheck",
-            "service": "SAP",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "24429eb7-2281-4376-85cc-57b4a4b18142",
+            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-storage",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "Perform a quality check for SAP HANA on the provisioned Azure infrastructure to verify that provisioned VMs comply with SAP HANA on Azure best practices.",
-            "waf": "Operations"
+            "text": "If using AzFiles Standard, consider AzFiles Premium and/or ANF for performance reasons",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "616785d6-fa96-4c96-ad88-518f482734c8",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-zones",
-            "service": "SAP",
-            "severity": "High",
-            "text": "For each Azure subscription, run a latency test on Azure availability zones before zonal deployment to choose low-latency zones for deployment of SAP on Azure.",
-            "training": "https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/AvZone-Latency-Test",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Azure AKS Review",
+            "guid": "83958a8c-2689-4b32-ab57-cfc64546135a",
+            "link": "https://learn.microsoft.com/azure/aks/availability-zones#azure-disk-availability-zone-support",
+            "service": "AKS",
+            "severity": "Medium",
+            "text": "If using Azure Disks and AZs, consider having nodepools within a zone for LRS disk with VolumeBindingMode:WaitForFirstConsumer for provisioning storage in right zone or use ZRS disk for nodepools spanning multiple zones",
             "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "410adcba-db46-424f-a6c4-05ecde75c52e",
-            "link": "https://learn.microsoft.com/azure/advisor/advisor-how-to-improve-reliability",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "70c15989-c726-42c7-b0d3-24b7375b9201",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/considerations-recommendations",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Run the Resiliency Report to ensure that the configuration of the entire provisioned Azure infrastructure (Compute, Database, Networking, Storage, Site Recovery) complies with the configuration defined by Cloud Adaption Framework for Azure.",
-            "training": "https://learn.microsoft.com/training/paths/azure-well-architected-framework/",
-            "waf": "Reliability"
+            "text": "Use one Entra tenant for managing your Azure resources, unless you have a clear regulatory or business requirement for multi-tenants.",
+            "training": "https://learn.microsoft.com/training/modules/deploy-resources-scopes-bicep/2-understand-deployment-scopes",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "86ba2802-1459-4114-95e3-9e5309cccd97",
-            "link": "https://learn.microsoft.com/azure/sentinel/sap/deployment-overview",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Implement threat protection by using the Microsoft Sentinel solution for SAP. Use this solution to monitor your SAP systems and detect sophisticated threats throughout the business logic and application layers.",
-            "training": "https://learn.microsoft.com/training/modules/plan-microsoft-sentinel-deployment-sap/?source=recommendations",
-            "waf": "Security"
+            "checklist": "Azure Landing Zone Review",
+            "guid": "6309957b-821a-43d1-b9d9-7fcf1802b747",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/automation",
+            "service": "Entra",
+            "severity": "Low",
+            "text": "Use Multi-Tenant Automation approach to managing your Microsoft Entra ID Tenants.",
+            "training": "https://learn.microsoft.com/entra/architecture/multi-tenant-user-management-introduction/",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources | extend compliant = isnotnull(['tags']) | project name, id, subscriptionId, resourceGroup, tags, compliant",
-            "guid": "579266bc-ca27-45fa-a1ab-fe9d55d04c3c",
-            "link": "https://learn.microsoft.com/azure/cost-management-billing/costs/enable-tag-inheritance",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Azure tagging can be leveraged to logically group and track resources, automate their deployments, and most importantly, provide visibility on the incurred costs.",
-            "training": "https://learn.microsoft.com/training/modules/analyze-costs-create-budgets-azure-cost-management/?source=recommendations",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "78e11934-499a-45ed-8ef7-aae5578f0ecf",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/lighthouse",
+            "service": "Entra",
+            "severity": "High",
+            "text": "Use Azure Lighthouse for Multi-Tenant Management with the same IDs.",
+            "training": "https://learn.microsoft.com/azure/lighthouse/concepts/cross-tenant-management-experience",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "04b8e5e5-13cb-4b22-af62-5a8ecfcf0337",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-test-latency?tabs=windows",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "Use inter-VM latency monitoring for latency-sensitive applications.",
-            "waf": "Performance"
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5d82e6df-6f61-42f2-82e2-3132d293be3d",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-microsoft-customer-agreement#design-recommendations",
+            "service": "Entra",
+            "severity": "High",
+            "text": "If you give a partner access to administer your tenant, use Azure Lighthouse.",
+            "training": "https://learn.microsoft.com/azure/lighthouse/how-to/onboard-customer",
+            "waf": "Cost"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "07e5ed53-3d96-43d8-87ea-631b77da5aba",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-guide-storage",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "348ef254-c27d-442e-abba-c7571559ab91",
+            "link": "https://learn.microsoft.com/azure/role-based-access-control/overview",
+            "service": "Entra",
+            "severity": "High",
+            "text": "Enforce a RBAC model that aligns to your cloud operating model. Scope and Assign across Management Groups and Subscriptions.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "waf": "Security"
+        },
+        {
+            "checklist": "Azure Landing Zone Review",
+            "guid": "12e7f983-f630-4472-8dd6-9c5b5c2622f5",
+            "link": "https://learn.microsoft.com/azure/active-directory/roles/security-planning#identify-microsoft-accounts-in-administrative-roles-that-need-to-be-switched-to-work-or-school-accounts",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Use Azure Site Recovery monitoring to maintain the health of the disaster recovery service for SAP application servers.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-storage/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Only use the authentication type Work or school account for all account types. Avoid using the Microsoft account",
+            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "abb6af9c-982c-4cf1-83fb-329fafd1ee56",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-management-and-monitoring",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "4b69bad3-3aad-45e8-a68e-1d76667313b4",
+            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/active-directory-groups-create-azure-portal",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Exclude all the database file systems and executable programs from antivirus scans. Including them could lead to performance problems. Check with the database vendors for prescriptive details on the exclusion list. For example, Oracle recommends excluding /oracle/<sid>/sapdata from antivirus scans.",
-            "waf": "Performance"
+            "text": "Only use groups to assign permissions. Add on-premises groups to the Entra ID only group if a group management system is already in place.",
+            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "c027f893-f404-41a9-b33d-39d625a14964",
-            "link": "https://sapit-forme-prod.authentication.eu11.hana.ondemand.com/login",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "Consider collecting full database statistics for non-HANA databases after migration. For example, implement SAP note 1020260 - Delivery of Oracle statistics.",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "fdafb1f5-3eee-4354-a8c9-deb8127ebc2e",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/workloads/oracle/configure-oracle-asm",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Consider using Oracle Automatic Storage Management (ASM) for all Oracle deployments that use SAP on Azure.",
-            "training": "https://learn.microsoft.com/training/paths/administer-infrastructure-resources-in-azure/?source=recommendations",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "33c5d5bf-daf3-4f0d-bd50-6010fdcec22e",
-            "link": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/announcement-sap-on-azure-oracle-performance-efficiency-scripts/ba-p/3725178",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "For SAP on Azure running Oracle, a collection of SQL scripts can help you diagnose performance problems.  Automatic Workload Repository (AWR) reports contain valuable information for diagnosing problems in the Oracle system. We recommend that you run an AWR report during several sessions and choose peak times for it, to ensure broad coverage for the analysis.",
-            "training": "https://learn.microsoft.com/ja-jp/azure/well-architected/oracle-iaas/performance-efficiency",
-            "waf": "Performance"
+            "checklist": "Azure Landing Zone Review",
+            "guid": "53e8908a-e28c-484c-93b6-b7808b9fe5c4",
+            "link": "https://learn.microsoft.com/azure/active-directory/conditional-access/overview",
+            "service": "Entra",
+            "severity": "High",
+            "text": "Enforce Microsoft Entra ID Conditional Access policies for any user with rights to Azure environments.",
+            "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "d89fd98d-23e4-4b40-a92e-32db9365522c",
-            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-monitor-and-troubleshoot",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "1049d403-a923-4c34-94d0-0018ac6a9e01",
+            "link": "https://learn.microsoft.com/azure/active-directory/authentication/concept-mfa-howitworks",
+            "service": "Entra",
             "severity": "High",
-            "text": "Use Azure Site Recovery monitoring to maintain the health of the disaster recovery service for SAP application servers.",
-            "training": "https://learn.microsoft.com/training/modules/protect-on-premises-infrastructure-with-azure-site-recovery/?source=recommendations",
-            "waf": "Operations"
+            "text": "Enforce multi-factor authentication for any user with rights to the Azure environments.",
+            "training": "https://learn.microsoft.com/entra/identity/authentication/concept-mandatory-multifactor-authentication",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5ba34d46-85e2-4213-ace7-bb122f7c95f0",
-            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-overview",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "14658d35-58fd-4772-99b8-21112df27ee4",
+            "link": "https://learn.microsoft.com/azure/active-directory/privileged-identity-management/pim-configure",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "For secure delivery of HTTP/S apps, use Application Gateway v2 and ensure that WAF protection and policies are enabled.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-web-application-firewall/",
+            "text": "Enforce Microsoft Entra ID Privileged Identity Management (PIM) to establish zero standing access and least privilege.",
+            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "fa9d30bc-1b82-4e4b-bfdf-6b017938b9e6",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "8b9fe5c4-1049-4d40-9a92-3c3474d00018",
+            "link": "https://learn.microsoft.com/entra/identity/domain-services/overview",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "If the virtual machine's DNS or virtual name is not changed during migration to Azure, Background DNS and virtual names connect many system interfaces in the SAP landscape, and customers are only sometimes aware of the interfaces that developers define over time. Connection challenges arise between various systems when virtual or DNS names change after migrations, and it's recommended to retain DNS aliases to prevent these types of difficulties.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/4-explore-name-resolution",
-            "waf": "Operations"
+            "text": "If planning to switch from Active Directory Domain Services to Entra domain services, evaluate the compatibility of all workloads.",
+            "training": "https://learn.microsoft.com/learn/modules/implement-hybrid-identity-windows-server/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "a2858f78-105b-4f52-b7a9-5b0f4439743b",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.aad/domainservices' | extend replicaSets = properties.replicaSets | where array_length(replicaSets) < 2 | project name=name, id=id, tags=tags, param1=strcat('replicaSetLocation:', replicaSets[0].location)",
+            "guid": "0dd4e625-9c4b-4a56-b54a-4357bac12761",
+            "link": "https://learn.microsoft.com/entra/identity/domain-services/overview",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Use different DNS zones to distinguish each environment (sandbox, development, preproduction, and production) from each other. The exception is for SAP deployments with their own VNet; here, private DNS zones might not be necessary.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/4-explore-name-resolution",
-            "waf": "Operations"
+            "text": "When using Microsoft Entra Domain Services use replica sets. Replica sets will improve the resiliency of your managed domain and allow you to deploy to additional regions. ",
+            "training": "https://learn.microsoft.com/training/modules/understand-azure-active-directory/6-examine-azure-domain-services",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "description": "When configuring VNet peering, use the Allow traffic to remote virtual networks setting.",
-            "graph": "resources | where type =~ 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | project id, peeringName=properties_virtualNetworkPeerings.name, compliant = (properties_virtualNetworkPeerings.properties.allowVirtualNetworkAccess =~ True)",
-            "guid": "a3592829-e6e2-4061-9368-6af46791f893",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-peering-overview",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "1cf0b8da-70bd-44d0-94af-8d99cfc89ae1",
+            "link": "https://learn.microsoft.com/azure/active-directory/reports-monitoring/concept-activity-logs-azure-monitor",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Local and global VNet peering provide connectivity and are the preferred approaches to ensure connectivity between landing zones for SAP deployments across multiple Azure regions",
-            "training": "https://learn.microsoft.com/training/modules/configure-vnet-peering/?source=recommendations",
-            "waf": "Reliability"
+            "text": "Integrate Microsoft Entra ID logs with the platform-central Azure Monitor. Azure Monitor allows for a single source of truth around log and monitoring data in Azure, giving organizations a cloud native options to meet requirements around log collection and retention.",
+            "training": "https://learn.microsoft.com/entra/identity/monitoring-health/howto-integrate-activity-logs-with-azure-monitor-logs",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "41742694-3ff8-4ae7-b7d4-743176c8bcbf",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-guide",
-            "service": "SAP",
+            "ammp": true,
+            "checklist": "Azure Landing Zone Review",
+            "guid": "984a859c-773e-47d2-9162-3a765a917e1f",
+            "link": "https://learn.microsoft.com/azure/active-directory/roles/security-emergency-access",
+            "service": "Entra",
             "severity": "High",
-            "text": "It is not supported to deploy any NVA between SAP application and SAP Database server",
-            "training": "https://me.sap.com/notes/2731110",
-            "waf": "Performance"
+            "text": "Implement an emergency access or break-glass accounts to prevent tenant-wide account lockout. MFA will be turned on by default for all users in Oct 2024. We recommend updating these accounts to use passkey (FIDO2) or configure certificate-based authentication for MFA. ",
+            "training": "https://learn.microsoft.com/entra/identity/role-based-access-control/security-emergency-access#exclude-at-least-one-account-from-conditional-access-policies",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources| where type =~ 'microsoft.network/virtualwans' | extend compliant= (properties.allowBranchToBranchTraffic =~ 'true') | distinct id,compliant",
-            "guid": "7d4bc7d2-c34a-452e-8f1d-6ae3c8eafcc3",
-            "link": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/?source=recommendations",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "35037e68-9349-4c15-b371-228514f4cdff",
+            "link": "https://learn.microsoft.com/azure/active-directory/roles/best-practices",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Use Virtual WAN for Azure deployments in new, large, or global networks where you need global transit connectivity across Azure regions and on-premises locations. With this approach, you won't need to manually set up transitive routing for Azure networking, and you can follow a standard for SAP on Azure deployments.",
-            "training": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-about",
-            "waf": "Operations"
+            "text": "Do not use on-premises synced accounts for Microsoft Entra ID role assignments, unless you have a scenario that specifically requires it.",
+            "training": "https://learn.microsoft.com/learn/modules/design-identity-security-strategy/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "0cedb1f6-ae6c-492b-8b17-8061f50b16d3",
-            "link": "https://learn.microsoft.com/azure/well-architected/services/networking/network-virtual-appliances/reliability",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "d5d1e4e6-1465-48d3-958f-d77249b82111",
+            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Consider deploying network virtual appliances (NVAs) between regions only if partner NVAs are used. NVAs between regions or VNets aren't required if native NVAs are present. When you're deploying partner networking technologies and NVAs, follow the vendor's guidance to verify conflicting configurations with Azure networking.",
-            "training": "https://learn.microsoft.com/training/modules/control-network-traffic-flow-with-routes/?source=recommendations",
-            "waf": "Operations"
+            "text": "When using Microsoft Entra ID Application Proxy to give remote users access to applications, manage it as a Platform resource as you can only have one instance per tenant.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-applications-external-access-azure-ad/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "facc08c6-ea95-4641-91cd-fa09e573adbd",
-            "link": "https://learn.microsoft.com/azure/architecture/networking/hub-spoke-vwan-architecture",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "e8bbac75-7155-49ab-a153-e8908ae28c84",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/enterprise-scale/network-topology-and-connectivity",
+            "service": "VNet",
             "severity": "Medium",
-            "text": "Virtual WAN manages connectivity between spoke VNets for virtual-WAN-based topologies (no need to set up user-defined routing [UDR] or NVAs), and maximum network throughput for VNet-to-VNet traffic in the same virtual hub is 50 gigabits per second. If necessary, SAP landing zones can use VNet peering to connect to other landing zones and overcome this bandwidth limitation.",
-            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/?source=recommendations",
-            "waf": "Operations"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | where type =~ 'Microsoft.Network/publicIPAddresses' and sku.tier =~ 'Regional' | where isempty(zones) or array_length(zones) <= 1 | extend az = case(isempty(zones), 'Non-zonal', array_length(zones) <= 1, strcat('Zonal (', strcat_array(zones, ','), ')'), zones) | project name, id, tags, param1 = strcat('sku: ', sku.name), param2 = strcat('availabilityZone: ', az)",
-            "guid": "82734c88-6ba2-4802-8459-11475e39e530",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Public IP assignment to VM running SAP Workload is not recommended.",
-            "training": "https://learn.microsoft.com/training/modules/design-ip-addressing-for-azure/?source=recommendations",
+            "text": "Use a hub-and-spoke network topology for network scenarios that require maximum flexibility.",
+            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | where type contains 'publicIPAddresses' and isnotempty(properties.ipAddress) | summarize count () by subscriptionId",
-            "guid": "9cccd979-366b-4cda-8750-ab1ab039d95d",
-            "link": "https://learn.microsoft.com/training/modules/protect-on-premises-infrastructure-with-azure-site-recovery/?source=recommendations",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Consider reserving IP address on DR side when configuring ASR",
-            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "7bc1c396-2461-4698-b57f-30ca69525252",
+            "link": "https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/considerations/regions",
+            "service": "VNet",
+            "severity": "Medium",
+            "text": "Deploy your Azure landing zone connectivity resources in multiple regions, so that you can quickly support multi-region application landing zones and disaster recovery scenarios.",
+            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "54c7c892-9cb1-407d-9325-ae525ba34d46",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "7dd61623-a364-4a90-9eca-e48ebd54cd7d",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/traditional-azure-networking-topology",
+            "service": "VNet",
             "severity": "High",
-            "text": "Avoid using overlapping IP address ranges for production and DR sites.",
-            "training": "https://learn.microsoft.com/training/modules/design-ip-addressing-for-azure/?source=recommendations",
-            "waf": "Operations"
+            "text": "Deploy shared networking services, including ExpressRoute gateways, VPN gateways, and Azure Firewall or partner NVAs in the central-hub virtual network. If necessary, also deploy DNS services.",
+            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "waf": "Cost"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "6e154e3a-a359-4282-ae6e-206173686af4",
-            "link": "https://learn.microsoft.com/azure/azure-netapp-files/azure-netapp-files-delegate-subnet",
-            "service": "SAP",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "e2e8abac-3571-4559-ab91-53e89f89dc7b",
+            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/dmz/nva-ha",
+            "service": "NVA",
             "severity": "Medium",
-            "text": "While Azure does help you to create multiple delegated subnets in a VNet, only one delegated subnet can exist in a VNet for Azure NetApp Files. Attempts to create a new volume will fail if you use more than one delegated subnet for Azure NetApp Files.",
-            "training": "https://learn.microsoft.com/azure/azure-netapp-files/azure-netapp-files-network-topologies?source=recommendations",
-            "waf": "Operations"
+            "text": "When deploying partner networking technologies or NVAs, follow the partner vendor's guidance.",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "resources | where type=~'microsoft.network/virtualhubs' | extend compliant = isnotnull(properties.azureFirewall.id) | project id, compliant",
-            "guid": "d8a03e97-7784-424d-9167-85d6fa96c96a",
-            "link": "https://learn.microsoft.com/azure/well-architected/services/networking/azure-firewall?toc=%2Fazure%2Ffirewall%2Ftoc.json&bc=%2Fazure%2Ffirewall%2Fbreadcrumb%2Ftoc.json",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Use Azure Firewall to govern Azure outbound traffic to the internet, non-HTTP/S inbound connections, and East/West traffic filtering (if the organization requires it)",
-            "training": "https://learn.microsoft.com/training/paths/secure-networking-infrastructure/",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "ce463dbb-bc8a-4c2a-aebc-92a43da1dae2",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-coexist-resource-manager#to-enable-transit-routing-between-expressroute-and-azure-vpn",
+            "service": "ExpressRoute",
+            "severity": "Low",
+            "text": "If you need transit between ExpressRoute and VPN gateways in hub and spoke scenarios, use Azure Route Server.",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-route-server/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "91a65e40-be90-45b3-9f73-f3edbf8dc324",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/expose-sap-process-orchestration-on-azure",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Application Gateway and Web Application Firewall have limitations when Application Gateway serves as a reverse proxy for SAP web apps, as shown in the comparison between Application Gateway, SAP Web Dispatcher, and other third-party services.",
-            "training": "https://help.sap.com/docs/SUPPORT_CONTENT/si/3362959506.html",
+            "arm-service": "Microsoft.Network/virtualHubs",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'RouteServerSubnet' | extend compliant = (subnetPrefixLength <= 27) | distinct id, compliant",
+            "guid": "91b9d7d5-91e1-4dcb-8f1f-fa7e465646cc",
+            "link": "https://learn.microsoft.com/azure/route-server/quickstart-configure-route-server-portal#create-a-route-server-1",
+            "service": "ARS",
+            "severity": "Low",
+            "text": "If using Route Server, use a /27 prefix for the Route Server subnet.",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-route-server/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5e39e530-9ccc-4d97-a366-bcda2750ab1a",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "cc881471-607c-41cc-a0e6-14658dd558f9",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-networks-faq#can-i-create-a-peering-connection-to-a-vnet-in-a-different-region",
+            "service": "VNet",
             "severity": "Medium",
-            "text": "Use Azure Front Door and WAF policies to provide global protection across Azure regions for inbound HTTP/S connections to a landing zone.",
-            "training": "https://learn.microsoft.com/training/paths/secure-application-delivery/",
-            "waf": "Security"
+            "text": "For network architectures with multiple hub-and-spoke topologies across Azure regions, use global virtual network peerings between the hub VNets to connect the regions to each other.",
+            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-virtual-networks/",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "b039d95d-54c7-4c89-89cb-107d5325ae52",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/afds-overview",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "4722d929-c1b1-4cd6-81f5-4b29bade39ad",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/network-insights-overview",
+            "service": "VNet",
             "severity": "Medium",
-            "text": "Take advantage of Web Application Firewall policies in Azure Front Door when you're using Azure Front Door and Application Gateway to protect HTTP/S applications. Lock down Application Gateway to receive traffic only from Azure Front Door.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-web-application-firewall/?source=recommendations",
-            "waf": "Security"
+            "text": "Use Azure Monitor for Networks to monitor the end-to-end state of the networks on Azure.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-network-monitoring/",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5ada4332-4e13-4811-9231-81aa41742694",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | summarize peeringcount = count() by id | extend compliant = (peeringcount < 450) | distinct id,compliant",
+            "guid": "0e7c28ec-9366-4572-83b0-f4664b1d944a",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/virtual-network/toc.json#azure-resource-manager-virtual-networking-limits",
+            "service": "VNet",
             "severity": "Medium",
-            "text": "Use a web application firewall to scan your traffic when it's exposed to the internet. Another option is to use it with your load balancer or with resources that have built-in firewall capabilities like Application Gateway or third-party solutions.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-web-application-firewall/?source=recommendations",
-            "waf": "Security"
+            "text": "If you have more than 400 spoke networks in a region, deploy an additional hub to bypass VNet peering limits (500) and the maximum number of prefixes that can be advertised via ExpressRoute (1000).",
+            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "e73de7d5-6f36-4217-a526-e1a621ecddde",
-            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-overview",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/routetables' | mvexpand properties.routes | summarize routeCount = count() by id | extend compliant = (routeCount < 360) | distinct id,compliant",
+            "guid": "3d457936-e9b7-41eb-bdff-314b26450b12",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/virtual-network/toc.json#azure-resource-manager-virtual-networking-limits",
+            "service": "VNet",
             "severity": "Medium",
-            "text": "Use Virtual WAN for Azure deployments in new, large, or global networks where you need global transit connectivity across Azure regions and on-premises locations. With this approach, you won't need to manually set up transitive routing for Azure networking, and you can follow a standard for SAP on Azure deployments.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/10-explore-azure-front-door",
-            "waf": "Performance"
+            "text": "Limit the number of routes per route table to 400.",
+            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "3c536a3e-1b6b-4e87-95ca-15edb47251c0",
-            "link": "https://learn.microsoft.com/azure/virtual-network/vnet-integration-for-azure-services",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "To prevent data leakage, use Azure Private Link to securely access platform as a service resources like Azure Blob Storage, Azure Files, Azure Data Lake Storage Gen2, Azure Data Factory, and more. Azure Private Endpoint can also help to secure traffic between VNets and services like Azure Storage, Azure Backup, and more. Traffic between your VNet and the Private Endpoint enabled service travels across the Microsoft global network, which prevents its exposure to the public internet.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-private-access-to-azure-services/?source=recommendations",
-            "waf": "Security"
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | project id, peeringName=properties_virtualNetworkPeerings.name, compliant = (properties_virtualNetworkPeerings.properties.allowVirtualNetworkAccess == True)",
+            "guid": "c76cb5a2-abe2-11ed-afa1-0242ac120002",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-peering",
+            "service": "VNet",
+            "severity": "High",
+            "text": "Use the setting 'Allow traffic to remote virtual network' when configuring VNet peerings.",
+            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | where type =~ 'Microsoft.Network/NetworkInterfaces' | where properties.enableAcceleratedNetworking =~ 'false' | project name, subscriptionId, properties.enableAcceleratedNetworking",
-            "guid": "85e2213a-ce7b-4b12-8f7c-95f06e154e3a",
-            "link": "https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview?tabs=redhat",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/loadBalancers",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/loadbalancers' | where tolower(sku.name) != 'basic' | mv-expand feIPconfigs = properties.frontendIPConfigurations | extend feConfigName = (feIPconfigs.name), PrivateSubnetId = toupper(feIPconfigs.properties.subnet.id), PrivateIPZones = feIPconfigs.zones, PIPid = toupper(feIPconfigs.properties.publicIPAddress.id), JoinID = toupper(id) | where isnotempty(PrivateSubnetId) | where isnull(PrivateIPZones) or array_length(PrivateIPZones) < 2 | project name, feConfigName, id | union (resources | where type == 'microsoft.network/loadbalancers' | where tolower(sku.name) != 'basic' | mv-expand feIPconfigs = properties.frontendIPConfigurations | extend feConfigName = (feIPconfigs.name), PIPid = toupper(feIPconfigs.properties.publicIPAddress.id), JoinID = toupper(id) | where isnotempty(PIPid) | join kind=innerunique ( resources | where type == 'microsoft.network/publicipaddresses' | where isnull(zones) or array_length(zones) < 2 | extend LBid = toupper(substring(properties.ipConfiguration.id, 0, indexof(properties.ipConfiguration.id, '/frontendIPConfigurations'))), InnerID = toupper(id) ) on $left.PIPid == $right.InnerID) | project name, id, tags, param1='Zones: No Zone or Zonal', param2=strcat('Frontend IP Configuration:', ' ', feConfigName)",
+            "guid": "9dcd6250-9c4a-4382-aa9b-5b84c64fc1fe",
+            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-load-balancer?tabs=graph#zone-redundant",
+            "service": "Load Balancer",
             "severity": "High",
-            "text": "Make sure that Azure accelerated networking is enabled on the VMs used in the SAP application and DBMS layers.",
-            "training": "https://learn.microsoft.com/training/paths/azure-fundamentals-describe-azure-architecture-services/?source=recommendations",
-            "waf": "Performance"
+            "text": "Use Standard Load Balancer SKU with a zone-redundant deployment, Selecting Standard SKU Load Balancer enhances reliability through availability zones and zone resiliency, ensuring deployments withstand zone and region failures. Unlike Basic, it supports global load balancing and offers an SLA.",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "3ff8ae7d-7d47-4431-96c8-bcbf45bbe609",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-multivip-overview",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/loadBalancers",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'Microsoft.Network/loadBalancers' | extend bep = properties.backendAddressPools | extend BackEndPools = array_length(bep) | where BackEndPools == 0 | project name, id, Param1='backendPools', Param2=toint(0), tags | union (resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name == 'Standard' | extend bep = properties.backendAddressPools | extend BackEndPools = toint(array_length(bep)) | mv-expand bip = properties.backendAddressPools | extend BackendAddresses = array_length(bip.properties.loadBalancerBackendAddresses) | where toint(BackendAddresses) <= 1 | project name, id, tags, Param1='backendAddresses', Param2=toint(BackendAddresses)) | union ( resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name == 'Basic' | mv-expand properties.backendAddressPools | extend backendPoolId = properties_backendAddressPools.id | project id, name, tags, tostring(backendPoolId), Param1='BackEndPools' | join kind = leftouter ( resources | where type =~ 'Microsoft.Network/networkInterfaces' | mv-expand properties.ipConfigurations | mv-expand properties_ipConfigurations.properties.loadBalancerBackendAddressPools | extend backendPoolId = tostring(properties_ipConfigurations_properties_loadBalancerBackendAddressPools.id) | summarize poolMembers = count() by backendPoolId | project tostring(backendPoolId), poolMembers ) on backendPoolId | where toint(poolMembers) <= 1 | extend BackendAddresses = poolMembers | project id, name, tags, Param1='backendAddresses', Param2=toint(BackendAddresses))",
+            "guid": "48682fb1-1e86-4458-a686-518ebd47393d",
+            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-load-balancer?tabs=graph#zone-redundant",
+            "service": "Load Balancer",
+            "severity": "High",
+            "text": "Ensure load balancer backend pool(s) contains at least two instances, Deploying Azure Load Balancers with at least two instances in the backend prevents a single point of failure and supports scalability.",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "de0d5973-cd4c-4d21-a088-137f5e6c4cfd",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-macsec",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Make sure that internal deployments for Azure Load Balancer are set up to use Direct Server Return (DSR). This setting (Enabling Floating IP) will reduce latency when internal load balancer configurations are used for high-availability configurations on the DBMS layer.",
-            "training": "https://learn.microsoft.com/ja-jp/training/modules/load-balancing-non-https-traffic-azure/?source=recommendations",
+            "text": "When you're using ExpressRoute Direct, configure MACsec in order to encrypt traffic at the layer-two level between the organization's routers and MSEE. The diagram shows this encryption in flow.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | where type =~ 'microsoft.network/networksecuritygroups' and isnull(properties.networkInterfaces) and isnull(properties.subnets) | project name, resourceGroup | sort by name asc",
-            "guid": "6791f893-5ada-4433-84e1-3811523181aa",
-            "link": "https://learn.microsoft.com/azure/virtual-network/network-security-group-how-it-works",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "ed301d6e-872e-452e-9611-cc58b5a4b151",
+            "link": "https://learn.microsoft.com/azure/vpn-gateway/site-to-site-vpn-private-peering",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "You can use application security group (ASG) and NSG rules to define network security access-control lists between the SAP application and DBMS layers. ASGs group virtual machines to help manage their security.",
-            "training": "https://learn.microsoft.com/training/modules/configure-network-security-groups/?source=recommendations",
+            "text": "For scenarios where MACsec isn't an option (for example, not using ExpressRoute Direct), use a VPN gateway to establish IPsec tunnels over ExpressRoute private peering.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "45bbe609-d8a0-43e9-9778-424d616785d6",
-            "link": "https://me.sap.com/notes/2015553",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "558fd772-49b8-4211-82df-27ee412e7f98",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "Placing of the SAP application layer and SAP DBMS in different Azure VNets that aren't peered isn't supported.",
-            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
-            "waf": "Performance"
+            "text": "Ensure no overlapping IP address spaces across Azure regions and on-premises locations are used.",
+            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "fa96c96a-d885-418f-9827-34c886ba2802",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | extend addressSpace = todynamic(properties.addressSpace) | extend addressPrefix = todynamic(properties.addressSpace.addressPrefixes) | mvexpand addressSpace | mvexpand addressPrefix | project name, id, location, resourceGroup, subscriptionId, cidr = addressPrefix | extend compliant = (cidr matches regex @'^(10\\\\.|172\\\\.(1[6-9]|2[0-9]|3[01])\\\\.|192\\\\.168\\\\.)')  | project id, compliant, cidr",
+            "guid": "3f630472-2dd6-49c5-a5c2-622f54b69bad",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
+            "service": "VNet",
             "severity": "Medium",
-            "text": "For optimal network latency with SAP applications, consider using Azure proximity placement groups.",
-            "training": "https://learn.microsoft.com/azure/virtual-machines/co-location#planned-maintenance-and-proximity-placement-groups",
-            "waf": "Performance"
+            "text": "Use IP addresses from the address allocation ranges for private internets (RFC 1918).",
+            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "18c8b61c-855a-4405-b6ed-266455e4f4ce",
-            "link": "https://me.sap.com/notes/2015553",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | extend addressSpace = todynamic(properties.addressSpace) | extend addressPrefix = todynamic(properties.addressSpace.addressPrefixes) | mvexpand addressSpace | mvexpand addressPrefix | extend addressMask = split(addressPrefix,'/')[1] | extend compliant = addressMask > 16 | project name, id, subscriptionId, resourceGroup, addressPrefix, compliant",
+            "guid": "33aad5e8-c68e-41d7-9667-313b4f5664b5",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
+            "service": "VNet",
             "severity": "High",
-            "text": "It is NOT supported at all to run an SAP Application Server layer and DBMS layer split between on-premise and Azure. Both layers need to completely reside either on-premise or in Azure.",
-            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
+            "text": "Ensure that IP address space isn't wasted, don't create unnecessarily large virtual networks (for example /16).",
+            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
             "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "b65c878b-4b14-4f4e-92d8-d873936493f2",
-            "link": "https://me.sap.com/notes/2015553",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "f348ef25-4c27-4d42-b8bb-ac7571559ab9",
+            "link": "https://learn.microsoft.com/azure/site-recovery/concepts-on-premises-to-azure-networking#retain-ip-addresses",
+            "service": "VNet",
             "severity": "High",
-            "text": "It isn't recommended to host the database management system (DBMS) and application layers of SAP systems in different VNets and connect them with VNet peering because of the substantial costs that excessive network traffic between the layers can produce. Recommend using subnets within the Azure virtual network to separate the SAP application layer and DBMS layer.",
-            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
-            "waf": "Cost"
+            "text": "Do not use overlapping IP address ranges for production and disaster recovery sites.",
+            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "402a9846-d515-4061-aff8-cd30088693fa",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-rhel",
-            "service": "SAP",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "Resources | where type =~ 'Microsoft.Network/publicIPAddresses' and sku.tier =~ 'Regional' | where isempty(zones) or array_length(zones) <= 1 | extend az = case(isempty(zones), 'Non-zonal', array_length(zones) <= 1, strcat('Zonal (', strcat_array(zones, ','), ')'), zones) | project name, id, tags, param1 = strcat('sku: ', sku.name), param2 = strcat('availabilityZone: ', az)",
+            "guid": "0c47f486-656d-4699-8c30-edef5b8a93c4",
+            "link": "https://learn.microsoft.com/azure/virtual-network/ip-services/public-ip-addresses#availability-zone",
+            "service": "Public IP Addresses",
             "severity": "High",
-            "text": "If using Load Balancer with Linux guest operating systems, check that the Linux network parameter net.ipv4.tcp_timestamps is set to 0.",
-            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
-            "waf": "Performance"
+            "text": "Use Standard SKU and Zone-Redundant IPs when applicable, Public IP addresses in Azure can be of standard SKU, available as non-zonal, zonal, or zone-redundant. Zone-redundant IPs are accessible across all zones, resisting any single zone failure, thereby providing higher resilience. ",
+            "training": "https://learn.microsoft.com/en-gb/training/modules/configure-virtual-networks/6-create-public-ip-addressing",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "87585797-5551-4d53-bb7d-a94ee415734d",
-            "link": "https://learn.microsoft.com/azure/sap/workloads/rise-integration",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/dnsZones",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "153e8908-ae28-4c84-a33b-6b7808b9fe5c",
+            "link": "https://learn.microsoft.com/azure/dns/private-dns-getstarted-portal",
+            "service": "DNS",
             "severity": "Medium",
-            "text": "For SAP RISE/ECS deployments, virtual peering is the preferred way to establish connectivity with customer's existing Azure environment. Both the SAP vnet and customer vnet(s) are protected with network security groups (NSG), enabling communication on SAP and database ports through the vnet peering",
-            "waf": "Security"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "ff5136bd-dcf1-4d2b-ae52-39333efdf45a",
-            "link": "https://learn.microsoft.com/azure/backup/sap-hana-database-about",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Review SAP HANA database backups for Azure VMs.",
-            "waf": "Cost"
+            "text": "For environments where name resolution in Azure is all that's required, use Azure Private DNS for resolution with a delegated zone for name resolution (such as 'azure.contoso.com').",
+            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "cafde29d-a0af-4bcd-87c0-0f299d63f0e8",
-            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-monitor-and-troubleshoot",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/dnsZones",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "41049d40-3a92-43c3-974d-00018ac6a9e0",
+            "link": "https://learn.microsoft.com/azure/dns/dns-private-resolver-overview",
+            "service": "DNS",
             "severity": "Medium",
-            "text": "Review Site Recovery built-in monitoring, where used for SAP.",
-            "waf": "Cost"
+            "text": "For environments where name resolution across Azure and on-premises is required and there is no existing enterprise DNS service like Active Directory, use Azure DNS Private Resolver to route DNS requests to Azure or to on-premises DNS servers.",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-dns-private-resolver/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "82d7b8de-d3f1-44a0-830b-38e200e82acf",
-            "link": "https://help.sap.com/docs/SAP_HANA_PLATFORM/c4d7c773af4a4e5dbebb6548d6e2d4f4/e3111d2ebb5710149510cc120646bf3f.html?locale=en-US",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Review the Monitoring the SAP HANA System Landscape guidance.",
+            "arm-service": "Microsoft.Network/dnsZones",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "1e6a83de-5de3-42c1-a924-81607d5d1e4e",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances",
+            "service": "DNS",
+            "severity": "Low",
+            "text": "Special workloads that require and deploy their own DNS (such as Red Hat OpenShift) should use their preferred DNS solution.",
+            "training": "https://learn.microsoft.com/training/courses/az-700t00",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "c823873a-2bec-4c2a-b684-a1ce8ae80efd",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/workloads/oracle/oracle-database-backup-strategies",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Review Oracle Database in Azure Linux VM backup strategies.",
-            "waf": "Operations"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "2943b6d8-1d31-4e19-ade7-78e6b26d1962",
-            "link": "https://learn.microsoft.com/sql/relational-databases/tutorial-use-azure-blob-storage-service-with-sql-server-2016?view=sql-server-ver16",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Review the use of Azure Blob Storage with SQL Server 2016.",
-            "waf": "Operations"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "b82e650f-676d-417d-994d-fc33ca54ec14",
-            "link": "https://learn.microsoft.com/azure/azure-sql/virtual-machines/windows/automated-backup?view=azuresql",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Review the use of Automated Backup v2 for Azure VMs.",
-            "waf": "Operations"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "347c2dcc-e6eb-4b04-80c5-628b171aa62d",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/dnsZones",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "614658d3-558f-4d77-849b-821112df27ee",
+            "link": "https://learn.microsoft.com/azure/dns/private-dns-autoregistration",
+            "service": "DNS",
             "severity": "High",
-            "text": "Enabling Write accelerator for M series when using premium disks(V1)",
+            "text": "Enable auto-registration for Azure DNS to automatically manage the lifecycle of the DNS records for the virtual machines deployed within a virtual network.",
+            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
             "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "b96512cf-996f-4b17-b9b8-6b16db1a2a94",
-            "link": "https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/AvZone-Latency-Test",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Test availability zone latency.",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "9fd7ffd4-da11-49f6-a374-8d03e94c511d",
-            "link": "https://support.sap.com/en/offerings-programs/support-services/earlywatch-alert.html",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Activate SAP EarlyWatch Alert for all SAP components.",
-            "training": "https://help.sap.com/docs/SUPPORT_CONTENT/techops/3362700736.html",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "b9b140cf-413a-483d-aad2-8802c4e3c017",
-            "link": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/sap-on-azure-general-update-march-2019/ba-p/377456",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Review SAP application server to database server latency using SAP ABAPMeter report /SSA/CAT.",
-            "training": "https://me.sap.com/notes/0002879613",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "62fbf0f8-51db-49e1-a961-bb5df7a35f80",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Review SQL Server performance monitoring using CCMS.",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "35709da7-fc7d-4efe-bb20-2e91547b7390",
-            "link": "https://me.sap.com/notes/500235",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Test network latency between SAP application layer VMs and DBMS VMs (NIPING).",
-            "training": "https://me.sap.com/notes/1100926/E",
-            "waf": "Performance"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "9e9bb4c8-e934-4e4b-a13c-6f7c7c38eb43",
-            "link": "https://learn.microsoft.com/en-us/azure/sap/large-instances/hana-monitor-troubleshoot",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/dnsZones",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "18c80eb0-582a-4198-bf5c-d8800b2d263b",
+            "link": "https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/azure-best-practices/private-link-and-dns-integration-at-scale#private-link-and-dns-integration-in-hub-and-spoke-network-architectures",
+            "service": "DNS",
             "severity": "Medium",
-            "text": "Review SAP HANA studio alerts.",
-            "waf": "Performance"
+            "text": "Implement a plan for managing DNS resolution between multiple Azure regions and when services fail over to another region",
+            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "f1a92ab5-9509-4b57-86ff-b0ade361b694",
-            "link": "https://me.sap.com/notes/1969700",
-            "service": "SAP",
+            "arm-service": "microsoft.network/bastionHosts",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "ee1ac551-c4d5-46cf-b035-d0a3c50d87ad",
+            "link": "https://learn.microsoft.com/azure/bastion/bastion-overview",
+            "service": "Bastion",
             "severity": "Medium",
-            "text": "Perform SAP HANA health checks using HANA_Configuration_Minichecks.",
-            "waf": "Performance"
+            "text": "Use Azure Bastion to securely connect to your network.",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-bastion/",
+            "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "18dffcf3-248c-4039-a67c-dec8e3a5f804",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-security-operations",
-            "service": "SAP",
+            "arm-service": "microsoft.network/bastionHosts",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'AzureBastionSubnet' | extend compliant = (subnetPrefixLength <= 26) | distinct id, compliant",
+            "guid": "6eab9eb6-762b-485e-8ea8-15aa5dba0bd0",
+            "link": "https://learn.microsoft.com/azure/bastion/bastion-faq#subnet",
+            "service": "Bastion",
             "severity": "Medium",
-            "text": "If you run Windows and Linux VMs in Azure, on-premises, or in other cloud environments, you can use the Update management center in Azure Automation to manage operating system updates, including security patches.",
-            "training": "https://learn.microsoft.com/azure/automation/update-management/overview",
+            "text": "Use Azure Bastion in a subnet /26 or larger.",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-bastion/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "08951710-79a2-492a-adbc-06d7a401545b",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-security-operations",
-            "service": "SAP",
+            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "1d7aa9b6-4704-4489-a804-2d88e79d17b7",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/afds-overview",
+            "service": "WAF",
             "severity": "Medium",
-            "text": "Routinely review the SAP security OSS notes because SAP releases highly critical security patches, or hot fixes, that require immediate action to protect your SAP systems.",
-            "training": "https://support.sap.com/en/my-support/knowledge-base/security-notes-news.html",
+            "text": "Use Azure Front Door and WAF policies to provide global protection across Azure regions for inbound HTTP/S connections to a landing zone.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "1b8b394e-ae64-4a74-8933-357b523ea0a0",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-database-security",
-            "service": "SAP",
+            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "3b22a5a6-7e7a-48ed-9b30-e38c3f29812b",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "WAF",
             "severity": "Low",
-            "text": "For SAP on SQL Server, you can disable the SQL Server system administrator account because the SAP systems on SQL Server don't use the account. Ensure that another user with system administrator rights can access the server before disabling the original system administrator account.",
+            "text": "When using Azure Front Door and Azure Application Gateway to help protect HTTP/S apps, use WAF policies in Azure Front Door. Lock down Azure Application Gateway to receive traffic only from Azure Front Door.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "5a76a033-ced9-4eef-9a43-5e4f96634c8e",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-database-security",
-            "service": "SAP",
+            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "2363cefe-179b-4599-be0d-5973cd4cd21b",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "WAF",
             "severity": "High",
-            "text": "Disable xp_cmdshell. The SQL Server feature xp_cmdshell enables a SQL Server internal operating system command shell. It's a potential risk in security audits.",
-            "training": "https://me.sap.com/notes/3019299/E",
+            "text": "When WAFs and other reverse proxies are required for inbound HTTP/S connections, deploy them within a landing-zone virtual network and together with the apps that they're protecting and exposing to the internet.",
+            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "cf65de8e-1309-4ccc-b579-266bcca275fa",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
-            "service": "SAP",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "088137f5-e6c4-4cfd-9e50-4547c2447ec6",
+            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-reference-architectures",
+            "service": "VNet",
             "severity": "High",
-            "text": "Encrypting SAP HANA database servers on Azure uses SAP HANA native encryption technology. Additionally, if you are using SQL Server on Azure, use Transparent Data Encryption (TDE) to protect your data and log files and ensure that your backups are also encrypted.",
-            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-database-security",
+            "text": "Use Azure DDoS Network or IP Protection plans to help protect Public IP Addresses endpoints within the virtual networks including application landing zones.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "a1abfe9d-55d0-44c3-a491-9cb1b3d1325a",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-service-encryption",
-            "service": "SAP",
-            "severity": "Medium",
-            "text": "Azure Storage encryption is enabled for all Azure Resource Manager and classic storage accounts, and can't be disabled. Because your data is encrypted by default, you don't need to modify your code or applications to use Azure Storage encryption.",
-            "training": "https://learn.microsoft.com/training/modules/encrypt-sector-data/?source=recommendations",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b034c01e-110b-463a-b36e-e3346e57f225",
+            "link": "https://learn.microsoft.com/azure/virtual-network/ip-services/default-outbound-access",
+            "service": "VNet",
+            "severity": "High",
+            "text": "Plan for how to manage your network outbound traffic configuration and strategy before the upcoming breaking change. On September 30, 2025, default outbound access for new deployments will be retired and only explicit access configurations will be allowed.",
+            "training": "https://learn.microsoft.com/training/modules/configure-virtual-networks/",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b1c82a3f-2320-4dfa-8972-7ae4823c8930",
+            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-reference-architectures",
+            "service": "VNet",
+            "severity": "High",
+            "text": "Add diagnostic settings to save DDoS related logs for all the protected public IP addresses (DDoS IP or Network Protection).",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | join kind=leftouter (ResourceContainers | where type=~'microsoft.resources/subscriptions' | project SubName=name, subscriptionId) on subscriptionId | where type =~ 'microsoft.keyvault/vaults' | project type, name, SubName",
-            "guid": "ce9bd3bb-0cdb-43b5-9eb2-ec14eeaa3592",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/overview",
-            "service": "SAP",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "3c5a808d-c695-4c14-a63c-c7ab7a510e41",
+            "link": "https://github.com/Azure/Enterprise-Scale/wiki/ALZ-Policies#corp",
+            "service": "Policy",
             "severity": "High",
-            "text": "Use Azure Key Vault to store your secrets and credentials",
-            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
+            "text": "Ensure there is a policy assignment to deny Public IP addresses directly tied to Virtual Machines.  Use exclusions if public IPs are needed on specific VMs.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "829e2edb-2173-4676-aff6-691b4935ada4",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/lock-resources?tabs=json",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "359c373e-7dd6-4162-9a36-4a907ecae48e",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/connectivity-to-azure",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "It is recommended to LOCK the Azure Resources post successful deployment to safeguard against unauthorized changes. You can also enforce LOCK constraints and rules on your per-subscription basis using customized Azure policies(Custome role).",
-            "training": "https://learn.microsoft.com/training/modules/use-azure-resource-manager/?source=recommendations",
-            "waf": "Security"
+            "text": "Use ExpressRoute as the primary connection to Azure.  Use VPNs as a source of backup connectivity.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "2223ece8-1b12-4318-8a54-17415833fb4a",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/soft-delete-overview",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "description": "You can use AS-path prepending and connection weights to influence traffic from Azure to on-premises, and the full range of BGP attributes in your own routers to influence traffic from on-premises to Azure.",
+            "guid": "f29812b2-363c-4efe-879b-599de0d5973c",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-routing",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Provision Azure Key Vault with the soft delete and purge policies enabled to allow retention protection for deleted objects.",
-            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
-            "waf": "Security"
+            "text": "When you use multiple ExpressRoute circuits or multiple on-prem locations, use BGP attributes to optimize routing.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "e3c2df74-3165-4c3a-abe0-5bbe209d490d",
-            "link": "https://learn.microsoft.com/azure/role-based-access-control/security-controls-policy",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Based on existing requirements, regulatory and compliance controls (internal/external) - Determine what Azure Policies and Azure RBAC role are needed",
-            "training": "https://learn.microsoft.com/training/paths/describe-azure-management-governance/?source=recommendations",
-            "waf": "Security"
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources| where type == 'microsoft.network/virtualnetworkgateways'| where properties.gatewayType =~ 'vpn' or properties.gatewayType == 'ExpressRoute'| extend SKUName = properties.sku.name, SKUTier = properties.sku.tier, Type = properties.gatewayType| extend compliant = SKUTier !in ('Basic', 'Standard')| project name, id, subscriptionId, resourceGroup, compliant",
+            "guid": "d4cd21b0-8813-47f5-b6c4-cfd3e504547c",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-about-virtual-network-gateways?source=recommendations#gwsku",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "Select the right SKU for the ExpressRoute/VPN gateways based on bandwidth and performance requirements.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "a4777842-4d11-4678-9d2f-a56c56ad4840",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/expressroutecircuits' | extend compliant = (tolower(sku.family) == 'metereddata' or tolower(sku.tier) == 'local') | distinct id,compliant",
+            "guid": "7025b442-f6e9-4af6-b11f-c9574916016f",
+            "link": "https://learn.microsoft.com/azure/expressroute/plan-manage-cost",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "When enabling Microsoft Defender for Endpoint on SAP environment, recommend excluding data and log files on DBMS servers instead of targeting all servers. Follow your DBMS vendor's recommendations when excluding target files.",
-            "training": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/microsoft-defender-endpoint-mde-for-sap-applications-on-windows/ba-p/3912268",
-            "waf": "Security"
+            "text": "Ensure that you're using unlimited-data ExpressRoute circuits only if you reach the bandwidth that justifies their cost.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
+            "waf": "Cost"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "8fe72734-c486-4ba2-a0dc-0591cf65de8e",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/just-in-time-access-overview?tabs=defender-for-container-arch-aks",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/connections' | where properties.connectionType == 'ExpressRoute' | project id, gwid=tostring(properties.virtualNetworkGateway1.id), circuitid=tostring(properties.peer.id) | join (resources | where type=='microsoft.network/expressroutecircuits' | project circuitid=tostring(id), circuitsku=sku.tier) on circuitid | project id=gwid, compliant = (circuitsku == 'Local') | summarize compliant=max(compliant) by id",
+            "guid": "f4e7926a-ec35-476e-a412-5dd17136bd62",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-faqs#expressroute-local",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "Delegate an SAP admin custom role with just-in-time access of Microsoft Defender for Cloud.",
-            "training": "https://learn.microsoft.com/training/modules/secure-vms-with-azure-security-center/?source=recommendations",
-            "waf": "Security"
+            "text": "Leverage the Local SKU of ExpressRoute to reduce the cost of your circuits, if your circuit peering location supports your Azure regions for the Local SKU.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
+            "waf": "Cost"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "1309cccd-5792-466b-aca2-75faa1abfe9d",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "encrypt data in transit by integrating the third-party security product with secure network communications (SNC) for DIAG (SAP GUI), RFC, and SPNEGO for HTTPS",
-            "training": "https://learn.microsoft.com/azure/security/fundamentals/encryption-overview#encryption-of-data-in-transit",
-            "waf": "Security"
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources| where type == 'microsoft.network/virtualnetworkgateways'| where properties.gatewayType =~ 'vpn' or properties.gatewayType == 'ExpressRoute'| extend SKUName = properties.sku.name, SKUTier = properties.sku.tier, Type = properties.gatewayType| extend compliant = SKUTier contains 'AZ'| project name, id, subscriptionId, resourceGroup, Type, compliant",
+            "guid": "2447ec66-138a-4720-8f1c-e16ed301d6e8",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-about-virtual-network-gateways",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "Deploy a zone-redundant ExpressRoute gateway in the supported Azure regions.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "eeaa3592-829e-42ed-a217-3676aff6691b",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-encryption-key-model-get?tabs=portal",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "72e52e36-11cc-458b-9a4b-1511e43a58a9",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/connectivity-to-azure",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Default to Microsoft-managed keys for principal encryption functionality and use customer-managed keys when required.",
-            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
-            "waf": "Security"
+            "text": "For scenarios that require bandwidth higher than 10 Gbps or dedicated 10/100-Gbps ports, use ExpressRoute Direct.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "graph": "Resources | join kind=leftouter (ResourceContainers | where type=~'microsoft.resources/subscriptions' | project SubName=name, subscriptionId) on subscriptionId | where type =~ 'microsoft.keyvault/vaults' | project type, name, SubName",
-            "guid": "4935ada4-2223-4ece-a1b1-23181a541741",
-            "link": "https://learn.microsoft.com/ja-jp/azure/key-vault/general/best-practices",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Use an Azure Key Vault per application per environment per region.",
-            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
-            "waf": "Security"
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "c2299c4d-7b57-4d0c-9555-62f2b3e4563a",
+            "link": "https://learn.microsoft.com/azure/expressroute/about-fastpath",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "When low latency is required, or throughput from on-premises to Azure must be greater than 10 Gbps, enable FastPath to bypass the ExpressRoute gateway from the data path.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Performance"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "abc9634d-c44d-41e9-a530-e8444e16aa3c",
-            "link": "https://learn.microsoft.com/azure/key-vault/certificates/certificate-scenarios",
-            "service": "SAP",
-            "severity": "High",
-            "text": "To control and manage disk encryption keys and secrets for non-HANA Windows and non-Windows operating systems, use Azure Key Vault. SAP HANA isn't supported with Azure Key Vault, so you must use alternate methods like SAP ABAP or SSH keys.",
-            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/?source=recommendations",
-            "waf": "Security"
+            "arm-service": "microsoft.network/virtualNetworkGateways",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworkgateways' | where properties.gatewayType == 'Vpn' | extend compliant = (tolower(properties.sku.name) contains 'az') | distinct id, compliant",
+            "guid": "4d873974-8b66-42d6-b15f-512a65498f6d",
+            "link": "https://learn.microsoft.com/azure/vpn-gateway/create-zone-redundant-vnet-gateway",
+            "service": "VPN",
+            "severity": "Medium",
+            "text": "Use zone-redundant VPN gateways to connect branches or remote locations to Azure (where available).",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-vpn-gateway/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "209d490d-a477-4784-84d1-16785d2fa56c",
-            "link": "https://learn.microsoft.com/azure/role-based-access-control/built-in-roles",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Customize role-based access control (RBAC) roles for SAP on Azure spoke subscriptions to avoid accidental network-related changes",
-            "training": "https://learn.microsoft.com/training/modules/secure-azure-resources-with-rbac/?source=recommendations",
-            "waf": "Security"
+            "arm-service": "microsoft.network/virtualNetworkGateways",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "45866df8-cf85-4ca9-bbe2-65ec1478919e",
+            "link": "https://learn.microsoft.com/azure/vpn-gateway/vpn-gateway-highlyavailable",
+            "service": "VPN",
+            "severity": "Medium",
+            "text": "Use redundant VPN appliances on-premises (active/active or active/passive).",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-vpn-gateway/",
+            "waf": "Reliability"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "56ad4840-8fe7-4273-9c48-6ba280dc0591",
-            "link": "https://blogs.sap.com/2019/07/21/sap-security-operations-on-azure/",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "718cb437-b060-2589-8856-2e93a5c6633b",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-erdirect-about",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "Isolate DMZs and NVAs from the rest of the SAP estate, configure Azure Private Link, and securely manage and control the SAP on Azure resources",
-            "training": "https://learn.microsoft.com/azure/architecture/reference-architectures/dmz/secure-vnet-dmz?tabs=portal",
-            "waf": "Security"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "e124ba34-df68-45ed-bce9-bd3bb0cdb3b5",
-            "link": "https://learn.microsoft.com/en-us/training/modules/secure-vms-with-azure-security-center/?source=recommendations",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "Consider using Microsoft anti-malware software on Azure to protect your virtual machines from malicious files, adware, and other threats.",
-            "training": "https://azure.microsoft.com/blog/deploying-antimalware-solutions-on-azure-virtual-machines/",
-            "waf": "Security"
-        },
-        {
-            "checklist": "SAP Checklist",
-            "guid": "5eb2ec14-eeaa-4359-8829-e2edb2173676",
-            "link": "https://learn.microsoft.com/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint?view=o365-worldwide",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "For even more powerful protection, consider using Microsoft Defender for Endpoint.",
-            "training": "https://learn.microsoft.com/training/modules/implement-endpoint-protection-use-microsoft-defender/?source=recommendations",
-            "waf": "Security"
+            "text": "If using ExpressRoute Direct, consider using ExpressRoute Local circuits to the local Azure regions to save costs.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Cost"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "87a924c4-25c2-419f-a2f0-96c7c4fe4525",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-whole-landscape",
-            "service": "SAP",
-            "severity": "High",
-            "text": "Isolate the SAP application and database servers from the internet or from the on-premises network by passing all traffic through the hub virtual network, which is connected to the spoke network by virtual network peering. The peered virtual networks guarantee that the SAP on Azure solution is isolated from the public internet.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/?source=recommendations",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "8042d88e-79d1-47b7-9b22-a5a67e7a8ed4",
+            "link": "https://learn.microsoft.com/azure/architecture/framework/services/networking/expressroute/reliability",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "When traffic isolation or dedicated bandwidth is required, such as for separating production and nonproduction environments, use different ExpressRoute circuits. It will help you ensure isolated routing domains and alleviate noisy-neighbor risks.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
             "waf": "Security"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "491ca1c4-3d40-42c0-9d85-b8933999590b",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
-            "service": "SAP",
-            "severity": "Low",
-            "text": "For internet-facing applications like SAP Fiori, make sure to distribute load per application requirements while maintaining security levels. For Layer 7 security, you can use a third-party Web Application Firewall (WAF) available in the Azure Marketplace.",
-            "training": "https://learn.microsoft.com/training/modules/simplify-cloud-procurement-governance-azure-marketplace/?source=recommendations",
-            "waf": "Security"
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b30e38c3-f298-412b-8363-cefe179b599d",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-monitoring-metrics-alerts",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "Monitor ExpressRoute availability and utilization using built-in Express Route Insights.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Operations"
         },
         {
-            "checklist": "SAP Checklist",
-            "guid": "9fc945b9-0527-47af-8200-9d652fe02fcc",
-            "link": "https://learn.microsoft.com/azure/sap/monitor/enable-tls-azure-monitor-sap-solutions",
-            "service": "SAP",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5bf68dc9-325e-4873-bf88-f8214ef2e5d2",
+            "link": "https://learn.microsoft.com/azure/expressroute/how-to-configure-connection-monitor",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "To enable secure communication in Azure Monitor for SAP solutions, you can choose to use either a root certificate or a server certificate. We highly recommend that you use root certificates.",
-            "training": "https://learn.microsoft.com/training/modules/implement-azure-monitoring-sap-workloads-azure-virtual-machines/?source=recommendations",
-            "waf": "Security"
+            "text": "Use Connection Monitor for connectivity monitoring across the network, especially between on-premises and Azure.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Leverage zone-redundancy to ensure high availability in the event of zone-level failures. Use Premium V2/V3 or Isolated v2 tiers, which provide support for zone-redundant deployments and ensure minimal downtime during disasters.",
-            "guid": "b32e1aa1-4813-4602-88fe-27ca2891f421",
-            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/app-service-web-app/zone-redundant?source=recommendations",
-            "service": "App Services",
-            "severity": "Low",
-            "text": "Implement a baseline highly available zone-redundant web application architecture. Ensure your Azure App Service is on Premium V2/V3 or Isolated v2 tiers for zone-redundant support.",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/connections' | where properties.connectionType == 'ExpressRoute' | project cxId=id, gwId=tostring(properties.virtualNetworkGateway1.id), circuitId=tostring(properties.peer.id) | join (resources | where type=='microsoft.network/expressroutecircuits' | project circuitId=tostring(id), circuitLocation=tostring(properties.serviceProviderProperties.peeringLocation)) on circuitId | distinct gwId, circuitLocation | summarize countErLocations=count() by id=gwId | extend compliant = (countErLocations >= 2)",
+            "guid": "e0d5973c-d4cd-421b-8881-37f5e6c4cfd3",
+            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering#need-for-redundant-connectivity-solution",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "Use ExpressRoute circuits from different peering locations for redundancy.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Leverage staging slots for zero-downtime deployments and automated backups to ensure disaster recovery. Choose the appropriate tier (Standard or Premium) based on the number of slots and disaster recovery requirements.",
-            "graph": "resources | where type =~ 'microsoft.web/serverfarms' | extend compliant = (sku.tier == 'Premium' or sku.tier == 'Standard') | distinct id,compliant",
-            "guid": "e4b31c6a-2e3f-4df1-8e8b-9c3aa5a27820",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-hosting-plans",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "cf3fe65c-fec0-495a-8edc-9675200f2add",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-coexist-resource-manager",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Use Premium and Standard tiers for staging slots and automated backups. Align your backup retention period with disaster recovery needs.",
+            "text": "Use site-to-site VPN as failover of ExpressRoute, if only using a single ExpressRoute circuit.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Availability Zones provide physical isolation across datacenters in a region, reducing downtime during outages. Verify your region supports Availability Zones and use Premium V2/V3 tiers for zone-redundant deployments.",
-            "guid": "a7e2e6c2-491f-4fa4-a82b-521d0bc3b202",
-            "link": "https://learn.microsoft.com/azure/reliability/migrate-app-service",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,subnetName=tostring(subnets.name),routeTableId=tostring(subnets.properties.routeTable.id) | where subnetName == 'GatewaySubnet' | join kind=leftouter (Resources | where type == 'microsoft.network/routetables' | project routeTableName=name,routeTableId=id, disableBgpRoutePropagation=properties.disableBgpRoutePropagation) on routeTableId | project id,compliant = (disableBgpRoutePropagation == False or isnull(disableBgpRoutePropagation))",
+            "guid": "72105cc8-aaea-4ee1-8c7a-ad25977afcaf",
+            "link": "https://learn.microsoft.com/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings#gwsub",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "Leverage Availability Zones where regionally applicable (Premium V2/V3 tier required). Check region support for Availability Zones.",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Enable health checks to detect unhealthy instances in real-time and automatically replace them to maintain high availability and application reliability.",
-            "graph": "appserviceresources  | where type =~ 'microsoft.web/sites/config' | extend compliant = (properties.HealthCheckPath != '') | distinct id,compliant",
-            "guid": "1275e4a9-7b6a-43c3-a9cd-5ee18d8995ad",
-            "link": "https://learn.microsoft.com/azure/app-service/monitor-instances-health-check",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Implement health checks to monitor and detect issues with App Service instances. Health checks enable automatic instance replacement on failure.",
+            "text": "If you are using a route table in the GatewaySubnet, make sure that gateway routes are propagated.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Follow best practices for configuring backups and restores in Azure App Service and ASE to guarantee data availability and ensure recovery during disaster scenarios.",
-            "guid": "35a91c5d-4ad6-4d9b-8e0f-c47db9e6d1e7",
-            "link": "https://learn.microsoft.com/azure/app-service/manage-backup",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "d581a947-69a2-4783-942e-9df3664324c8",
+            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-high-availability-with-expressroute#active-active-connections",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "Refer to backup and restore best practices for Azure App Service and App Service Environments (ASE) to ensure data availability and recovery.",
+            "text": "If using ExpressRoute, your on-premises routing should be dynamic: in the event of a connection failure it should converge to the remaining connection of the circuit. Load should be shared across both connections ideally as active/active, although active/passive is supported too.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Ensure high availability by incorporating scaling, fault tolerance, monitoring, and zone redundancy into your App Service architecture. Leverage health checks and availability zones to maintain uptime.",
-            "guid": "e68cd0ec-afc6-4bd8-a27f-7860ad9a0db2",
-            "link": "https://learn.microsoft.com/azure/architecture/framework/services/compute/azure-app-service/reliability",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Implement Azure App Service reliability best practices, including auto-scaling, fault tolerance, health checks, and zone redundancy.",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b258f058-b9f6-46cd-b28d-990106f0c3f8",
+            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-high-availability-with-expressroute",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "Ensure the two physical links of your ExpressRoute circuit are connected to two distinct edge devices in your network.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Prepare for disaster recovery by implementing region failover strategies. Utilize active-active and active-passive configurations, automated failover, and Infrastructure as Code (IaC) for seamless failover during outages.",
-            "guid": "bd2a865c-0835-4418-bb58-4df91a5a9b3f",
-            "link": "https://learn.microsoft.com/azure/app-service/manage-disaster-recovery#recover-app-content-only",
-            "service": "App Services",
-            "severity": "Low",
-            "text": "Familiarize with App Service region failover, including active-active and active-passive configurations, automated failover, and IaC deployment.",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "fe2a1b53-6fbd-4c67-b58a-85d7c7a0afcb",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-bfd",
+            "service": "ExpressRoute",
+            "severity": "Medium",
+            "text": "Ensure Bidirectional Forwarding Detection (BFD) is enabled and configured on customer or provider edge routing devices.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Azure App Service offers built-in reliability features, including scaling, fault tolerance, and service-level agreements (SLAs). Leverage these features to maintain consistent performance during outages.",
-            "guid": "f3d2f1e4-e6d4-4b7a-a5a5-e2a9b2c6f293",
-            "link": "https://learn.microsoft.com/azure/reliability/reliability-app-service",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "669b215a-ce43-4371-8f6f-11047f6490f1",
+            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering",
+            "service": "ExpressRoute",
             "severity": "High",
-            "text": "Familiarize with reliability support in Azure App Service, including scaling options, SLAs, and automated recovery mechanisms.",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Enabling 'Always On' for Function Apps ensures that the app does not go idle, maintaining its availability and responsiveness at all times.",
-            "guid": "c7b5f3d1-0569-4fd2-9f32-c0b64e9c0c5e",
-            "link": "https://learn.microsoft.com/azure/azure-functions/dedicated-plan#always-on",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Ensure 'Always On' is enabled for Function Apps running on App Service plans to prevent idling and ensure continuous availability.",
+            "text": "Connect the ExpressRoute Gateway to two or more circuits from different peering locations for higher resiliency.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Health checks monitor the health of App Service instances, enabling automatic replacement of unhealthy instances to maintain high availability.",
-            "guid": "a3b4d5f6-758c-4f9d-9e1a-d7c6b7e8f9ab",
-            "link": "https://learn.microsoft.com/azure/app-service/monitor-instances-health-check",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "3f79ed00-203b-4c95-9efd-691505f5a1f9",
+            "link": "https://learn.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-setup-alerts-virtual-network-gateway-log",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Monitor App Service instances using Health checks to detect unhealthy instances and automatically replace them.",
-            "waf": "Reliability"
+            "text": "Configure diagnostic logs and alerts for ExpressRoute virtual network gateway.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "guid": "c7d3e5f9-a19c-4833-8ca6-1dcb0128e129",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/app/availability-overview",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5234c93f-b651-41dd-80c1-234177b91ced",
+            "link": "https://learn.microsoft.com/azure/expressroute/virtual-network-connectivity-guidance",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Monitor availability and responsiveness of web app or website using Application Insights availability tests, ensuring proactive detection of performance issues and downtime.",
-            "waf": "Reliability"
+            "text": "Do not use ExpressRoute circuits for VNet-to-VNet communication.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "guid": "b4e3f2d5-a5c6-4d7e-8b2f-c5d9e7a8f0ea",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/app/availability-standard-tests",
-            "service": "App Services",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "8ac6a9e0-1e6a-483d-b5de-32c199248160",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-about",
+            "service": "N/A",
             "severity": "Low",
-            "text": "Use Application Insights Standard test to monitor availability and responsiveness of web app or website",
-            "waf": "Reliability"
+            "text": "Do not send Azure traffic to hybrid locations for inspection.  Instead, follow the principle 'traffic in Azure stays in Azure' so that communication across resources in Azure occurs via the Microsoft backbone network.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Azure Key Vault ensures secrets are encrypted, securely stored, and accessed only by authorized applications. It supports audit logging, and secret versioning, and reduces the risk of accidental exposure of sensitive information.",
-            "guid": "834ac932-223e-4ce8-8b12-3071a5416415",
-            "link": "https://learn.microsoft.com/azure/app-service/app-service-key-vault-references",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "e6c4cfd3-e504-4547-a244-7ec66138a720",
+            "link": "https://learn.microsoft.com/azure/firewall/overview",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Use Azure Key Vault to store any secrets the application needs. Key Vault provides a secure, managed, and audited environment for storing secrets, and integrates seamlessly with App Service via App Service Key Vault References for enhanced security.",
+            "text": "Use Azure Firewall to govern Azure outbound traffic to the internet, non-HTTP/S inbound connections, and East/West traffic filtering (if the organization requires it).",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Managed Identity eliminates the need for hard-coded credentials by allowing App Service to authenticate to Azure Key Vault securely. This reduces the risk of credential exposure and simplifies secret management for enhanced security.",
-            "guid": "833ea3ad-2c2d-4e73-8165-c3acbef4abe1",
-            "link": "https://learn.microsoft.com/azure/app-service/app-service-key-vault-references",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Use Managed Identity to securely connect to Azure Key Vault for accessing secrets, through App Service Key Vault References.",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5a4b1511-e43a-458a-ac22-99c4d7b57d0c",
+            "link": "https://learn.microsoft.com/azure/firewall-manager/policy-overview",
+            "service": "Firewall",
+            "severity": "Medium",
+            "text": "Create a global Azure Firewall policy to govern security posture across the global network environment and assign it to all Azure Firewall instances. Allow for granular policies to meet requirements of specific regions by delegating incremental firewall policies to local security teams via Azure role-based access control.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Storing TLS certificates in Azure Key Vault enhances security by providing centralized, secure management and automated renewal of certificates. This reduces the risk of manual handling errors and certificate expiration.",
-            "guid": "f8d39fda-4776-4831-9c11-5775c2ea55b4",
-            "link": "https://learn.microsoft.com/azure/app-service/configure-ssl-certificate",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Use Azure Key Vault to securely store and manage TLS certificates for App Service.",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "655562f2-b3e4-4563-a4d8-739748b662d6",
+            "link": "https://learn.microsoft.com/azure/firewall-manager/deploy-trusted-security-partner",
+            "service": "Firewall",
+            "severity": "Low",
+            "text": "Configure supported partner SaaS security providers within Firewall Manager if the organization wants to use such solutions to help protect outbound connections.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "To minimize exposure and improve security, isolate systems processing sensitive data. Leverage separate App Service Plans or App Service Environments for isolation, and use different subscriptions or management groups to enforce stricter boundaries and governance.",
-            "guid": "6ad48408-ee72-4734-a475-ba18fdbf590c",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-hosting-plans",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Isolate systems that process sensitive information using separate App Service Plans, App Service Environments (ASE), and consider different subscriptions or management groups for enhanced security.",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.dnsSettings.enableProxy == true) | distinct id,compliant",
+            "guid": "14d99880-2f88-47e8-a134-62a7d85c94af",
+            "link": "https://learn.microsoft.com/azure/firewall/fqdn-filtering-network-rules",
+            "service": "Firewall",
+            "severity": "High",
+            "text": "Use application rules to filter outbound traffic on destination host name for supported protocols.  Use FQDN-based network rules and Azure Firewall with DNS proxy to filter egress traffic to the Internet over other protocols.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Local disks on App Service are not encrypted and sensitive data should not be stored on those.  (For example: D:\\\\Local and %TMP%).",
-            "guid": "e65de8e0-3f9b-4cbd-9682-66abca264f9a",
-            "link": "https://learn.microsoft.com/azure/app-service/operating-system-functionality#file-access",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Do not store sensitive data on local disk",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.sku.tier == 'Premium') | distinct id,compliant",
+            "guid": "c10d51ef-f999-455d-bba0-5c90ece07447",
+            "link": "https://learn.microsoft.com/azure/firewall/premium-features",
+            "service": "Firewall",
+            "severity": "High",
+            "text": "Use Azure Firewall Premium to enable additional security features.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-firewall/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Use Microsoft Entra ID or B2C for secure user authentication and Single Sign-On (SSO) across applications. Integrate using the built-in App Service Authentication/Authorization feature for streamlined security and compliance with modern authentication protocols like OpenID Connect.",
-            "guid": "919ca0b2-c121-459e-814b-933df574eccc",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-authentication-authorization",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Use Microsoft Entra ID or B2C for secure authentication and Single Sign-On (SSO).",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.threatIntelMode == 'Deny') | distinct id,compliant",
+            "guid": "e9c8f584-6d5e-473b-8dc5-acc9fbaab4e3",
+            "link": "https://learn.microsoft.com/azure/firewall/premium-features#idps-signature-rules",
+            "service": "Firewall",
+            "severity": "High",
+            "text": "Configure Azure Firewall Threat Intelligence mode to Alert and Deny for additional protection.",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Ensure all code deployments to App Service originate from a controlled, secured environment, such as a well-managed DevOps pipeline. This practice mitigates the risk of deploying unauthorized or malicious code by enforcing version control, code verification, and secure hosting.",
-            "guid": "3f9bcbd4-6826-46ab-aa26-4f9a19aed9c5",
-            "link": "https://learn.microsoft.com/azure/app-service/deploy-best-practices",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.intrusionDetection.mode == 'Deny') | project id, compliant",
+            "guid": "b9d0dff5-bdd4-4cd8-88ed-5811610b2b2c",
+            "link": "https://learn.microsoft.com/azure/firewall/premium-features#idps",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Deploy code to App Service from a trusted and secure environment.",
+            "text": "Configure Azure Firewall IDPS mode to Deny for additional protection.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-firewall/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Disable basic authentication for FTP/FTPS and WebDeploy/SCM to enhance security by enforcing Microsoft Entra ID secured endpoints for deployment. This ensures that only authenticated users using Microsoft Entra ID credentials can access deployment services, including the SCM site.",
-            "guid": "5d04c2c3-919c-4a0b-8c12-159e114b933d",
-            "link": "https://learn.microsoft.com/azure/app-service/deploy-configure-credentials#disable-basic-authentication",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,subnets=properties.subnets | mv-expand subnets | project id,name,subnetId=tostring(subnets.id), subnetName=tostring(subnets.name),subnetRT=subnets.properties.routeTable.id | where not (subnetName in ('GatewaySubnet', 'AzureFirewallSubnet', 'RouteServerSubnet', 'AzureBastionSubnet')) | extend hasRT = isnotnull(subnetRT) | distinct id, hasRT, subnetId | join kind=fullouter (resources | where type == 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | extend isVWAN=(tolower(split(properties_virtualNetworkPeerings.name, '_')[0]) == 'remotevnettohubpeering') | mv-expand properties.subnets | project id, isVWAN, name, subnetId=tostring(properties_subnets.id), subnetName=tostring(properties_subnets.name) | summarize PeeredToVWAN=max(isVWAN) by id, subnetId | project id, subnetId, isVWANpeer = (PeeredToVWAN == true)) on subnetId | project id=iff(isnotempty(id), id, id1), subnetId=iff(isnotempty(subnetId), subnetId, subnetId1), hasRT, isVWANpeer | extend compliant = (hasRT==true or isVWANpeer==true) | distinct id, subnetId, compliant",
+            "guid": "a3784907-9836-4271-aafc-93535f8ec08b",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-networks-udr-overview",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Disable basic authentication for FTP/FTPS and WebDeploy/SCM.",
+            "text": "For subnets in VNets not connected to Virtual WAN, attach a route table so that Internet traffic is redirected to Azure Firewall or a Network Virtual Appliance.",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Wherever possible, use Managed Identity to securely connect to Microsoft Entra ID-secured resources without storing credentials. If this is not feasible, store secrets in Azure Key Vault and access them using Managed Identity to maintain security and reduce the risk of credential exposure.",
-            "guid": "f574eccc-d9bd-43ba-bcda-3b54eb2eb03d",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-managed-identity?tabs=portal%2Chttp",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "715d833d-4708-4527-90ac-1b142c7045ba",
+            "link": "https://learn.microsoft.com/azure/firewall/firewall-structured-logs",
+            "service": "Firewall",
+            "severity": "Medium",
+            "text": "Add diagnostic settings to save logs, using the Resource Specific destination table, for all Azure Firewall deployments.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "e960fc6b-4ab2-4db6-9609-3745135f9ffa",
+            "link": "https://learn.microsoft.com/azure/firewall-manager/migrate-to-policy",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Use Managed Identity to connect to Microsoft Entra ID secured resources.",
-            "waf": "Security"
+            "text": "Migrate from Azure Firewall Classic rules (if exist) to Firewall Policy.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "When using images stored in Azure Container Registry, pull these images using a Managed Identity to avoid storing credentials. This ensures secure access to container images and reduces the risk of credential exposure.",
-            "guid": "d9a25827-18d2-4ddb-8072-5769ee6691a4",
-            "link": "https://learn.microsoft.com/azure/app-service/configure-custom-container#use-managed-identity-to-pull-image-from-azure-container-registry",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'AzureFirewallSubnet' | extend compliant = (subnetPrefixLength == 26) | distinct id, compliant",
+            "guid": "22d6419e-b627-4d95-9e7d-019fa759387f",
+            "link": "https://learn.microsoft.com/azure/firewall/firewall-faq#why-does-azure-firewall-need-a--26-subnet-size",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Pull container images from Azure Container Registry using a Managed Identity.",
+            "text": "Use a /26 prefix for your Azure Firewall subnets.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-firewall/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Configure diagnostic settings to send telemetry and security logs (including HTTP, platform, and audit logs) to Log Analytics. Centralized logging enhances monitoring, threat detection, and compliance reporting.",
-            "guid": "47768314-c115-4775-a2ea-55b46ad48408",
-            "link": "https://learn.microsoft.com/azure/app-service/troubleshoot-diagnostic-logs",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "828cec2e-af6c-40c2-8fa2-1b681ee63eb7",
+            "link": "https://learn.microsoft.com/azure/firewall-manager/rule-hierarchy",
+            "service": "Firewall",
             "severity": "Medium",
-            "text": "Send App Service runtime and security logs to Log Analytics for centralized monitoring and alerting.",
-            "waf": "Security"
+            "text": "Arrange rules within the firewall policy into Rule Collection Groups and Rule Collections and based on their frequency of use.",
+            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-firewall-manager/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Set up a diagnostic setting to send the activity log to Log Analytics as the central destination for logging and monitoring. This allows you to monitor control plane activity on the App Service resource itself.",
-            "guid": "ee72734b-475b-4a18-bdbf-590ce65de8e0",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/essentials/activity-log",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "0da83bb1-2f39-49af-b5c9-835fc455e3d1",
+            "link": "https://learn.microsoft.com/azure/firewall/ip-groups",
+            "service": "Firewall",
             "severity": "Medium",
-            "text": "Send App Service activity logs to Log Analytics",
-            "waf": "Security"
+            "text": "Use IP Groups or IP prefixes to reduce number of IP table rules.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Use regional VNet integration, Network Security Groups (NSGs), and User-Defined Routes (UDRs) to control outbound network access. Route traffic through a Network Virtual Appliance (NVA), such as Azure Firewall, and monitor firewall logs to ensure traffic is properly controlled and secure.",
-            "guid": "c12159e1-14b9-433d-b574-ecccd9bd3baf",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-vnet-integration",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "c44c6f0e-1642-4a61-a17b-0922f835c93a",
+            "link": "https://learn.microsoft.com/azure/firewall/tutorial-firewall-dnat",
+            "service": "Firewall",
             "severity": "Medium",
-            "text": "Control outbound network access for App Service using VNet integration, NSGs, UDRs, and firewalls.",
-            "waf": "Security"
+            "text": "Do not use wildcards as a source IP for DNATS, such as * or any, you should specify source IPs for incoming DNATs.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-to-azure-virtual-networks/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Provide a stable outbound IP by using VNet integration with a NAT Gateway or Network Virtual Appliance (NVA) like Azure Firewall. This enables the receiving party to allow-list based on IP, if necessary. For communications with Azure services, use mechanisms like Service Endpoints or private endpoints to avoid relying on static IPs, ensuring secure and efficient connectivity.",
-            "guid": "cda3b54e-b2eb-403d-b9a2-582718d2ddb1",
-            "link": "https://learn.microsoft.com/azure/app-service/networking/nat-gateway-integration",
-            "service": "App Services",
-            "severity": "Low",
-            "text": "Ensure a stable IP for outbound communications by using VNet NAT Gateway or Azure Firewall.",
-            "waf": "Security"
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "7371dc21-251a-47a3-af14-6e01b9da4757",
+            "link": "https://learn.microsoft.com/azure/firewall/integrate-with-nat-gateway",
+            "service": "Firewall",
+            "severity": "Medium",
+            "text": "Prevent SNAT Port exhaustion by monitoring SNAT port usage, evaluating NAT Gateway settings, and ensuring seamless failover. If the port count approaches the limit, it’s a sign that SNAT exhaustion might be imminent.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-to-azure-virtual-networks/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Control inbound network access by configuring App Service Access Restrictions, Service Endpoints, or Private Endpoints. Ensure appropriate restrictions are set for both the web app and the SCM (deployment) site to limit unauthorized access and enhance security.",
-            "guid": "0725769e-e669-41a4-a34a-c932223ece80",
-            "link": "https://learn.microsoft.com/azure/app-service/networking-features#access-restrictions",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "346840b8-1064-496e-8396-4b1340172d52",
+            "link": "https://learn.microsoft.com/azure/firewall/premium-features#tls-inspection",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Control inbound network access using Access Restrictions, Service Endpoints, or Private Endpoints.",
-            "waf": "Security"
+            "text": "If you are using Azure Firewall Premium, enable TLS Inspection.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Protect App Service from malicious inbound traffic by deploying a Web Application Firewall (WAF) using Azure Application Gateway or Azure Front Door. Ensure WAF logs are monitored regularly to detect and respond to security threats.",
-            "guid": "b123071a-5416-4415-a33e-a3ad2c2de732",
-            "link": "https://learn.microsoft.com/azure/app-service/networking/app-gateway-with-service-endpoints",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Use a Web Application Firewall (WAF) in front of App Service.",
-            "waf": "Security"
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "39990a13-915c-45f9-a2d3-562d7d6c4b7c",
+            "link": "https://learn.microsoft.com/azure/firewall/premium-features#web-categories",
+            "service": "Firewall",
+            "severity": "Low",
+            "text": "Use web categories to allow or deny outbound access to specific topics.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "To prevent the Web Application Firewall (WAF) from being bypassed, lock down access to App Service by using Access Restrictions, Service Endpoints, and Private Endpoints. This ensures that all traffic is routed through the WAF, providing a secure front layer of protection.",
-            "guid": "165c3acb-ef4a-4be1-b8d3-9fda47768314",
-            "link": "https://learn.microsoft.com/azure/app-service/networking-features#access-restrictions",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Ensure the WAF cannot be bypassed by securing access to App Service.",
-            "waf": "Security"
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "6eff7e6c-6c4a-43d7-be3f-6641c2cb3d4a",
+            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/gateway/application-gateway-before-azure-firewall",
+            "service": "Firewall",
+            "severity": "Medium",
+            "text": "As part of your TLS inspection, plan for receiving traffic from Azure App Gateways for inspection.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-application-gateway/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Ensure that the minimum TLS policy is set to 1.2 or higher, with a preference for TLS 1.3, to enhance security through stronger encryption protocols. TLS 1.3 provides additional security improvements and faster handshake times, reducing vulnerabilities associated with older versions.",
-            "graph": "appserviceresources | where type =~ 'microsoft.web/sites/config' | extend compliant = (properties.MinTlsVersion>=1.2) | distinct id,compliant",
-            "guid": "c115775c-2ea5-45b4-9ad4-8408ee72734b",
-            "link": "https://learn.microsoft.com/azure/app-service/configure-ssl-bindings#enforce-tls-versions",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'Microsoft.Network/firewallPolicies' | where array_length(properties.firewalls) > 0 | extend compliant = (properties.dnsSettings.enableProxy =~ 'true') | distinct id, compliant",
+            "guid": "94f3eede-9aa3-4088-92a3-bb9a56509fad",
+            "link": "https://learn.microsoft.com/azure/firewall/dns-details",
+            "service": "Firewall",
             "severity": "Medium",
-            "text": "Set minimum TLS policy to 1.2 or higher, preferably 1.3, in App Service configuration.",
+            "text": "Enable Azure Firewall DNS proxy configuration.",
+            "training": "https://learn.microsoft.com/training/courses/az-700t00/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Configure App Service to enforce HTTPS-only, automatically redirecting all HTTP traffic to HTTPS. Additionally, implement HTTP Strict Transport Security (HSTS) in your code or via a Web Application Firewall (WAF) to ensure browsers only access the site over HTTPS, enhancing security by preventing downgrade attacks.",
-            "graph": "where (type=='microsoft.web/sites' and (kind == 'app' or kind == 'app,linux' )) | extend compliant = (properties.httpsOnly==true) | distinct id,compliant",
-            "guid": "475ba18f-dbf5-490c-b65d-e8e03f9bcbd4",
-            "link": "https://learn.microsoft.com/azure/app-service/configure-ssl-bindings#enforce-https",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "1dc04554-dece-4ffb-a49e-5c683e09f8da",
+            "link": "https://learn.microsoft.com/azure/firewall/firewall-diagnostics",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Use HTTPS only and consider enabling HTTP Strict Transport Security (HSTS).",
-            "waf": "Security"
+            "text": "Integrate Azure Firewall with Azure Monitor and enable diagnostic logging to store and analyze firewall logs and metrics.",
+            "training": "https://learn.microsoft.com/training/courses/az-700t00/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Do not use wildcards (*) in your CORS configuration, as this permits unrestricted access from any origin, compromising security. Instead, explicitly specify trusted origins that are allowed to access the service, ensuring controlled access.",
-            "guid": "68266abc-a264-4f9a-89ae-d9c55d04c2c3",
-            "link": "https://learn.microsoft.com/azure/app-service/app-service-web-tutorial-rest-api",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "64e7000e-3c06-485e-b455-ced7f454cba3",
+            "link": "https://learn.microsoft.com/azure/well-architected/service-guides/azure-firewall",
+            "service": "Firewall",
+            "severity": "Low",
+            "text": "Implement backups for your firewall rules",
+            "training": "https://learn.microsoft.com/training/courses/az-104t00/",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/azurefirewalls' | where array_length(zones) <= 1 or isnull(zones) | where isempty(properties.virtualHub.id) or isnull(properties.virtualHub.id) | project name, id, tags, param1='multipleZones:false'",
+            "guid": "d38ad60c-bc9e-4d49-b699-97e5d4dcf707",
+            "link": "https://learn.microsoft.com/azure/firewall/deploy-availability-zone-powershell",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Avoid using wildcards for CORS; specify allowed origins explicitly.",
-            "waf": "Security"
+            "text": "Deploy Azure Firewall across multiple availability zones. Azure Firewall offers different SLAs depending on its deployment; in a single availability zone or across multiple, potentially improving reliability and performance.",
+            "training": "https://learn.microsoft.com/training/courses/az-104t00/",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Remote debugging should not be enabled in production as it opens additional ports, increasing the attack surface. Although App Service automatically turns off remote debugging after 48 hours, it is recommended to disable it manually in production to maintain a secure environment.",
-            "graph": "appserviceresources | where type =~ 'microsoft.web/sites/config' | extend compliant = (properties.RemoteDebuggingEnabled == false) | distinct id,compliant",
-            "guid": "d9bd3baf-cda3-4b54-bb2e-b03dd9a25827",
-            "link": "https://learn.microsoft.com/azure/app-service/configure-common#configure-general-settings",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'Microsoft.Network/azureFirewalls' | where isempty(properties.virtualHub.id) or isnull(properties.virtualHub.id) | mv-expand ipConfig = properties.ipConfigurations | project name, firewallId = id, tags, vNetName = split(ipConfig.properties.subnet.id, '/', 8)[0], vNetId = tolower(substring(ipConfig.properties.subnet.id, 0, indexof(ipConfig.properties.subnet.id, '/subnet'))) | join kind=fullouter ( resources | where type =~ 'Microsoft.Network/ddosProtectionPlans' | mv-expand vNet = properties.virtualNetworks | project ddosProtectionPlanId = id, vNetId = tolower(vNet.id) ) on vNetId | extend compliant = iif(isempty(ddosProtectionPlanId), false, true) | project name, compliant, id = firewallId, tags, network = strcat('vNet: ', vNetName)",
+            "guid": "e8143efa-0301-4d62-be54-ca7b5ce566dc",
+            "link": "https://learn.microsoft.com/en-gb/azure/ddos-protection/ddos-protection-overview",
+            "service": "Firewall",
             "severity": "High",
-            "text": "Turn off remote debugging in production environments.",
+            "text": "Configure DDoS Protection on the Azure Firewall VNet, Associate a DDoS protection plan with the virtual network hosting Azure Firewall to provide enhanced mitigation against DDoS attacks. Azure Firewall Manager integrates the creation of firewall infrastructure and DDoS protection plans. ",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "d301d6e8-72e5-42e3-911c-c58b5a4b1511",
+            "link": "https://learn.microsoft.com/azure/virtual-network/vnet-integration-for-azure-services",
+            "service": "App Gateway",
+            "severity": "High",
+            "text": "Do not disrupt control-plane communication for Azure PaaS services injected into a virtual networks, such as with a 0.0.0.0/0 route or an NSG rule that blocks control plane traffic.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/?source=learn",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Enable Defender for App Service.  This (amongst other threats) detects communications to known malicious IP addresses.  Review the recommendations from Defender for App Service as part of your operations.",
-            "guid": "18d2ddb1-0725-4769-be66-91a4834ac932",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/defender-for-app-service-introduction",
-            "service": "App Services",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b3e4563a-4d87-4397-98b6-62d6d15f512a",
+            "link": "https://learn.microsoft.com/azure/private-link/private-endpoint-overview",
+            "service": "ExpressRoute",
             "severity": "Medium",
-            "text": "Enable Defender for Cloud - Defender for App Service",
+            "text": "Access Azure PaaS services from on-premises via private endpoints and ExpressRoute private peering. This method avoids transiting over the public internet.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Azure provides DDoS Basic protection on its network, which can be improved with intelligent DDoS Standard capabilities which learns about normal traffic patterns and can detect unusual behavior. DDoS Standard applies to a Virtual Network so it must be configured for the network resource in front of the app, such as Application Gateway or an NVA.",
-            "guid": "223ece80-b123-4071-a541-6415833ea3ad",
-            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-overview",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Enable DDOS Protection Standard on the WAF VNet",
+            "arm-service": "Microsoft.Network/virtualNetworks",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'microsoft.network/virtualnetworks' | project id,resourceGroup,name,subnets = properties.subnets | mv-expand subnets | project id = subnets.id, resourceGroup, VNet = name, serviceEndpoints = subnets.properties.serviceEndpoints, compliant = (isnull(subnets.properties.serviceEndpoints) or array_length(subnets.properties.serviceEndpoints) == 0) | order by compliant asc",
+            "guid": "4704489a-8042-4d88-b79d-17b73b22a5a6",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-overview",
+            "service": "VNet",
+            "severity": "High",
+            "text": "Don't enable virtual network service endpoints by default on all subnets.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/?source=learn",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "When using images stored in Azure Container Registry, ensure they are pulled over a virtual network by using a private endpoint and configuring the app setting 'WEBSITE_PULL_IMAGE_OVER_VNET'. This ensures secure communication between App Service and the registry, preventing exposure to the public internet.",
-            "guid": "2c2de732-165c-43ac-aef4-abe1f8d39fda",
-            "link": "https://learn.microsoft.com/azure/app-service/configure-custom-container#use-an-image-from-a-network-protected-registry",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/azureFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "7e7a8ed4-b30e-438c-9f29-812b2363cefe",
+            "link": "azure/private-link/inspect-traffic-with-azure-firewall",
+            "service": "Firewall",
             "severity": "Medium",
-            "text": "Pull container images over a Virtual Network from Azure Container Registry.",
+            "text": "Filter egress traffic to Azure PaaS services using FQDNs instead of IP addresses in Azure Firewall or an NVA to prevent data exfiltration. If using Private Link you can block all FQDNs, otherwise allow only the required PaaS services.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/?source=learn",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Perform a penetration test on the web application in accordance with Azure's penetration testing rules of engagement. This helps identify vulnerabilities and security weaknesses that can be addressed before they are exploited.",
-            "guid": "eb2eb03d-d9a2-4582-918d-2ddb10725769",
-            "link": "https://learn.microsoft.com/azure/security/fundamentals/pen-testing",
-            "service": "App Services",
-            "severity": "Medium",
-            "text": "Conduct a penetration test on the web application.",
+            "arm-service": "microsoft.network/expressRouteCircuits",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'GatewaySubnet' | extend compliant = (subnetPrefixLength <= 27) | distinct id, compliant",
+            "guid": "f2aad7e3-bb03-4adc-8606-4123d342a917",
+            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-add-gateway-resource-manager#add-a-gateway",
+            "service": "ExpressRoute",
+            "severity": "High",
+            "text": "Use at least a /27 prefix for your Gateway subnets.",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Ensure that only trusted code, which has been validated and scanned for vulnerabilities, is deployed to production following DevSecOps practices. This minimizes the risk of introducing security vulnerabilities into the application environment.",
-            "guid": "19aed9c5-5d04-4c2c-9919-ca0b2c12159e",
-            "link": "https://learn.microsoft.com/azure/architecture/solution-ideas/articles/devsecops-in-azure",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/networkSecurityGroups",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/networksecuritygroups' | mvexpand properties.securityRules | project id,name,ruleAction=properties_securityRules.properties.access,rulePriority=properties_securityRules.properties.priority,ruleDst=properties_securityRules.properties.destinationAddressPrefix,ruleSrc=properties_securityRules.properties.sourceAddressPrefix,ruleProt=properties_securityRules.properties.protocol,ruleDirection=properties_securityRules.properties.direction,rulePort=properties_securityRules.properties.destinationPortRange | summarize StarDenies=countif(ruleAction=='Deny' and ruleDst=='*' and ruleSrc=='*' and ruleProt=='*' and rulePort=='*') by id,tostring(ruleDirection) | where ruleDirection == 'Inbound' | project id,compliant=(StarDenies>0) | union (resources | where type=='microsoft.network/networksecuritygroups' | where array_length(properties.securityRules)==0 | extend compliant=false | project id,compliant)",
+            "guid": "11deb39d-8299-4e47-bbe0-0fb5a36318a8",
+            "link": "https://learn.microsoft.com/azure/virtual-network/service-tags-overview#available-service-tags",
+            "service": "NSG",
+            "severity": "High",
+            "text": "Don't rely on the NSG inbound default rules using the VirtualNetwork service tag to limit connectivity.",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.Network/networkSecurityGroups",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | mv-expand subnet = properties.subnets | where subnet.name !in~ ('GatewaySubnet', 'AzureFirewallSubnet', 'AzureFirewallManagementSubnet', 'RouteServerSubnet') | extend compliant = iff(isnotnull(subnet.properties.networkSecurityGroup.id), true, false) | project id, subnetName = subnet.name, vnetName = name, NSG = subnet.properties.networkSecurityGroup.id, compliant",
+            "guid": "872e52e3-611c-4c58-a5a4-b1511e43a58a",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-landing-zone-network-segmentation",
+            "service": "NSG",
             "severity": "Medium",
-            "text": "Deploy validated and vulnerability-scanned code.",
+            "text": "Use NSGs to help protect traffic across subnets, as well as east/west traffic across the platform (traffic between landing zones).",
+            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Ensure that the latest versions of supported platforms, programming languages, protocols, and frameworks are used. Regular updates mitigate the risk of security vulnerabilities and ensure compatibility with security patches.",
-            "guid": "114b933d-f574-4ecc-ad9b-d3bafcda3b54",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-patch-os-runtime",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Use up-to-date platforms, languages, protocols and frameworks",
+            "arm-service": "Microsoft.Network/networkSecurityGroups",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "a4d87397-48b6-462d-9d15-f512a65498f6",
+            "link": "https://learn.microsoft.com/azure/virtual-network/network-security-group-how-it-works",
+            "service": "NSG",
+            "severity": "Medium",
+            "text": "Use NSGs and application security groups to micro-segment traffic within the landing zone and avoid using a central NVA to filter traffic flows.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Leverage Auto-Healing in Azure App Service to automatically restart instances or trigger custom actions based on pre-defined failure conditions like memory thresholds, HTTP errors, or specific event logs.",
-            "guid": "60b3a935-33e5-45c9-87c7-53882e395b46",
-            "link": "https://learn.microsoft.com/azure/app-service/overview-diagnostics",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/networkSecurityGroups",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'Microsoft.Network/virtualnetworks' | project subscriptionId, lowerCaseVNetId = tolower(id) | join kind = leftouter (    resources    | where type =~ 'microsoft.network/networkwatchers/flowlogs' and properties.enabled == true and properties.provisioningState =~ 'succeeded'    | where properties.targetResourceId contains '/Microsoft.Network/virtualNetworks/'    | project flowlogId = id, trafficAnalyticsEnabled = properties.flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration.enabled, lowerCaseTargetVNetId = tolower(properties.targetResourceId)    )    on $left.lowerCaseVNetId == $right.lowerCaseTargetVNetId | extend compliant = iff(isnotempty(lowerCaseTargetVNetId), true, false) | project id = lowerCaseVNetId, flowlogId, trafficAnalyticsEnabled, compliant",
+            "guid": "dfe237de-143b-416c-91d7-aa9b64704489",
+            "link": "https://learn.microsoft.com/azure/network-watcher/vnet-flow-logs-overview",
+            "service": "NSG",
             "severity": "Medium",
-            "text": "Use Auto-Healing with custom rules to restart App Service instances automatically when failures occur.",
-            "waf": "Reliability"
+            "text": "Enable VNet Flow Logs and feed them into Traffic Analytics to gain insights into internal and external traffic flows.",
+            "training": "https://learn.microsoft.com/learn/modules/design-implement-network-monitoring/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Configure Azure Monitor alerts based on Application Insights metrics for response times, failure rates, and overall availability. Alerts help detect issues proactively and reduce mean-time-to-recovery (MTTR).",
-            "guid": "e52e4514-02a7-4e81-a98e-88ce1b18e557",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/app/alerts",
-            "service": "App Services",
+            "arm-service": "Microsoft.Network/networkSecurityGroups",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type == 'microsoft.network/networksecuritygroups' | project id, rules = array_length(properties.securityRules) | project id, compliant = (rules < 900)",
+            "guid": "0390417d-53dc-44d9-b3f4-c8832f359b41",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits",
+            "service": "NSG",
             "severity": "Medium",
-            "text": "Set up alerts for critical Application Insights metrics, such as response time and failure rates.",
+            "text": "Do not implement more than 900 NSG rules per NSG, due to the limit of 1000 rules.",
+            "training": "https://learn.microsoft.com/azure/virtual-network/network-security-group-how-it-works",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Use Azure Policy to enforce security, compliance, and governance configurations for App Service. Policies can ensure that critical settings such as TLS versions, backup configurations, and network restrictions are enforced across all App Service instances.",
-            "guid": "361e886f-ca40-4ead-a8e9-1379c642ae9c",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "App Services",
-            "severity": "High",
-            "text": "Apply Azure Policy to enforce compliance across App Service configurations.",
-            "waf": "Governance"
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "412e7f98-3f63-4047-82dd-69c5b5c2622f",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/scenario-any-to-any",
+            "service": "VWAN",
+            "severity": "Medium",
+            "text": "Use Virtual WAN if your scenario is explicitly described in the list of Virtual WAN routing designs.",
+            "training": "https://learn.microsoft.com/learn/modules/introduction-azure-virtual-wan/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "Leverage Azure Cost Management to track and forecast App Service expenses. Set up alerts for budget thresholds to avoid overspending, and optimize costs based on resource utilization trends.",
-            "guid": "42eb48f0-28ff-497c-b2c0-a8fa1f989832",
-            "link": "https://learn.microsoft.com/azure/cost-management-billing/",
-            "service": "App Services",
-            "severity": "Low",
-            "text": "Monitor App Service costs using Azure Cost Management and create cost alerts.",
-            "waf": "Cost"
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "54b69bad-33aa-4d5e-ac68-e1d76667313b",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/virtual-wan-network-topology#virtual-wan-network-design-recommendationst",
+            "service": "VWAN",
+            "severity": "Medium",
+            "text": "Use a Virtual WAN hub per Azure region to connect multiple landing zones together across Azure regions via a common global Azure Virtual WAN.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.web/sites",
-            "checklist": "Azure App Service Review",
-            "description": "If you have predictable and steady usage of App Service, purchasing Reserved Instances can significantly reduce long-term costs. Commit to one or three years for lower pricing compared to pay-as-you-go.",
-            "guid": "e489221b-487e-48a3-aaab-48e3d205ca12",
-            "link": "https://learn.microsoft.com/azure/cost-management-billing/reservations/",
-            "service": "App Services",
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type=='microsoft.network/virtualhubs' | extend compliant = isnotnull(properties.azureFirewall.id) | project id, compliant",
+            "guid": "7d5d1e4e-6146-458d-9558-fd77249b8211",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/howto-firewall",
+            "service": "VWAN",
             "severity": "Medium",
-            "text": "Purchase reserved instances for App Service plans to optimize long-term costs.",
-            "waf": "Cost"
+            "text": "For outbound Internet traffic protection and filtering, deploy Azure Firewall in secured hubs.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Logic Apps checklist",
-            "guid": "3b7a56de-5020-4642-b3cb-c976e80b6d6d",
-            "link": "https://learn.microsoft.com/azure/logic-apps/single-tenant-overview-compare",
-            "service": "Logic Apps",
-            "severity": "High",
-            "text": "Select the right Logic App hosting plan based on your business & SLO requirements",
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "6667313b-4f56-464b-9e98-4a859c773e7d",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/migrate-from-hub-spoke-topology",
+            "service": "VWAN",
+            "severity": "Medium",
+            "text": "Ensure that your virtual WAN network architecture aligns to an identified architecture scenario.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Logic Apps checklist",
-            "guid": "3d7008bd-6bc1-4b03-8aa8-ec2a3b55786a",
-            "link": "https://learn.microsoft.com/azure/logic-apps/set-up-zone-redundancy-availability-zones?tabs=standard#next-steps",
-            "service": "Logic Apps",
-            "severity": "High",
-            "text": "Protect logic apps from region failures with zone redundancy and availability zones",
-            "waf": "Reliability"
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "261623a7-65a9-417e-8f34-8ef254c27d42",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/azure-monitor-insights",
+            "service": "VWAN",
+            "severity": "Medium",
+            "text": "Use Azure Monitor Insights for Virtual WAN to monitor the end-to-end topology of the Virtual WAN, status, and key metrics.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Logic Apps checklist",
-            "guid": "1cda768f-a206-445d-8234-56f6a6e7286e",
-            "link": "https://learn.microsoft.com/azure/logic-apps/business-continuity-disaster-recovery-guidance?toc=%2Fazure%2Freliability%2Ftoc.json&bc=%2Fazure%2Freliability%2Fbreadcrumb%2Ftoc.json",
-            "service": "Logic Apps",
-            "severity": "High",
-            "text": "Consider a Cross-Region DR strategy for critical workloads",
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources| where type =~ 'microsoft.network/virtualwans' | extend compliant= (properties.allowBranchToBranchTraffic == 'true') | distinct id,compliant",
+            "guid": "727c77e1-b9aa-4a37-a024-129d042422c1",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-faq#is-branch-to-branch-connectivity-allowed-in-virtual-wan",
+            "service": "VWAN",
+            "severity": "Medium",
+            "text": "Do not disable branch-to-branch traffic in Virtual WAN, unless these flows should be explicitly blocked.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Logic Apps checklist",
-            "guid": "82118ec5-ed6f-4c68-9471-eb0da98a1b34",
-            "link": "https://learn.microsoft.com/azure/app-service/environment/intro",
-            "service": "Logic Apps",
-            "severity": "High",
-            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'microsoft.network/virtualhubs'| extend compliant= (properties.hubRoutingPreference =~ 'ASPath') | distinct id,compliant",
+            "guid": "d49ac006-6670-4bc9-9948-d3e0a3a94f4d",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/about-virtual-hub-routing-preference",
+            "service": "VWAN",
+            "severity": "Medium",
+            "text": "Use AS-Path as hub routing preference, since it is more flexible than ExpressRoute or VPN.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Logic Apps checklist",
-            "guid": "74275fa5-9e08-4c7e-b096-13b538fe1501",
-            "link": "https://learn.microsoft.com/training/modules/deploy-azure-functions/",
-            "service": "Logic Apps",
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "2586b854-237e-47f1-84a1-d45d4cd2310d",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/about-virtual-hub-routing#labels",
+            "service": "VWAN",
             "severity": "Medium",
-            "text": "Leverage Azure DevOps or GitHub to streamline CI/CD and safeguard your Logic App code",
-            "waf": "Operations"
+            "text": "Configure label-based propagation in Virtual WAN, otherwise connectivity between virtual hubs will be impaired.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Devices/IotHubs",
-            "checklist": "IoT Hub Review",
-            "guid": "ac1d6380-f866-4bbd-a9b4-b1ee5d7908b8",
-            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#availability-zones",
-            "service": "IoT",
+            "arm-service": "microsoft.network/virtualWans",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources | where type =~ 'microsoft.network/virtualhubs' | extend addressSpace = properties.addressPrefix | extend compliant= (toint(substring(addressSpace, indexof(addressSpace, '/') + 1)) < 23) | distinct name, id, compliant",
+            "guid": "9c75dfef-573c-461c-a698-68598595581a",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-faq#what-is-the-recommended-hub-address-space-during-hub-creation",
+            "service": "VWAN",
             "severity": "High",
-            "text": "Leverage  Availability Zones if regionally applicable (this is automatically enabled)",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Devices/IotHubs",
-            "checklist": "IoT Hub Review",
-            "guid": "35f651e8-0124-4ef7-8c57-658e38609e6e",
-            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#microsoft-initiated-failover",
-            "service": "IoT",
-            "severity": "Medium",
-            "text": "Be aware of Microsoft-initiated failovers. These are exercised by Microsoft in rare situations to fail over all the IoT hubs from an affected region to the corresponding geo-paired region.",
+            "text": "Assign at least a /23 prefix to virtual hubs to ensure enough IP space is available.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Devices/IotHubs",
-            "checklist": "IoT Hub Review",
-            "guid": "4ed3e490-dc06-4a1e-b467-5d0239d85540",
-            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#cross-region-dr",
-            "service": "IoT",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5c986cb2-9131-456a-8247-6e49f541acdc",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Policy",
             "severity": "High",
-            "text": "Consider a Cross-Region DR strategy for critical workloads",
-            "waf": "Reliability"
+            "text": "Leverage Azure Policy strategically, define controls for your environment, using Policy Initiatives to group related policies.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Devices/IotHubs",
-            "checklist": "IoT Hub Review",
-            "guid": "a11ecab0-db47-46f7-9aa7-17764e7e45a1",
-            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#microsoft-initiated-failover",
-            "service": "IoT",
-            "severity": "High",
-            "text": "Learn how to trigger a manual failover.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "d8a2adb1-17d6-4326-af62-5ca44e5695f2",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Policy",
+            "severity": "Medium",
+            "text": "Map regulatory and compliance requirements to Azure Policy definitions and Azure role assignments.",
+            "training": "https://learn.microsoft.com/training/modules/governance-security/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Devices/IotHubs",
-            "checklist": "IoT Hub Review",
-            "guid": "f9db8dfb-1194-460b-aedd-34dd6a69db22",
-            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#failback",
-            "service": "IoT",
-            "severity": "High",
-            "text": "Learn how to fail back after a failover.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "223ace8c-b123-408c-a501-7f154e3ab369",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Policy",
+            "severity": "Medium",
+            "text": "Establish Azure Policy definitions at the intermediate root management group so that they can be assigned at inherited scopes.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "41faa1ed-b7f0-447d-8cba-4a4905e5bb83",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#high-availability",
-            "service": "Cognitive Search",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "3829e7e3-1618-4368-9a04-77a209945bda",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Policy",
             "severity": "High",
-            "text": "Enable 2 replicas to have 99.9% availability for read operations",
-            "waf": "Reliability"
+            "text": "Manage policy assignments at the highest appropriate level with exclusions at bottom levels, if required.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "7d956fd9-788a-4845-9b9f-c0340972d810",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#high-availability",
-            "service": "Cognitive Search",
-            "severity": "Medium",
-            "text": "Enable 3 replicas to have 99.9% availability for read/write operations",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "43334f24-9116-4341-a2ba-527526944008",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/mcsb-asset-management#am-2-use-only-approved-services",
+            "service": "Policy",
+            "severity": "Low",
+            "text": "Use Azure Policy to control which services users can provision at the subscription/management group level.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "44dc5f2b-a032-4d03-aae8-90c3f2c0a4c3",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#availability-zone-support",
-            "service": "Cognitive Search",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "be7d7e48-4327-46d8-adc0-55bcf619e8a1",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Policy",
             "severity": "High",
-            "text": "Leverage Availability Zones by enabling read and/or write replicas",
-            "waf": "Reliability"
+            "text": "Use built-in policies where possible to minimize operational overhead.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "cd0730f0-0ff1-4b77-9a2b-2a1f7dd5e291",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#multiple-services-in-separate-geographic-regions",
-            "service": "Cognitive Search",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "description": "Assigning the Resource Policy Contributor role to specific scopes allows you to delegate policy management to relevant teams. For instance, a central IT team may oversee management group-level policies, while application teams handle policies for their subscriptions, enabling distributed governance with adherence to organizational standards.",
+            "guid": "3f988795-25d6-4268-a6d7-0ba6c97be995",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview#azure-rbac-permissions-in-azure-policy",
+            "service": "Policy",
             "severity": "Medium",
-            "text": "For regional redudancy, Manually create services in 2 or more regions for Search as it doesn't provide an automated method of replicating search indexes across geographic regions",
-            "waf": "Reliability"
+            "text": "Assign the built-in Resource Policy Contributor role at a particular scope to enable application-level governance.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "3c964882-aec9-4d44-9f68-4b5f2efbbdb6",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#synchronize-data-across-multiple-services",
-            "service": "Cognitive Search",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "19048384-5c98-46cb-8913-156a12476e49",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Policy",
             "severity": "Medium",
-            "text": "To synchronize data across multiple services either Use indexers for updating content on multiple services or Use REST APIs for pushing content updates on multiple services",
-            "waf": "Reliability"
+            "text": "Limit the number of Azure Policy assignments made at the root management group scope to avoid managing through exclusions at inherited scopes.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "85ee93c9-f53c-4803-be51-e6e4aa37ff4e",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#use-azure-traffic-manager-to-coordinate-requests",
-            "service": "Cognitive Search",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5a917e1f-348e-4f25-9c27-d42e8bbac757",
+            "link": "https://learn.microsoft.com/industry/release-plan/2023wave2/cloud-sovereignty/enable-data-sovereignty-policy-baseline",
+            "service": "Policy",
             "severity": "Medium",
-            "text": "Use Azure Traffic Manager to coordinate requests",
-            "waf": "Reliability"
+            "text": "If any data sovereignty requirements exist, Azure Policies should be deployed to enforce them.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-your-cloud-data/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Search/searchServices",
-            "checklist": "Cognitive Search Review Checklist",
-            "guid": "7be10278-57c1-4a61-8ee3-895aebfec5aa",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability#back-up-and-restore-alternatives",
-            "service": "Cognitive Search",
-            "severity": "High",
-            "text": "Backup and Restore an Azure Cognitive Search Index. Use this sample code to back up index definition and snapshot to a series of Json files",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "78b22132-b41c-460b-a4d3-df8f73a67dc2",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/sovereign-landing-zone",
+            "service": "Policy",
+            "severity": "Medium",
+            "text": "For Sovereign Landing Zone, deploy sovereignty policy baseline and assign at correct management group level.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.BotService/botServices",
-            "checklist": "Azure Bot Service",
-            "guid": "6ad48408-ee72-4734-a476-ba28fdcf590c",
-            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-bot",
-            "service": "Bot service",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "caeea0e9-1024-41df-a52e-d99c3f22a6f4",
+            "link": "https://learn.microsoft.com/industry/sovereignty/policy-portfolio-baseline",
+            "service": "Policy",
             "severity": "Medium",
-            "text": "Follow reliability support recommendations in Azure Bot Service",
-            "waf": "Reliability"
+            "text": "For Sovereign Landing Zone, document Sovereign Control objectives to policy mapping.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.BotService/botServices",
-            "checklist": "Azure Bot Service",
-            "guid": "e65de8e1-3f9c-4cbd-9682-66abca264f9a",
-            "link": "https://learn.microsoft.com/en-us/azure/bot-service/bot-builder-concept-regionalization",
-            "service": "Bot service",
+            "arm-service": "Microsoft.Authorization/policyDefinitions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "9b461617-db7b-4399-8ac6-d4eb7153893a",
+            "link": "https://learn.microsoft.com/industry/sovereignty/policy-portfolio-baseline#sovereignty-baseline-policy-initiatives",
+            "service": "Policy",
             "severity": "Medium",
-            "text": "Deploying bots with local data residency and regional compliance",
-            "waf": "Reliability"
+            "text": "For Sovereign Landing Zone, ensure process is in place for management of 'Sovereign Control objectives to policy mapping'.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.BotService/botServices",
-            "checklist": "Azure Bot Service",
-            "guid": "19bfe9d5-5d04-4c3c-9919-ca1b2d1215ae",
-            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-bot#cross-region-disaster-recovery-in-multi-region-geography",
-            "service": "Bot service",
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "67e7a8ed-4b30-4e38-a3f2-9812b2363cef",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-monitor/logs/workspace-design#azure-regions",
+            "service": "Monitor",
             "severity": "Medium",
-            "text": "Azure Bot Service runs in active-active mode for both global and regional services. When an outage occurs, you don't need to detect errors or manage the service. Azure Bot Service automatically performs auto failover and auto recovery in a multi-region geographical architecture. For the EU bot regional service, Azure Bot Service provides two full regions inside Europe with active/active replication to ensure redundancy. For the global bot service, all available regions/geographies can be served as the global footprint.",
-            "waf": "Reliability"
+            "text": "Use a single monitor logs workspace to manage platforms centrally except where Azure role-based access control (Azure RBAC), data sovereignty requirements, or data retention policies mandate separate workspaces.",
+            "training": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.Insights/components",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "a95b86ad-8840-48e3-9273-4b875ba18f20",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/multitenant/considerations/tenancy-models",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "7418ada9-4199-4c28-8286-d15e9433e8f3",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
             "service": "Monitor",
             "severity": "Medium",
-            "text": "Data collection rules in Azure Monitor -https://learn.microsoft.com/azure/azure-monitor/essentials/data-collection-rule-overview",
-            "training": "https://azure.microsoft.com/pricing/reservations/",
-            "waf": "Cost"
+            "text": "Decide whether to use a single Azure Monitor Logs workspace for all regions or to create multiple workspaces to cover various geographical regions. Each approach has advantages and disadvantages, including potential cross-region networking charges",
+            "training": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "45901365-d38e-443f-abcb-d868266abca2",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/automation",
-            "service": "Backup",
-            "severity": "Medium",
-            "text": "check backup instances with the underlying datasource not found",
-            "waf": "Cost"
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5e6c4cfd-3e50-4454-9c24-47ec66138a72",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/data-retention-archive?tabs=portal-1%2Cportal-2#how-retention-and-archiving-work",
+            "service": "Monitor",
+            "severity": "High",
+            "text": "Export logs to Azure Storage if your log retention requirements exceed twelve years. Use immutable storage with a write-once, read-many policy to make data non-erasable and non-modifiable for a user-specified interval.",
+            "training": "https://learn.microsoft.com/learn/paths/architect-infrastructure-operations/",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "64f9a19a-f29c-495d-94c6-c7919ca0f6c5",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/lighthouse",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "e7d7e484-3276-4d8b-bc05-5bcf619e8a13",
+            "link": "https://learn.microsoft.com/azure/governance/machine-configuration/overview",
             "service": "VM",
             "severity": "Medium",
-            "text": "Delete or archive unassociated services (disks, nics, ip addresses etc)",
-            "waf": "Cost"
+            "text": "Monitor OS level virtual machine (VM) configuration drift using Azure Policy. Enabling Azure Automanage Machine Configuration audit capabilities through policy helps application team workloads to immediately consume feature capabilities with little effort.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "69bad37a-ad53-4cc7-ae1d-76667357c449",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-microsoft-customer-agreement#design-recommendations",
-            "service": "Backup",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "f9887952-5d62-4688-9d70-ba6c97be9951",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#update-management-considerations",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Consider a good balance between site recovery storage and backup for non mission critical applications",
-            "waf": "Cost"
+            "text": "Use Azure Update Manager as a patching mechanism for Windows and Linux VMs in Azure.",
+            "training": "https://learn.microsoft.com/azure/update-manager/overview?tabs=azure-vms",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "674b5ed8-5a85-49c7-933b-e2a1a27b765a",
-            "link": "https://learn.microsoft.com/azure/cost-management-billing/manage/direct-ea-administration#manage-notification-contacts",
-            "service": "Monitor",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "c806c048-26b7-4ddf-b4c2-b4f0c476925d",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#update-management-considerations ",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Check spending and savings opportunities among the 40 different log analytics workspaces- use different retention and data collection for nonprod workspaces-create daily cap for awareness and tier sizing -  If you do set a daily cap, in addition to creating an alert when the cap is reached,ensure that you also create an alert rule to be notified when some percentage has been reached (90% for example). - consider workspace transformation if possible - https://learn.microsoft.com/azure/azure-monitor/essentials/data-collection-transformations#workspace-transformation-dcr ",
-            "training": "https://learn.microsoft.com/azure/cost-management-billing/costs/understand-work-scopes",
-            "waf": "Cost"
+            "text": "Use Azure Update Manager as a patching mechanism for Windows and Linux VMs outside of Azure using Azure Arc.",
+            "training": "https://learn.microsoft.com/azure/update-manager/overview?tabs=azure-vms",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.network/networkWatchers",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "90483845-c986-4cb2-a131-56a12476e49f",
+            "link": "https://learn.microsoft.com/azure/network-watcher/network-watcher-monitoring-overview",
+            "service": "Network Watcher",
+            "severity": "Medium",
+            "text": "Use Network Watcher to proactively monitor traffic flows.",
+            "training": "https://learn.microsoft.com/learn/modules/configure-network-watcher/",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.Insights/components",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "91be1f38-8ef3-494c-8bd4-63cbbac75819",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-enterprise-agreement#design-considerations",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "6944008b-e7d7-4e48-9327-6d8bdc055bcf",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-setup-guide/monitoring-reporting?tabs=AzureMonitor",
             "service": "Monitor",
             "severity": "Medium",
-            "text": "Enforce a purging log policy and automation (if needed, logs can be moved to cold storage)",
-            "training": "https://www.youtube.com/watch?v=nHQYcYGKuyw",
-            "waf": "Cost"
+            "text": "Use Azure Monitor Logs for insights and reporting.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-monitor/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "6aae01e6-a84d-4e5d-b36d-1d92881a1bd5",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-enterprise-agreement#design-considerations",
-            "service": "VM",
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "97be9951-9048-4384-9c98-6cb2913156a1",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/alerts/alerts-overview",
+            "service": "Monitor",
             "severity": "Medium",
-            "text": "Check that the disks are really needed, if not: delete. If they are needed, find lower storage tiers or use backup -",
-            "training": "https://learn.microsoft.com/azure/cost-management-billing/costs/manage-automation",
-            "waf": "Cost"
+            "text": "Use Azure Monitor alerts for the generation of operational alerts.",
+            "training": "https://learn.microsoft.com/training/modules/incident-response-with-alerting-on-azure/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "d1e44a19-659d-4395-afd7-7289b835556d",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-enterprise-agreement#design-considerations",
-            "service": "Storage",
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "fed3c55f-a67e-4875-aadd-3aba3f9fde31",
+            "link": "https://learn.microsoft.com/azure/automation/how-to/region-mappings",
+            "service": "Monitor",
             "severity": "Medium",
-            "text": "Consider moving unused storage to lower tier, with customized rule - https://learn.microsoft.com/azure/storage/blobs/lifecycle-management-policy-configure  ",
-            "training": "https://learn.microsoft.com/azure/cost-management-billing/costs/enable-tag-inheritance",
-            "waf": "Cost"
+            "text": "When using Change and Inventory Tracking via Azure Automation Accounts, ensure that you have selected supported regions for linking your Log Analytics workspace and automation accounts together.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-automation-devops/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "d0102cac-6aae-401e-9a84-de5de36d1d92",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Make sure advisor is configured for VM right sizing ",
-            "waf": "Cost"
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "eba8cf22-45c6-4dc1-9b57-2cceb3b97ce5",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-redundancy",
+            "service": "Backup",
+            "severity": "Low",
+            "text": "When using Azure Backup, use the correct backup types (GRS, ZRS & LRS) for your backup, as the default setting is GRS.",
+            "training": "https://learn.microsoft.com/training/modules/design-solution-for-backup-disaster-recovery/",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "description": "check by searching the Meter Category Licenses in the Cost analysys",
-            "guid": "59ae568b-a38d-4498-9e22-13dbd7bb012f",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/manage/centralize-operations",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "f541acdc-e979-4377-acdb-3751ab2ab13a",
+            "link": "https://learn.microsoft.com/azure/governance/policy/concepts/guest-configuration",
             "service": "VM",
             "severity": "Medium",
-            "text": "run the script on all windows VMs https://learn.microsoft.com/azure/virtual-machines/windows/hybrid-use-benefit-licensing?ref=andrewmatveychuk.com#convert-an-existing-vm-using-azure-hybrid-benefit-for-windows-server- consider implementing a policy if windows VMs are created frequently",
-            "waf": "Cost"
+            "text": "Use Azure guest policies to automatically deploy software configurations through VM extensions and enforce a compliant baseline VM configuration.",
+            "waf": "Security"
         },
         {
             "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "7b95e06e-158e-42ea-9992-c2de6e2065b3",
-            "link": "https://learn.microsoft.com/azure/active-directory/privileged-identity-management/pim-configure",
+            "checklist": "Azure Landing Zone Review",
+            "description": "Use Azure Policy's guest configuration features  to audit and remediate machine settings (e.g., OS, application, environment) to ensure resources align with expected configurations, and Update Management can enforce patch management for VMs.",
+            "guid": "da6e55d7-d8a2-4adb-817d-6326af625ca4",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#monitoring-for-configuration-drift",
             "service": "VM",
             "severity": "Medium",
-            "text": " this can be also put under AHUB if you already have licenses https://learn.microsoft.com/azure/virtual-machines/linux/azure-hybrid-benefit-linux?tabs=rhelpayg%2Crhelbyos%2CrhelEnablebyos%2Crhelcompliance",
-            "waf": "Cost"
+            "text": "Monitor VM security configuration drift via Azure Policy.",
+            "training": "https://learn.microsoft.com/training/paths/implement-resource-mgmt-security/",
+            "waf": "Security"
         },
         {
             "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "75c1e945-b459-4837-bf7a-e7c6d3b475a5",
-            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/active-directory-groups-create-azure-portal",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "2476e49f-541a-4cdc-b979-377bcdb3751a",
+            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-overview",
             "service": "VM",
             "severity": "Medium",
-            "text": "Consolidate reserved VM families with flexibility option (no more than 4-5 families)",
-            "training": "https://learn.microsoft.com/azure/automation/automation-solution-vm-management",
-            "waf": "Cost"
+            "text": "Use Azure Site Recovery for Azure-to-Azure Virtual Machines disaster recovery scenarios. This enables you to replicate workloads across regions.",
+            "training": "https://learn.microsoft.com/training/modules/protect-infrastructure-with-site-recovery/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "c7acbe49-bbe6-44dd-a9f2-e87778468d55",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/identity-access#prerequisites-for-a-landing-zone---design-recommendations",
-            "service": "VM",
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "f625ca44-e569-45f2-823a-ce8cb12308ca",
+            "link": "https://learn.microsoft.com/azure/backup/backup-center-overview",
+            "service": "Backup",
             "severity": "Medium",
-            "text": "Utilize Azure Reserved Instances: This feature allows you to reserve VMs for a period of 1 or 3 years, providing significant cost savings compared to PAYG prices.",
-            "waf": "Cost"
+            "text": "Use Azure-native backup capabilities, or an Azure-compatible, 3rd-party backup solution.",
+            "training": "https://learn.microsoft.com/training/modules/design-solution-for-backup-disaster-recovery/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "a6bcca2b-4fea-41db-b3dd-95d48c7c891d",
-            "link": "https://learn.microsoft.com/azure/active-directory-domain-services/overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Only larger disks can be reserved => 1 TiB -",
-            "waf": "Cost"
+            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "89cc5e11-aa4d-4c3b-893d-feb99215266a",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#add-diagnostic-settings-to-save-your-wafs-logs",
+            "service": "WAF",
+            "severity": "High",
+            "text": "Add diagnostic settings to save WAF logs from application delivery services like Azure Front Door and Azure Application Gateway. Regularly review the logs to check for attacks and for false positive detections.",
+            "training": "https://learn.microsoft.com/training/modules/capture-application-logs-app-service/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "cb1f7d57-59ae-4568-aa38-d4985e2213db",
-            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/identity/adds-extend-domain",
-            "service": "VM",
+            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "7f408960-c626-44cb-a018-347c8d790cdf",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#send-logs-to-microsoft-sentinel",
+            "service": "WAF",
             "severity": "Medium",
-            "text": "After the right-sizing optimization",
-            "waf": "Cost"
+            "text": "Send WAF logs from your application delivery services like Azure Front Door and Azure Application Gateway to Microsoft Sentinel. Detect attacks and integrate WAF telemetry into your overall Azure environment.",
+            "training": "https://learn.microsoft.com/training/paths/sc-200-connect-logs-to-azure-sentinel/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Sql/servers",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "d7bb012f-7b95-4e06-b158-e2ea3992c2de",
-            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy",
-            "service": "SQL",
-            "severity": "Medium",
-            "text": "Check if applicable and enforce policy/change https://learn.microsoft.com/azure/azure-sql/azure-hybrid-benefit?view=azuresql&tabs=azure-portalhttps://learn.microsoft.com/azure/cost-management-billing/scope-level/create-sql-license-assignments?source=recommendations",
-            "waf": "Cost"
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "5017f154-e3ab-4369-9829-e7e316183687",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/overview",
+            "service": "Key Vault",
+            "severity": "High",
+            "text": "Use Azure Key Vault to store your secrets and credentials.",
+            "training": "https://learn.microsoft.com/training/modules/implement-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "6e2065b3-a76a-4f4a-991e-8839ada46667",
-            "link": "https://learn.microsoft.com/azure/active-directory/roles/best-practices",
-            "service": "VM",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "graph": "ResourceContainers | where type=='microsoft.resources/subscriptions'| parse id with '/subscriptions/' SubscriptionID| project subscriptionId, SubscriptionName = name| join kind=leftouter (Resources| where type == 'microsoft.keyvault/vaults'| project id, name, subscriptionId) on subscriptionId| join kind= leftouter (Resources| where type == 'microsoft.keyvault/vaults'| summarize ResourceCount = count() by subscriptionId) on subscriptionId| extend RCount = iff(isnull(ResourceCount), 0, ResourceCount)| project-away ResourceCount| extend compliant = (RCount <> 1)",
+            "guid": "a0477a20-9945-4bda-9333-4f2491163418",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/overview-throttling",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "The VM + license part discount (ahub + 3YRI) is around 70% discount",
-            "waf": "Cost"
+            "text": "Use different Azure Key Vaults for different applications, environments and regions to avoid transaction scale limits and restrict access to secrets.",
+            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "ccbd9792-a6bc-4ca2-a4fe-a1dbf3dd95d4",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#send-logs-to-microsoft-sentinel",
-            "service": "VM",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "2ba52752-6944-4008-ae7d-7e4843276d8b",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Consider using a VMSS to match demand rather than flat sizing",
-            "waf": "Cost"
+            "text": "Provision Azure Key Vault with the soft delete and purge policies enabled to allow retention protection for deleted objects.",
+            "training": "https://learn.microsoft.com/training/modules/implement-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "c1b1cd52-1e54-4a29-a9de-39ac0e7c28dc",
-            "link": "https://learn.microsoft.com/azure/reliability/cross-region-replication-azure",
-            "service": "AKS",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "dc055bcf-619e-48a1-9f98-879525d62688",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Use AKS autoscaler to match your clusters usage (make sure the pods requirements match the scaler)",
-            "waf": "Cost"
+            "text": "Follow a least privilege model by limiting authorization to permanently delete keys, secrets, and certificates to specialized custom Microsoft Entra ID roles.",
+            "training": "https://learn.microsoft.com/training/modules/implement-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "44be3b1a-27f8-4b9e-a1be-1f38df03a822",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/data-retention-archive?tabs=portal-1%2Cportal-2#how-retention-and-archiving-work",
-            "service": "Backup",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "6d70ba6c-97be-4995-8904-83845c986cb2",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Move recovery points to vault-archive where applicable (Validate)",
-            "training": "https://azure.microsoft.com/pricing/reservations/",
-            "waf": "Cost"
+            "text": "Automate the certificate management and renewal process with public certificate authorities to ease administration.",
+            "training": "https://learn.microsoft.com/en-us/training/modules/configure-and-manage-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Databricks/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "cd463cbb-bc8a-4c29-aebc-91a43da1dae2",
-            "link": "https://learn.microsoft.com/azure/databricks/clusters/cluster-config-best-practices#automatic-termination",
-            "service": "Databricks",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "913156a1-2476-4e49-b541-acdce979377b",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Consider using Spot VMs with fallback where possible. Consider autotermination of clusters.",
-            "waf": "Cost"
+            "text": "Establish an automated process for key and certificate rotation.",
+            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "cc881470-607c-41cc-a0e6-14658dd458e9",
-            "link": "https://learn.microsoft.com/azure/governance/policy/how-to/guest-configuration-create",
-            "service": "Functions",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "cdb3751a-b2ab-413a-ba6e-55d7d8a2adb1",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Functions - Reuse connections",
-            "training": "https://learn.microsoft.com/azure/cost-management-billing/reservations/reservation-apis?toc=%2Fazure%2Fcost-management-billing%2Ftoc.json",
-            "waf": "Cost"
+            "text": "Enable firewall and virtual network service endpoint or private endpoint on the vault to control access to the key vault.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-private-access-to-azure-services/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "27139b82-1102-4dbd-9eaf-11e6f843e52f",
-            "link": "https://learn.microsoft.com/azure/automation/update-management/overview",
-            "service": "Functions",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "17d6326a-f625-4ca4-9e56-95f2223ace8c",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/monitor-key-vault",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Functions - Cache data locally",
-            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-compute-resources/",
-            "waf": "Cost"
+            "text": "Use the platform-central Azure Monitor Log Analytics workspace to audit key, certificate, and secret usage within each instance of Key Vault.",
+            "training": "https://learn.microsoft.com/training/modules/analyze-infrastructure-with-azure-monitor-logs/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "4722d928-c1b1-4cd5-81e5-4a29b9de39ac",
-            "link": "https://learn.microsoft.com/azure/network-watcher/network-watcher-monitoring-overview",
-            "service": "Functions",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b12308ca-5017-4f15-9e3a-b3693829e7e3",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Functions - Cold starts-Use the 'Run from package' functionality. This way, the code is downloaded as a single zip file. This can, for example, result in significant improvements with Javascript functions, which have a lot of node modules.Use language specific tools to reduce the package size, for example, tree shaking Javascript applications.",
-            "training": "https://learn.microsoft.com/learn/modules/configure-network-watcher/",
-            "waf": "Cost"
+            "text": "Delegate Key Vault instantiation and privileged access and use Azure Policy to enforce a consistent compliant configuration.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-key-vault-networking-settings/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "0e7c28dc-9366-4572-82bf-f4564b0d934a",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/lock-resources?tabs=json",
-            "service": "Functions",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "25d62688-6d70-4ba6-a97b-e99519048384",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "Functions - Keep your functions warm",
-            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
-            "waf": "Cost"
+            "text": "If you want to bring your own keys, this might not be supported across all considered services. Implement relevant mitigation so that inconsistencies don't hinder desired outcomes. Choose appropriate region pairs and disaster recovery regions that minimize latency.",
+            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "359c363e-7dd6-4162-9a36-4a907ebae38e",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Functions",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "4ac6b67c-b3a4-4ff9-8e87-b07a7ce7bbdb",
+            "link": "https://learn.microsoft.com/industry/sovereignty/key-management",
+            "service": "Key Vault",
             "severity": "Medium",
-            "text": "When using autoscale with different functions, there might be one driving all the autoscale for all the resources - consider moving it to a separate consumption plan (and consider higher plan for CPU)",
-            "waf": "Cost"
+            "text": "For Sovereign Landing Zone, use Azure Key Vault managed HSM to store your secrets and credentials.",
+            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "ad53cc7d-e2e8-4aaa-a357-1549ab9153d8",
-            "link": "https://learn.microsoft.com/azure/service-health/alerts-activity-log-service-notifications-portal",
-            "service": "Functions",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "4e5695f2-223a-4ce8-ab12-308ca5017f15",
+            "link": "https://learn.microsoft.com/azure/active-directory/reports-monitoring/overview-reports",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Function apps in a given plan are all scaled together, so any issues with scaling can affect all apps in the plan.",
-            "waf": "Cost"
+            "text": "Use Microsoft Entra ID reporting capabilities to generate access control audit reports.",
+            "training": "https://learn.microsoft.com/training/modules/monitor-report-aad-security-events/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "9f89dc7b-44be-43b1-a27f-8b9e91be1f38",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/alerts/action-groups",
-            "service": "Functions",
-            "severity": "Medium",
-            "text": "Am I billed for 'await time'? This question is typically asked in the context of a C# function that does an async operation and waits for the result, e.g. await Task.Delay(1000) or await client.GetAsync('http://google.com'). The answer is yes - the GB second calculation is based on the start and end time of the function and the memory usage over that period. What actually happens over that time in terms of CPU activity is not factored into the calculation.One exception to this rule is if you are using durable functions. You are not billed for time spent at awaits in orchestrator functions.apply demand shaping techinques where possible (dev environments?) https://github.com/Azure-Samples/functions-csharp-premium-scaler",
-            "waf": "Cost"
+            "checklist": "Azure Landing Zone Review",
+            "guid": "09945bda-4333-44f2-9911-634182ba5275",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/concept-cloud-security-posture-management",
+            "service": "Defender",
+            "severity": "High",
+            "text": "Enable Defender Cloud Security Posture Management for all subscriptions.",
+            "training": "https://learn.microsoft.com/training/modules/microsoft-defender-cloud-security-posture/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "3da1dae2-cc88-4147-8607-c1cca0e61465",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Frontdoor - Turn off the default homepageIn the application settings of your App, set AzureWebJobsDisableHomepage to true. This will return a 204 (No Content) to the PoP so only header data is returned.",
-            "waf": "Cost"
+            "checklist": "Azure Landing Zone Review",
+            "guid": "36a72a48-fffe-4c40-9747-0ab5064355ba",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/plan-defender-for-servers-select-plan",
+            "service": "Defender",
+            "severity": "High",
+            "text": "Enable a Defender Cloud Workload Protection Plan for Servers on all subscriptions.",
+            "training": "https://learn.microsoft.com/training/modules/understand-azure-defender-cloud-workload-protection/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "8dd458e9-2713-49b8-8110-2dbd6eaf11e6",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-setup-guide/monitoring-reporting?tabs=AzureMonitor",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Frontdoor - Route to something that returns nothing. Either set up a Function, Function Proxy, or add a route in your WebApp that returns 200 (OK) and sends no or minimal content. The advantage of this is you will be able to log out when it is called.",
-            "waf": "Cost"
+            "checklist": "Azure Landing Zone Review",
+            "guid": "77425f48-ecba-43a0-aeac-a3ac733ccc6a",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/connect-azure-subscription",
+            "service": "Defender",
+            "severity": "High",
+            "text": "Enable Defender Cloud Workload Protection Plans for Azure Resources on all subscriptions.",
+            "training": "https://learn.microsoft.com/training/modules/understand-azure-defender-cloud-workload-protection/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "7e31c67d-68cf-46a6-8a11-94956d697dc3",
-            "link": "https://learn.microsoft.com/azure/architecture/best-practices/monitoring",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "Consider archiving tiers for less used data",
-            "waf": "Cost"
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "24d96b30-61ee-4436-a1cc-d6ef08bc574b",
+            "link": "https://learn.microsoft.com/mem/configmgr/protect/deploy-use/endpoint-protection",
+            "service": "VM",
+            "severity": "High",
+            "text": "Enable Endpoint Protection on IaaS Servers.",
+            "training": "https://learn.microsoft.com/training/modules/design-solutions-securing-server-client-endpoints/",
+            "waf": "Security"
         },
         {
             "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "a2ed27b2-d186-4f1a-8252-bddde68a487c",
-            "link": "https://learn.microsoft.com/azure/automation/how-to/region-mappings",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "15833ee7-ad6c-46d3-9331-65c7acbe44ab",
+            "link": "https://learn.microsoft.com/azure/security-center/",
             "service": "VM",
             "severity": "Medium",
-            "text": "Check disk sizes where the size does not match the tier (i.e. A 513 GiB disk will pay a P30 (1TiB) and consider resizing",
-            "waf": "Cost"
+            "text": "Monitor base operating system patching drift via Azure Monitor Logs and Defender for Cloud.",
+            "training": "https://learn.microsoft.com/training/modules/create-log-analytics-workspace-microsoft-defender-cloud/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "dec4861b-c3bc-410a-b77e-26e4d5a3bec2",
-            "link": "https://learn.microsoft.com/azure/governance/policy/concepts/guest-configuration",
-            "service": "Storage",
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "e5f8d79f-2e87-4768-924c-516775c6ea95",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
+            "service": "Monitor",
             "severity": "Medium",
-            "text": "Consider using standard SSD rather than Premium or Ultra where possible",
-            "waf": "Cost"
+            "text": "Connect default resource configurations to a centralized Azure Monitor Log Analytics workspace.",
+            "training": "https://learn.microsoft.com/training/modules/analyze-infrastructure-with-azure-monitor-logs/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "c4e2436b-1336-4db5-9f17-960eee0bdf5c",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#monitoring-for-configuration-drift",
-            "service": "Storage",
-            "severity": "Medium",
-            "text": "For storage accounts, make sure that the chosen tier is not adding up transaction charges (it might be cheaper to move to the next tier)",
-            "waf": "Cost"
+            "checklist": "Azure Landing Zone Review",
+            "graph": "resources| where type == 'microsoft.operationalinsights/workspaces'| extend wsid = properties.customerId| project workspaceResourceId = tolower(id), name, wsid| join (resources| where type == 'microsoft.operationsmanagement/solutions'| where name has 'SecurityInsights'| extend workspaceResourceId = tostring(tolower(properties.workspaceResourceId))| project workspaceResourceId | summarize ResourceCount = count() by workspaceResourceId) on workspaceResourceId| extend RCount = iff(isnull(ResourceCount), 0, ResourceCount)| project-away ResourceCount| extend compliant = (RCount <> 0)",
+            "guid": "a56888b2-7e83-4404-bd31-b886528502d1",
+            "link": "https://learn.microsoft.com/en-us/azure/well-architected/security/monitor-threats#centralized-threat-detection-with-correlated-logs",
+            "service": "Entra",
+            "severity": "High",
+            "text": "Centralized threat detection with correlated logs -  consolidate security data in a central location where it can be correlated across various services via SIEM (security information and event management)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "c2efc5d7-61d4-41d2-900b-b47a393a040f",
-            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-overview",
-            "service": "Site Recovery",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "1761e147-f65e-4d09-bbc2-f464f23e2eba",
+            "link": "https://learn.microsoft.com/industry/sovereignty/transparency-logs",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "For ASR, consider using Standard SSD disks if the RPO/RTO and replication throughput allow it",
-            "waf": "Cost"
+            "text": "For Sovereign Landing Zone, enable transparancy logs on the Entra ID tenant.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "d3294798-b118-48b2-a5a4-6ceb544451e1",
-            "link": "https://learn.microsoft.com/azure/architecture/framework/resiliency/backup-and-recovery",
-            "service": "Storage",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "d21a922d-5ca7-427a-82a6-35f7b21f1bfc",
+            "link": "https://learn.microsoft.com/azure/security/fundamentals/customer-lockbox-overview",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Storage accounts: check hot tier and/or GRS necessary",
-            "waf": "Cost"
+            "text": "For Sovereign Landing Zone, enable customer Lockbox on the Entra ID tenant.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "92d34429-3c76-4286-97a5-51c5b04e4f18",
-            "link": "https://learn.microsoft.com/azure/backup/backup-center-overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Disks - validate use of Premium SSD disks everywhere: for example, non-prod could swap to Standard SSD or on-demand Premium SSD  ",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Synapse/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "54387e5c-ed12-46cd-832a-f5b2fc6998a5",
-            "link": "https://learn.microsoft.com/azure/reliability/availability-zones-overview",
-            "service": "Synapse",
-            "severity": "Medium",
-            "text": "Create budgets to manage costs and create alerts that automatically notify stakeholders of spending anomalies and overspending risks.",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Synapse/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "35e33789-7e31-4c67-b68c-f6a62a119495",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/availability",
-            "service": "Synapse",
-            "severity": "Medium",
-            "text": "Export cost data to a storage account for additional data analysis.",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Synapse/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "6d697dc3-a2ed-427b-8d18-6f1a1252bddd",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
-            "service": "Synapse",
-            "severity": "Medium",
-            "text": "Control costs for a dedicated SQL pool by pausing the resource when it is not in use.",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Synapse/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "e68a487c-dec4-4861-ac3b-c10ae77e26e4",
-            "link": "https://learn.microsoft.com/azure/virtual-machine-scale-sets/overview",
-            "service": "Synapse",
-            "severity": "Medium",
-            "text": "Enable the serverless Apache Spark automatic pause feature and set your timeout value accordingly.",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Synapse/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "d5a3bec2-c4e2-4436-a133-6db55f17960e",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-latest-version-for-customer-managed-certificates",
-            "service": "Synapse",
-            "severity": "Medium",
-            "text": "Create multiple Apache Spark pool definitions of various sizes.",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Synapse/workspaces",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "ee0bdf5c-c2ef-4c5d-961d-41d2500bb47a",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/resource-org-management-groups#management-groups-in-the-azure-landing-zone-accelerator",
-            "service": "Synapse",
-            "severity": "Medium",
-            "text": "Purchase Azure Synapse commit units (SCU) for one year with a pre-purchase plan to save on your Azure Synapse Analytics costs.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "393a040f-d329-4479-ab11-88b2c5a46ceb",
-            "link": "https://learn.microsoft.com/azure/application-gateway/overview-v2",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Use Spot VMs for interruptible jobs: These are VMs that can be bid on and purchased at a discounted price, providing a cost-effective solution for non-critical workloads.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "544451e1-92d3-4442-a3c7-628637a551c5",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Right-sizing all VMs",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "b04e4f18-5438-47e5-aed1-26cd032af5b2",
-            "link": "https://learn.microsoft.com/azure/application-gateway/configuration-infrastructure#size-of-the-subnet",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Swap VM sized with normalized and most recent sizes",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Cost"
-        },
-        {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "fc6998a5-35e3-4378-a7e3-1c67d68cf6a6",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "right-sizing VMs - start with monitoring usage below 5% and then work up to 40%",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Cost"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "b03ed428-4617-4067-a787-85468b9ccf3f",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-require-secure-transfer",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Enable secure transfer to storage accounts.",
+            "training": "https://learn.microsoft.com/training/modules/secure-azure-storage-account/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Cost Optimization Checklist",
-            "guid": "2a119495-6d69-47dc-9a2e-d27b2d186f1a",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Containerizing an application can improve VM density and save money on scaling it",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Cost"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "159aac9f-863f-4f48-82cf-00c28fa97a0e",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/data-protection-overview#recommendations-for-basic-data-protection",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Enable container soft delete for the storage account to recover a deleted container and its contents.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.Cdn/profiles/secrets' | extend frontDoorId = substring(id, 0, indexof(id, '/secrets')) | where properties.parameters.type =~ 'CustomerCertificate' | extend compliant = properties.parameters.useLatestVersion == true | project compliant, id=frontDoorId, certificateName = name | distinct id, certificateName, compliant",
-            "guid": "f00a69de-7076-4734-a734-6e4552cad9e1",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-latest-version-for-customer-managed-certificates",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "If you use customer-managed TLS certificates with Azure Front Door, use the 'Latest' certificate version. Reduce the risk of outages caused by manual certificate renewal.",
+            "arm-service": "Microsoft.KeyVault/vaults",
+            "checklist": "Azure Landing Zone Review",
+            "guid": "108d5099-a11d-4445-bd8b-e12a5e95412e",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/considerations/development-strategy-development-lifecycle#automated-builds",
+            "service": "Key Vault",
+            "severity": "High",
+            "text": "Use Key Vault secrets to avoid hard-coding sensitive information such as credentials (virtual machines user passwords), certificates or keys.",
+            "training": "https://learn.microsoft.com/en-us/training/modules/implement-azure-key-vault/",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.cdn/profiles' and sku has 'AzureFrontDoor' | project name, cdnprofileid=tolower(id), tostring(tags), resourceGroup, subscriptionId,skuname=tostring(sku.name) | join kind= fullouter ( cdnresources | where type == 'microsoft.cdn/profiles/securitypolicies' | extend wafpolicyid=tostring(properties['parameters']['wafPolicy']['id']) | extend splitid=split(id, '/') | extend cdnprofileid=tolower(strcat_array(array_slice(splitid, 0, 8), '/')) | project secpolname=name, cdnprofileid, wafpolicyid ) on cdnprofileid | project name, cdnprofileid, secpolname, wafpolicyid,skuname | join kind = fullouter ( resources | where type == 'microsoft.network/frontdoorwebapplicationfirewallpolicies' | extend managedrulesenabled=iff(tostring(properties.managedRules.managedRuleSets) != '[]', true, false), enabledState = tostring(properties.policySettings.enabledState) | project afdwafname=name, managedrulesenabled, wafpolicyid=id, enabledState, tostring(tags) ) on wafpolicyid | where name != '' | summarize associatedsecuritypolicies=countif(secpolname != ''), wafswithmanagedrules=countif(managedrulesenabled == 1) by name, id=cdnprofileid, tags,skuname | extend compliant = (associatedsecuritypolicies > 0 and wafswithmanagedrules > 0) | project id, compliant",
-            "guid": "e79d17b7-3b22-4a5a-97e7-a8ed4b30e38c",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Use Azure Front Door with WAF policies to deliver and help protect global HTTP/S apps that span multiple Azure regions.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "3f29812b-2363-4cef-b179-b599de0d5973",
-            "link": "https://learn.microsoft.com/azure/frontdoor/origin-security?tabs=application-gateway&pivots=front-door-standard-premium#example-configuration",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "When using Front Door and Application Gateway to help protect HTTP/S apps, use WAF policies in Front Door. Lock down Application Gateway to receive traffic only from Front Door.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "a85b86ad-884f-48e3-9273-4b875ba18f10",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/system-message#define-additional-safety-and-behavioral-guardrails",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Follow Metaprompting guardrails for resonsible AI",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type == 'microsoft.network/frontdoorwebapplicationfirewallpolicies' | project policyName=name, policyId=id,policySku=sku.name, links=properties.securityPolicyLinks, enabledState=properties.policySettings.enabledState, mode=properties.policySettings.mode | mvexpand links | extend securityPolicy=links.id | extend securityPolicyParts=split(securityPolicy, '/') | extend profileId=strcat_array(array_slice(securityPolicyParts, 0, -3), '/') | project id=profileId, compliant=((enabledState=='Enabled') and (mode=='Prevention')), enabledState, mode",
-            "guid": "ae248989-b306-4591-9186-de482e3f0f0e",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-policy-settings",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "d4391898-cd28-48be-b6b1-7cb8245451e1",
+            "link": "https://github.com/Azure-Samples/AI-Gateway",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Deploy your WAF policy for Front Door in 'Prevention' mode' so that Web Application Firewall takes appropriate action to allow or deny traffic.",
-            "waf": "Security"
+            "text": "Consider Gateway patterns with APIM  or solutions like AI central for better rate limiting, load balancing, authentication and logging",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/origins' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend compliant = properties['hostName'] !endswith '.trafficmanager.net' | project compliant, id=frontDoorId",
-            "guid": "062d5839-4d36-402f-bfa4-02811eb936e9",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#avoid-combining-traffic-manager-and-front-door",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "aed3453a-ec72-4392-97a1-52d6cc5e4029",
+            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/azure-openai-insights-monitoring-ai-with-confidence/ba-p/4026850",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Avoid placing Traffic Manager behind Front Door.",
-            "waf": "Security"
+            "text": "Enable monitoring for your AOAI instances",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/origins' | extend frontDoorId = substring(id, 0, indexof(id, '/origins')) | extend compliant = isempty(properties.originHostHeader) or (tostring(properties.hostName) =~ tostring(properties.originHostHeader)) | project id=frontDoorId, originName = name, compliant",
-            "guid": "5efeb96a-003f-4b18-8fcd-b4d84459c2b2",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-the-same-domain-name-on-front-door-and-your-origin",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type == 'microsoft.insights/metricalerts' | extend compliant = (properties.targetResourceType =~ 'Microsoft.CognitiveServices/accounts') | project id, compliant",
+            "guid": "697cb391-ed16-4b2d-886f-0a0241addde6",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitoring#set-up-alerts",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Use the same domain name on Azure Front Door and your origin. Mismatched host names can cause subtle bugs.",
-            "waf": "Security"
+            "text": "Create alerts to notify teams of events such as an entry in the activity log created by an action performed on the resource, such as regenerating its subscription keys or a metric threshold such as the number of errors exceeding 10 in an hour",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/origins' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend originGroupId = substring(id, 0, indexof(id, '/origins')) | join kind=inner (cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend originGroupName = name | extend hasHealthProbe = isnotnull(properties.healthProbeSettings)) on $left.originGroupId == $right.id | summarize numberOrigins = count() by originGroupId, subscriptionId, frontDoorId, hasHealthProbe, originGroupName | extend compliant = not(numberOrigins == 1 and hasHealthProbe) | project id = frontDoorId, compliant",
-            "guid": "0b5a380c-4bfb-47bc-b1d7-dcfef363a61b",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#disable-health-probes-when-theres-only-one-origin-in-an-origin-group",
-            "service": "Front Door",
-            "severity": "Low",
-            "text": "Disable health probes when there is only one origin in an Azure Front Door origin group.",
-            "waf": "Performance"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "8a477cde-b486-41bc-9bc1-0ae66e25d4d5",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitoring",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Monitor token usage to prevent service disruptions due to capacity",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "5567048e-e5d7-4206-9c55-b5ed45d2cc0c",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#select-good-health-probe-endpoints",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "a3aec2c4-e243-46b0-936c-b45e17960eee",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitoring",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Select good health probe endpoints for Azure Front Door. Consider building health endpoints that check all of your application's dependencies.",
-            "waf": "Reliability"
+            "text": "observe metrics like processed inference tokens, generated completion tokens monitor for rate limit",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups/')) | extend compliant = (isnull(properties['healthProbeSettings']['probeRequestType']) or toupper(properties['healthProbeSettings']['probeRequestType']) == 'HEAD') | project compliant, id=frontDoorId",
-            "guid": "a13f72f3-8f5c-4864-95e5-75bf37fbbeb1",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-head-health-probes",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "fbdf4cc2-eec4-4d76-8c31-d25ffbb46a39",
+            "link": "https://techcommunity.microsoft.com/t5/apps-on-azure-blog/build-an-enterprise-ready-azure-openai-solution-with-azure-api/ba-p/3907562",
+            "service": "OpenAI",
             "severity": "Low",
-            "text": "Use HEAD health probes with Azure Front Door, to reduce the traffic that Front Door sends to your application.",
-            "waf": "Performance"
+            "text": "Enable and configure Diagnostics for the Azure OpenAI Service. If not sufficient, consider using a gateway such as Azure API Managements in front of Azure OpenAI to log both incoming prompts and outgoing responses, where permitted",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/customdomains' | extend frontDoorId = substring(id, 0, indexof(id, '/customdomains')) | extend compliant = (isnull(properties['tlsSettings']['certificateType']) or tolower(properties['tlsSettings']['certificateType']) =~ 'customercertificate') | project compliant, id = frontDoorId",
-            "guid": "af95c92d-d723-4f4a-98d7-8722324efd4d",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-managed-tls-certificates",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "3af30ed3-2947-498b-8178-a2c5a46ceb54",
+            "link": "https://github.com/Azure-Samples/openai-enterprise-iac",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Use managed TLS certificates with Azure Front Door. Reduce operational cost and risk of outages due to certificate renewals.",
-            "waf": "Operations"
-        },
-        {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "189ea962-3969-4863-8f5a-5ad808c2cf4b",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#define-your-waf-configuration-as-code",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Define your Azure Front Door WAF configuration as code. By using code, you can more easily adopt new rule set version and gain additional protection.",
-            "waf": "Operations"
+            "text": "Use Infrastructure as code to deploy the Azure OpenAI Service, model deployments, and all related resources",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type == 'microsoft.cdn/profiles/afdendpoints/routes' | extend frontDoorId = substring(id, 0, indexof(id, '/afdendpoints')) | extend forwardingProtocol=tostring(properties.forwardingProtocol),supportedProtocols=properties.supportedProtocols,httpsRedirect=properties.httpsRedirect | extend compliant = forwardingProtocol =~ 'httpsonly' and (supportedProtocols has 'https' or httpsRedirect =~ 'enabled') | project id = frontDoorId, compliant",
-            "guid": "2e30abab-5478-417c-81bf-bf1ad4ed1ed4",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-end-to-end-tls",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "4350d092-d234-4292-a752-8537a551c5bf",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/managed-identity",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Use end-to-end TLS with Azure Front Door. Use TLS for connections from your clients to Front Door, and from Front Door to your origin.",
+            "text": "Use Microsoft Entra Authentication with Managed Identity instead of API Key",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type == 'microsoft.cdn/profiles/afdendpoints/routes' | extend frontDoorId = substring(id, 0, indexof(id, '/afdendpoints')) | extend forwardingProtocol=tostring(properties.forwardingProtocol),supportedProtocols=properties.supportedProtocols,httpsRedirect=properties.httpsRedirect | extend compliant = httpsRedirect =~ 'enabled' | project id = frontDoorId, compliant",
-            "guid": "10aa45af-166f-44c4-9f36-b6d592dac2ca",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-http-to-https-redirection",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Use HTTP to HTTPS redirection with Azure Front Door. Support older clients by redirecting them to an HTTPS request automatically.",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "4e4f1854-287d-45cd-a126-cc031af5b1fc",
+            "link": "https://learn.microsoft.com/azure/machine-learning/prompt-flow/how-to-bulk-test-evaluate-flow?view=azureml-api-2",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Evaluate the performance/accuracy of the system with a known golden dataset which has the inputs and the correct answers. Leverage capabilities in PromptFlow for Evaluation.",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.network/frontdoorwebapplicationfirewallpolicies' | project policyName=name, policyId=id,policySku=sku.name, links=properties.securityPolicyLinks, enabledState=properties.policySettings.enabledState, mode=properties.policySettings.mode | mvexpand links | extend securityPolicy=links.id | extend securityPolicyParts=split(securityPolicy, '/') | extend profileId=strcat_array(array_slice(securityPolicyParts, 0, -3), '/') | project id=profileId, compliant=((enabledState=~'Enabled') and (mode=~'Prevention')), enabledState, mode",
-            "guid": "28b9ee82-b2c7-45aa-bc98-6de6f59a095d",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#enable-the-waf",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "68889535-e327-4897-b31b-67d67be5962a",
+            "link": "https://learn.microsoft.com/azure/architecture/ai-ml/architecture/baseline-openai-e2e-chat#azure-openai---performance-efficiency",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Enable the Azure Front Door WAF. Protect your application from a range of attacks.",
-            "waf": "Security"
+            "text": "Evaluate usage of Provisioned throughput model ",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "2902d8cc-1b0c-4495-afad-624ab70f7bd6",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#tune-your-waf",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "cd288bed-6b17-4cb8-8454-51e1aed3453a",
+            "link": "https://learn.microsoft.com/azure/ai-services/content-safety/overview",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Tune the Azure Front Door WAF for your workload by configuring the WAF in Detection mode to reduce and fix false positive detections.",
-            "waf": "Security"
+            "text": "Review and implement Azure AI content safety",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "17ba124b-127d-42b6-9322-388d5b2bbcfc",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/application-gateway-waf-request-size-limits#request-body-inspection",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "1193846d-697c-4b39-8ed1-6b2d186f0a02",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#system-level-throughput",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Enable request body inspection feature enabled in Azure Front Door WAF policy.",
-            "waf": "Security"
+            "text": "Define and evaluate the throughput of the system based on tokens & response per minute and align with requirements",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "49a98f2b-ec22-4a87-9415-6a10b00d6555",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#enable-default-rule-sets",
-            "service": "Front Door",
-            "severity": "High",
-            "text": "Enable the Azure Front Door WAF default rule sets. The default rule sets detect and block common attacks.",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "41addde6-8a47-47cd-bb48-61bc3bc10ae6",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#improve-performance",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Improve latency of the system by limiting token sizes, streaming options for applications like chatbots or conversational interfaces. Streaming can enhance the perceived performance of Azure OpenAI applications by delivering responses to users in an incremental manner",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "147a13d4-2a2f-4824-a524-f5855b52b946",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#enable-bot-management-rules",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "6e25d4d5-a3ae-4c2c-9e24-36b0336cb45e",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#batching",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Estimate elasticity demands to determine synchronous and batch request segregation based on priority. For high priority, use synchronous approach and for low priority, asynchronous batch processing with queue is preferred",
+            "waf": "Performance"
+        },
+        {
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "5bda4332-4f24-4811-9331-82ba51752694",
+            "link": "https://github.com/Azure/azure-openai-benchmark/",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Enable the Azure Front Door WAF bot protection rule set. The bot rules detect good and bad bots.",
-            "waf": "Security"
+            "text": "Benchmark token consumption requirements based on estimated demands from consumers. Consider using the Azure OpenAI benchmarking tool to help you validate the throughput if you are using Provisioned Throughput Unit deployments",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "d7dcdcb9-0d99-44b9-baab-ac7570ede79a",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#use-the-latest-ruleset-versions",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "4008ae7d-7e47-4432-96d8-bdcf55bce619",
+            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/optimizing-azure-openai-a-guide-to-limits-quotas-and-best/ba-p/4076268",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Use the latest Azure Front Door WAF rule set version. Rule set updates are regularly updated to take account of the current threat landscape.",
-            "waf": "Security"
+            "text": "If you are using Provisioned Throughput Units (PTUs), consider deploying a token-per-minute (TPM) deployment for overflow requests. Use a gateway to route requests to the TPM deployment when the PTU limits are reached.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "b9620385-1cde-418f-914b-a84a06982ffc",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#add-rate-limiting",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Add rate limiting to the Azure Front Door WAF. Rate limiting blocks clients accidentally or intentionally sending large amounts of traffic in a short period of time.",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "e8a13f98-8794-424d-9267-86d60b96c97b",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/models",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Choose the right model for the right task. Pick models with right tradeoff between speed, quality of response and output complexity",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "6dc36c52-0124-4ffe-9eaf-23ec1282dedb",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#use-a-high-threshold-for-rate-limits",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "e9951904-8384-45c9-a6cb-2912156a1147",
+            "link": "https://github.com/Azure/azure-openai-benchmark/",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Use a high threshold for Azure Front Door WAF rate limits. High rate limit thresholds avoid blocking legitimate traffic, while still providing protection against extremely high numbers of requests that might overwhelm your infrastructure.",
-            "waf": "Security"
+            "text": "Have a baseline for performance without fine-tuning for knowing whether or not fine-tuning has improved model performance",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "388a3d0e-0a43-4367-90b2-3dd2aeece5ee",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#geo-filter-traffic",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "5e39f541-accc-4d97-a376-bcdb3750ab2a",
+            "link": "https://learn.microsoft.com/azure/architecture/ai-ml/architecture/baseline-openai-e2e-chat#azure-openai---reliability",
+            "service": "OpenAI",
             "severity": "Low",
-            "text": "If you are not expecting traffic from all geographical regions, use geo-filters to block traffic from non-expected countries.",
-            "waf": "Security"
+            "text": "Deploy multiple OAI instances across regions",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "00acd8a9-6975-414f-8491-2be6309893b8",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#specify-the-unknown-zz-location",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Specify the unknown (ZZ) location when geo-filtering traffic with the Azure Front Door WAF. Avoid accidentally blocking legitimate requests when IP addresses can't be geo-matched.",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "b039da6d-55d7-4c89-8adb-107d5325af62",
+            "link": "https://learn.microsoft.com/azure/architecture/ai-ml/architecture/baseline-openai-e2e-chat#azure-openai---reliability",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Implement retry & healthchecks with Gateway pattern like APIM",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "4cea4050-7946-4a7c-89e6-b021b73c352d",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#add-diagnostic-settings-to-save-your-wafs-logs",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "5ca44e46-85e2-4223-ace8-bb12308ca5f1",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/quota?tabs=rest#introduction-to-quota",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Capture logs and metrics by turning on Diagnostic Settings. Include resource activity logs, access logs, health probe logs, and WAF logs. Set up alerts.",
-            "waf": "Operations"
+            "text": "Ensure having adequate quotas of TPM & RPM for the workload",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "845f5f91-9c21-4674-a725-5ce890850e20",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#send-logs-to-microsoft-sentinel",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "ec723923-7a15-42d6-ac5e-402925387e5c",
+            "link": "https://www.microsoft.com/research/project/guidelines-for-human-ai-interaction/",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Send Azure Front Door WAF logs to Microsoft Sentinel.",
-            "waf": "Operations"
+            "text": "Review the considerations in HAI toolkit guidance and apply those interaction practices for the slution",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "3bb0a854-ea3d-4212-bd8e-3f0cb7792b02",
-            "link": "https://learn.microsoft.com/azure/frontdoor/routing-methods",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "7f154e3a-a369-4282-ae7e-316183687a04",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/business-continuity-disaster-recovery",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Choose a routing method that supports your deployment strategy. The weighted method, which distributes traffic based on the configured weight coefficient, supports active-active models. A priority-based value that configures the primary region to receive all traffic and send traffic to the secondary region as a backup supports active-passive models. Combine the preceding methods with latency so that the origin with the lowest latency receives traffic.",
+            "text": "Deploy separate fine tuned models across regions if finetuning is employed",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend healthprobe=tostring(properties.healthProbeSettings) | project origingroupname=name, id, tags, resourceGroup, subscriptionId, healthprobe, frontDoorId | join ( cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/Origins' | extend origingroupname = tostring(properties.originGroupName) ) on origingroupname | summarize origincount=count(), enabledhealthprobecount=countif(healthprobe != '') by origingroupname, id, tostring(tags), resourceGroup, subscriptionId, frontDoorId | extend compliant = origincount > 1 | project id = frontDoorId, compliant",
-            "guid": "c3a769e4-cc78-40a9-b36a-f9bcab19ec2d",
-            "link": "https://learn.microsoft.com/azure/frontdoor/quickstart-create-front-door",
-            "service": "Front Door",
-            "severity": "High",
-            "text": "Support redundancy by having multiple origins in one or more back-end pools. Always have redundant instances of your application and make sure each instance exposes an endpoint or origin. You can place those origins in one or more back-end pools.",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "77a1f893-5bda-4433-84f2-4811633182ba",
+            "link": "https://learn.microsoft.com/azure/backup/backup-overview",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Regularly backup and replicate critical data to ensure data availability and recoverability in case of data loss or system failures. Leverage Azure's backup and disaster recovery services to protect your data.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "999852be-2137-4179-8fc3-30d1df6fed1d",
-            "link": "https://learn.microsoft.com/azure/frontdoor/troubleshoot-issues#troubleshooting-steps",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Set a timeout on forwarding requests to the back end. Adjust the timeout setting according to your endpoints' needs. If you don't, Azure Front Door might close the connection before the origin sends the response. You can also lower the default timeout for Azure Front Door if all of your origins have a shorter timeout.",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type == 'microsoft.search/searchservices' | extend compliant = (sku.name != 'free' and properties.replicaCount >= 3) | project id, compliant",
+            "guid": "95b96ad8-844c-4e3b-8b38-b876ba2cf204",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Azure AI search service tiers should be choosen to have a SLA ",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "17bf6351-3e5e-41f1-87bb-d5ad0b4e3de6",
-            "link": "https://learn.microsoft.com/azure/frontdoor/routing-methods#23session-affinity",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Decide if your application requires session affinity. If you have high reliability requirements, we recommend that you disable session affinity.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "99013a5d-3ce4-474d-acbd-8682a6abca2a",
+            "link": "https://learn.microsoft.com/purview/purview",
+            "service": "OpenAI",
+            "severity": "Low",
+            "text": "Classify data and sensitivity, labeling with Microsoft Purview before generating the embeddings and make sure to treat the embeddings generated with same sensitivity and classification",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "425bfb31-94c4-4007-b9ae-46da9fe57cc7",
-            "link": "https://learn.microsoft.com/azure/frontdoor/origin?pivots=front-door-standard-premium#origin-host-header",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Send the host header to the back end. The back-end services should be aware of the host name so that they can create rules to accept traffic only from that host.",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "4fda1dbf-3dd9-45d4-ac7c-891dca1f6d56",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/use-your-data-securely",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Encrypt data used for RAG with SSE/Disk encryption with optional BYOK",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "81a5398a-2414-450f-9fc3-e048bc65784c",
-            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-caching",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Use caching for endpoints that support it.",
-            "waf": "Cost"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "59ae558b-937d-4498-9e11-12dbd7ba012f",
+            "link": "https://learn.microsoft.com/azure/search/search-security-overview",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Ensure TLS is enforced for data in transit across data sources, AI search used for Retrieval-Augmented Generation (RAG) and LLM communication",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups' | extend frontDoorId = substring(id, 0, indexof(id, '/origingroups')) | extend healthprobe=tostring(properties.healthProbeSettings) | project origingroupname=name, id, tags, resourceGroup, subscriptionId, healthprobe, frontDoorId | join ( cdnresources | where type =~ 'microsoft.cdn/profiles/origingroups/Origins' | extend origingroupname = tostring(properties.originGroupName) ) on origingroupname | summarize origincount=count(), enabledhealthprobecount=countif(healthprobe != '') by origingroupname, id, tostring(tags), resourceGroup, subscriptionId, frontDoorId | extend compliant = origincount > 1 or (origincount == 1 and enabledhealthprobecount == 0) | project id = frontDoorId, compliant",
-            "guid": "34069d73-e4de-46c5-a36f-625f87575a56",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#disable-health-probes-when-theres-only-one-origin-in-an-origin-group",
-            "service": "Front Door",
-            "severity": "Low",
-            "text": "Disable health checks in single back-end pools. If you have only one origin configured in your Azure Front Door origin group, these calls are unnecessary. This is only recommended if you can't have multiple origins in your endpoint.",
-            "waf": "Cost"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "7b94ef6e-047d-42ea-8992-b1cd6e2054b2",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/role-based-access-control",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Use RBAC to manage access to Azure OpenAI services. Assign appropriate permissions to users and restrict access based on their roles and responsibilities",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "c92d6786-cdd1-444d-9cad-934a192a276a",
-            "link": "https://learn.microsoft.com/azure/frontdoor/standard-premium/how-to-reports",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9769e4a6-91e8-4838-ac93-6667e13c0056",
+            "link": "https://learn.microsoft.com/azure/security/fundamentals/data-encryption-best-practices",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "We recommend using the Premium Tier for leveraging the Security reports while the Standard Azure Front Door Profile provides only traffic reports under built-in analytics/reports.",
-            "waf": "Operations"
+            "text": "Implement data encryption,  masking or redaction techniques to hide sensitive data or replace it with obfuscated values in non-production environments or when sharing data for testing or troubleshooting purposes",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "440cf7de-30a1-4550-ab50-c9f6eac140cd",
-            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-wildcard-domain",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Use wildcard TLS certificates when possible.",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "74b1e945-b459-4837-be7a-d6c6d3b375a5",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/ai-onboarding",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Utilize Azure Defender to detect and respond to security threats and set up monitoring and alerting mechanisms to identify suspicious activities or breaches. Leverage Azure Sentinel for advanced threat detection and response",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "556e2733-6ca9-4edd-9cc7-26de66d46c2e",
-            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-caching",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "c7acbe48-abe5-44cd-99f2-e87768468c55",
+            "link": "https://techcommunity.microsoft.com/t5/azure-storage-blog/managing-long-term-log-retention-or-any-business-data/ba-p/2494791",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Optimize your application query string for caching. For purely static content, ignore query strings to maximize your use of the cache. If your application uses query strings, consider including them in the cache key. Including the query strings in the cache key allows Azure Front Door to serve cached responses or other responses, based on your configuration.",
-            "waf": "Performance"
+            "text": "Establish data retention and disposal policies to adhere to compliance regulations. Implement secure deletion methods for data that is no longer required and maintain an audit trail of data retention and disposal activities",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "c0b7e55e-fcab-4e66-bdae-bd0290f6aece",
-            "link": "https://learn.microsoft.com/azure/frontdoor/standard-premium/how-to-compression",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "Use file compression when you're accessing downloadable content.",
-            "waf": "Performance"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "a9c27d9c-42bb-46bd-8c69-99a246f3389a",
+            "link": "https://learn.microsoft.com/azure/ai-services/content-safety/concepts/jailbreak-detection",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Implement Prompt shields and groundedness detection using Content Safety ",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.network/frontdoors' and properties['resourceState'] !~ 'migrated' | extend compliant = false | project id, compliant",
-            "guid": "cb8eb8c0-aa73-4a26-a495-6eba8dc4a243",
-            "link": "https://learn.microsoft.com/azure/cdn/tier-migration",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "a775c6ee-95b9-46ad-a844-ce3b2b38b876",
+            "link": "https://learn.microsoft.com/azure/compliance/",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Consider migrating to Standard or Premium SKU if you are using Classic Azure Front Door currently as Classic Azure Front Door will be deprecated by March 2027.",
-            "waf": "Operations"
+            "text": "Ensure compliance with relevant data protection regulations, such as GDPR or HIPAA, by implementing privacy controls and obtaining necessary consents or permissions for data processing activities.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "67c33697-15b1-4752-aeee-0b9b588defc4",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/networking/global-web-applications/mission-critical-content-delivery",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "ba2cf204-9901-43a5-b3ce-474dccbd8682",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Consider using Traffic Manager load balancing Azure Front Door and a third party CDN provider CDN profile for mission critical high availability scenario. ",
-            "waf": "Reliability"
+            "text": "Educate your employees about data security best practices, the importance of handling data securely, and potential risks associated with data breaches. Encourage them to follow data security protocols diligently.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "972cd4cd-25b0-4b70-96e9-eab4bfd32907",
-            "link": "https://learn.microsoft.com/azure/app-service/app-service-ip-restrictions?tabs=azurecli#restrict-access-to-a-specific-azure-front-door-instance",
-            "service": "Front Door",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "eae01e6e-842e-452f-9721-d928c1b1cd52",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "When using Front Door with origin as App services, consider locking down the traffic to app services only through Azure Front Door using access restrictions. ",
+            "text": "Keep production data separate from development and testing data. Only use real sensitive data in production and utilize anonymized or synthetic data in development and test environments.",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "ab5351f6-383a-45ed-9c5e-b143b16db40a",
-            "link": "https://learn.microsoft.com/azure/aks/use-windows-hpc",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required for AKS Windows workloads HostProcess containers can be used",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "1e54a29a-9de3-499c-bd7b-28dc93555620",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "If you have varying levels of data sensitivity, consider creating separate indexes for each level. For instance, you could have one index for general data and another for sensitive data, each governed by different access protocols",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "a280dcf5-90ce-465d-b8e1-3f9ccbd46926",
-            "link": "https://learn.microsoft.com/azure/azure-functions/functions-kubernetes-keda",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use KEDA if running event-driven workloads",
-            "waf": "Performance"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "2bfe4564-b0d8-434a-948b-263e6dd60512",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Take segregation a step further by placing sensitive datasets in different instances of the service. Each instance can be controlled with its own specific set of RBAC policies",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "26886d20-b66c-457b-a591-19bf8e8f5c58",
-            "link": "https://dapr.io/",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use Dapr to ease microservice development",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "a36498f6-dbad-438e-ad53-cc7ce1d7aaab",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Recognize that embeddings and vectors generated from sensitive information are themselves sensitive. This data should be afforded the same protective measures as the source material",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (sku.tier=='Paid') | distinct id,compliant",
-            "guid": "71d41e36-10cc-457b-9a4b-1410d4395898",
-            "link": "https://learn.microsoft.com/azure/aks/uptime-sla",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "3571449a-b805-43d8-af89-dc7b33be2a1a",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/role-based-access-control",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Use the SLA-backed AKS offering",
-            "waf": "Reliability"
+            "text": "Apply RBAC to th data stores having embeddings and vectors and scope access based on role's access requirements",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c1288b3c-6a57-4cfc-9444-51e1a3d3453a",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-scheduler",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use Disruption Budgets in your pod and deployment definitions",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type =~ 'Microsoft.CognitiveServices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (properties.privateEndpointConnections != '[]' and properties.publicNetworkAccess !~ 'enabled')",
+            "guid": "27f7b9e9-1be1-4f38-aef3-9812bd463cbb",
+            "link": "https://techcommunity.microsoft.com/t5/azure-architecture-blog/azure-openai-private-endpoints-connecting-across-vnet-s/ba-p/3913325",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Configure private endpoint for AI services to restrict service access within your network",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerregistry/registries",
-            "checklist": "Azure AKS Review",
-            "guid": "3c763963-7a55-42d5-a15e-401955387e5c",
-            "link": "https://learn.microsoft.com/azure/container-registry/container-registry-geo-replication",
-            "service": "ACR",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "ac8ac199-ebb9-41a3-9d90-cae2cc881370",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "If using a private registry, configure region replication to store images in multiple regions",
-            "waf": "Reliability"
+            "text": "Enforce strict inbound and outbound traffic control with Azure Firewall and UDRs and limit the external integration points",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "f82cb8eb-8c0a-4a63-a25a-4956eaa8dc4a",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/aks/eslz-cost-governance-with-kubecost",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use an external application such as kubecost to allocate costs to different users",
-            "waf": "Cost"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "6f7c0cba-fe51-4464-add4-57e927138b82",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Implement network segmentation and access controls to restrict access to the LLM application only to authorized users and systems and prevent lateral movement",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "4d3dfbab-9924-4831-a68d-fdf0d72f462c",
-            "link": "https://learn.microsoft.com/azure/aks/scale-down-mode",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use scale down mode to delete/deallocate nodes",
-            "waf": "Cost"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "7f42c78e-78cb-46a2-8ad1-90916e6a8d8f",
+            "link": "https://www.microsoft.com/research/blog/llmlingua-innovating-llm-efficiency-with-prompt-compression/",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Use prompt compression tools like LLMLingua or gprtrim",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "87e651ea-bc4a-4a87-a6df-c06a4b570ebc",
-            "link": "https://learn.microsoft.com/azure/aks/gpu-multi-instance",
-            "service": "AKS",
-            "severity": "Medium",
-            "text": "When required use multi-instance partitioning GPU on AKS Clusters",
-            "waf": "Cost"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type =~ 'Microsoft.CognitiveServices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (isnotnull(identity))",
+            "guid": "1102cac6-eae0-41e6-b842-e52f4721d928",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/managed-identity",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Ensure that APIs and endpoints used by the LLM application are properly secured with authentication and authorization mechanisms, such as Managed identities,  API keys or OAuth, to prevent unauthorized access.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "2b72a08b-0410-4cd6-9093-e068a5cf27e8",
-            "link": "https://learn.microsoft.com/azure/aks/start-stop-nodepools",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If running a Dev/Test cluster use NodePool Start/Stop",
-            "waf": "Cost"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "c1b1cd52-1e54-4a29-a9de-399cfd7b28dc",
+            "link": "https://techcommunity.microsoft.com/t5/azure-architecture-blog/security-best-practices-for-genai-applications-openai-in-azure/ba-p/4027885",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Enforce strong end user authentication mechanisms, such as multi-factor authentication, to prevent unauthorized access to the LLM application and associated network resources",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.addonProfiles.azurepolicy) and properties.addonProfiles.azurepolicy.enabled==true) | distinct id,compliant",
-            "guid": "9ca48e4a-85e2-4223-bce8-bb12307ca5f1",
-            "link": "https://learn.microsoft.com/azure/governance/policy/concepts/policy-for-kubernetes",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "93555620-2bfe-4456-9b0d-834a348b263e",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Use Azure Policy for Kubernetes to ensure cluster compliance",
+            "text": "Implement network monitoring tools to detect and analyze network traffic for any suspicious or malicious activities. Enable logging to capture network events and facilitate forensic analysis in case of security incidents",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | project id,resourceGroup,name,pools=properties.agentPoolProfiles | project id,name,resourceGroup,poolcount=array_length(pools) | extend compliant = (poolcount > 1)",
-            "guid": "6f158e3e-a3a9-42c2-be7e-2165c3a87af4",
-            "link": "https://learn.microsoft.com/azure/aks/use-system-pools",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "6dd60512-a364-498f-9dba-d38ead53cc7c",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Separate applications from the control plane with user/system node pools",
+            "text": "Conduct security audits and penetration testing to identify and address any network security weaknesses or vulnerabilities in the LLM application's network infrastructure",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "a7a1f893-9bda-4477-98f2-4c116775c2ea",
-            "link": "https://learn.microsoft.com/azure/aks/use-system-pools",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type == 'microsoft.cognitiveservices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (tags != '{}')",
+            "guid": "e1d7aaab-3571-4449-ab80-53d89f89dc7b",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/tag-resources?tabs=json",
+            "service": "OpenAI",
             "severity": "Low",
-            "text": "Add taint to your system nodepool to make it dedicated",
-            "waf": "Security"
+            "text": "Azure AI Services are properly tagged for better management",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "55b46a94-8008-4ae7-b7e4-b475b6c8bdbf",
-            "link": "https://learn.microsoft.com/azure/container-registry/",
-            "service": "AKS",
-            "severity": "Medium",
-            "text": "Use a private registry for your images, such as ACR",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "77036e5e-6b4b-4ed3-b503-547c1347dc56",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations",
+            "service": "OpenAI",
+            "severity": "Low",
+            "text": "Azure AI Service accounts follows organizational naming conventions",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerregistry/registries",
-            "checklist": "Azure AKS Review",
-            "guid": "59bce65d-e8a0-43f9-9879-468d66a786d6",
-            "link": "https://learn.microsoft.com/azure/security-center/container-security",
-            "service": "ACR",
-            "severity": "Medium",
-            "text": "Scan your images for vulnerabilities",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "028a71ff-e1ce-415d-b3f0-d5e772d41e36",
+            "link": "https://learn.microsoft.com/azure/ai-services/diagnostic-logging",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Diagnostic logs in Azure AI services resources should be enabled",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "d167dd18-2b0a-4c24-8b99-9a646f8389a7",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-cluster-isolation",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type =~ 'Microsoft.CognitiveServices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (properties.disableLocalAuth == true)",
+            "guid": "11cc57b4-a4b1-4410-b439-58a8c2289b3d",
+            "link": "https://learn.microsoft.com/azure/ai-services/authentication",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Define app separation requirements (namespace/nodepool/cluster)",
+            "text": "Key access (local authentication) is recommended to be disabled for security.  After disabling key based access, Microsoft Entra ID becomes the only access method, which allows maintaining minimum privilege principle and granular control. ",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "5e3df584-eccc-4d97-a3b6-bcda3b50eb2e",
-            "link": "https://github.com/Azure/secrets-store-csi-driver-provider-azure",
-            "service": "AKS",
-            "severity": "Medium",
-            "text": "Store your secrets in Azure Key Vault with the CSI Secrets Store driver",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "6b57cfc6-5546-41e1-a3e3-453a3c863964",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Store and manage keys securely using Azure Key Vault. Avoid hard-coding or embedding sensitive keys within your LLM application's code and retrieve them securely from Azure Key Vault using managed identities",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "b03dda6d-58d7-4c89-8ddb-107d5769ae66",
-            "link": "https://learn.microsoft.com/azure/aks/update-credentials",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "8b652d6c-15f5-4129-9539-8e6ded227dd1",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "If using Service Principals for the cluster, refresh credentials periodically (like quarterly)",
+            "text": "Regularly rotate and expire keys stored in Azure Key Vault to minimize the risk of unauthorized access.",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "e7ba73a3-0508-4f80-806f-527db30cee96",
-            "link": "https://learn.microsoft.com/azure/aks/use-kms-etcd-encryption",
-            "service": "AKS",
-            "severity": "Medium",
-            "text": "If required add Key Management Service etcd encryption",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "adfe27be-e297-401a-a352-baaab79b088d",
+            "link": "https://github.com/openai/tiktoken",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Use tiktoken to understand token sizes for token optimizations in conversational mode",
+            "waf": "Cost Optimization"
+        },
+        {
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "42b06c21-d799-49a6-96f4-389a7f42c78e",
+            "link": "https://learn.microsoft.com/azure/security/develop/secure-dev-overview",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Follow secure coding practices to prevent common vulnerabilities such as injection attacks, cross-site scripting (XSS), or security misconfigurations",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "ec8e4e42-0344-41b0-b865-9123e8956d31",
-            "link": "https://learn.microsoft.com/azure/confidential-computing/confidential-nodes-aks-overview",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required consider using Confidential Compute for AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "78c06a73-a22a-4495-9e6a-8dc4a20e27c3",
+            "link": "https://learn.microsoft.com/azure/devops/repos/security/github-advanced-security-dependency-scanning?view=azure-devops",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Setup a process to regularly update and patch the LLM libraries and other system components",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c9e95ffe-6dd1-4a17-8c5f-110389ca9b21",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/defender-for-containers-enable",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "e29711b1-352b-4eee-879b-588defc4972c",
+            "link": "https://learn.microsoft.com/legal/cognitive-services/openai/code-of-conduct",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Adhere to Azure OpenAI or other LLMs terms of use, policies and guidance and allowed use cases",
+            "waf": "Operational Excellence"
+        },
+        {
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "d3cd21bf-7703-46e5-b6b4-bed3d503547c",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs#base-series-and-codex-series-fine-tuned-models",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Consider using Defender for Containers",
-            "waf": "Security"
+            "text": "Understand difference in cost of base models and fine tuned models and token step sizes",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.servicePrincipalProfile.clientId=='msi') | distinct id,compliant",
-            "guid": "ed127dd1-42b0-46b2-8c69-99a646f3389a",
-            "link": "https://learn.microsoft.com/azure/aks/use-managed-identity",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "1347dc56-028a-471f-be1c-e15dd3f0d5e7",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#batching",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Use managed identities instead of Service Principals",
-            "waf": "Security"
+            "text": "Batch requests, where possible, to minimize the per-call overhead which can reduce overall costs. Ensure you optimize batch size",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = isnotnull(properties.aadProfile) | distinct id,compliant",
-            "guid": "7e42c78e-78c0-46a6-8a21-94956e698dc4",
-            "link": "https://learn.microsoft.com/azure/aks/managed-aad",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a8",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Integrate authentication with AAD (using the managed integration)",
-            "waf": "Security"
+            "text": "Set up a cost tracking system that monitors model usage and use that information to help inform model choices and prompt sizes",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "a2fe27b2-e287-401a-8352-beedf79b488d",
-            "link": "https://learn.microsoft.com/azure/aks/control-kubeconfig-access",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "166cd072-af9b-4141-a898-a535e737897e",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/quota?tabs=rest#understanding-rate-limits",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Limit access to admin kubeconfig (get-credentials --admin)",
-            "waf": "Security"
+            "text": "Set a maximum limit on the number of tokens per model response (max_tokens and the number of completions to generate). Optimize the size to ensure it is large enough for a valid response",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "eec4962c-c3bd-421b-b77f-26e5e6b3bec3",
-            "link": "https://learn.microsoft.com/azure/aks/manage-azure-rbac",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "3266b225-86f4-4a16-92bd-ddea8a487cde",
+            "link": "https://learn.microsoft.com/azure/search/vector-search-index-size?tabs=portal-vector-quota",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Integrate authorization with AAD RBAC",
-            "waf": "Security"
+            "text": "Plan and manage AI Search Vector storage",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "d4f3537c-1346-4dc5-9027-a71ffe1bd05d",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-identity",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "b4861bc3-bc14-4aeb-9e66-e8d9a3aec218",
+            "link": "https://learn.microsoft.com/azure/machine-learning/prompt-flow/how-to-end-to-end-llmops-with-prompt-flow?view=azureml-api-2",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Ensure deployment of Azure OpenAI instances across your various environments, such as development, test, and production supporting lrarning & experimentation. Apply LLMOps practices to automate the lifecycle management of your GenAI applications",
+            "waf": "Operational Excellence"
+        },
+        {
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "aa80932c-8ec9-4d1b-a770-26e5e6beba9e",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/provisioned-throughput-onboarding#understanding-the-provisioned-throughput-purchase-model",
+            "service": "OpenAI",
             "severity": "High",
-            "text": "Use namespaces for restricting RBAC privilege in Kubernetes",
-            "waf": "Security"
+            "text": "Evaluate usage of billing models - PAYG vs PTU. Start with PAYG and consider PTU when the usage is predictable in production since it offers dedicated memory and compute, reserved capacity, and consistent maximum latency for the specified model version",
+            "waf": "Cost Optimization"
+        },
+        {
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "e6436b07-36db-455f-9796-03334bdf9cc2",
+            "link": "https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/how-to-control-azure-openai-models/ba-p/4146793",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Evaluate the quality of  prompts and applications when switching between model versions",
+            "waf": "Operational Excellence"
+        },
+        {
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "3418db61-2712-4650-9bb4-7a393a080327",
+            "link": "https://learn.microsoft.com/azure/machine-learning/prompt-flow/concept-model-monitoring-generative-ai-evaluation-metrics?view=azureml-api-2",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Evaluate, monitor and refine your GenAI apps for features like groundedness, relevance, accuracy, coherence and fluency",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "d2e0d5d7-71d4-41e3-910c-c57b4a4b1410",
-            "link": "https://learn.microsoft.com/azure/aks/workload-identity-migration-sidecar",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "294798b1-578b-4219-a46c-eb5443513592",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "For Pod Identity Access Management use Azure AD Workload Identity (preview)",
-            "waf": "Security"
+            "text": "Evaluate your Azure AI Search results based on different search parameters",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "f4dcf690-1b30-407d-abab-6f8aa780d3a3",
-            "link": "https://learn.microsoft.com/azure/aks/managed-aad#non-interactive-sign-in-with-kubelogin",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "2744293b-b628-4537-a551-19b08e8f5854",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/fine-tuning-considerations",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "For AKS non-interactive logins use kubelogin (preview)",
-            "waf": "Security"
+            "text": "Look at fine tuning models as way of increasing accuracy only when you have tried other basic approaches like prompt engineering and RAG with your data",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.disableLocalAccounts==true) | distinct id,compliant",
-            "guid": "b085b1f2-3119-4771-8c9a-bbf4411810ec",
-            "link": "https://learn.microsoft.com/azure/aks/managed-aad#disable-local-accounts",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "287d9cec-166c-4d07-8af9-b141a898a535",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/advanced-prompt-engineering?pivots=programming-language-chat-completions",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Disable AKS local accounts",
-            "waf": "Security"
+            "text": "Use prompt engineering techniques to improve the accuracy of LLM responses",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "36abb0db-c118-4f4c-9880-3f30f9a2deb6",
-            "link": "https://learn.microsoft.com/azure/aks/managed-aad#configure-just-in-time-cluster-access-with-azure-ad-and-aks",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Configure if required Just-in-time cluster access",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "e737897e-71ca-47da-acfa-962a1594946d",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/red-teaming",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Red team your GenAI applications",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c4d7f4c6-79bf-45d0-aa05-ce8fc717e150",
-            "link": "https://learn.microsoft.com/azure/aks/managed-aad#use-conditional-access-with-azure-ad-and-aks",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Configure if required AAD conditional access for AKS",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "edb117e6-76aa-4f66-aca4-8e5a95f2223e",
+            "link": "https://www.microsoft.com/haxtoolkit/guideline/encourage-granular-feedback/",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Provide end users with scoring options for LLM responses and track these scores. ",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "e1123a7c-a333-4eb4-a120-4ee3f293c9f3",
-            "link": "https://learn.microsoft.com/azure/aks/use-group-managed-service-accounts",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required for Windows AKS workloads configure gMSA ",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "d5f3547c-c346-4d81-9028-a71ffe1b9b5d",
+            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/optimizing-azure-openai-a-guide-to-limits-quotas-and-best/ba-p/4076268",
+            "service": "OpenAI",
+            "severity": "High",
+            "text": "Consider Quota management practices. Use dynamic quota for certain use cases when your application can use extra capacity opportunistically or the application itself is driving the rate at which the Azure OpenAI API is called",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "1f711a74-3672-470b-b8b8-a2148d640d79",
-            "link": "https://learn.microsoft.com/azure/aks/use-managed-identity#use-a-pre-created-kubelet-managed-identity",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc410",
+            "link": "https://github.com/Azure/aoai-apim/blob/main/README.md",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "For finer control consider using a managed Kubelet Identity",
-            "waf": "Security"
+            "text": "Use Load balancer solutions like APIM based gateway for balancing load and capacity across services and regions",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "cbd8ac2a-aebc-4a2a-94da-1dbf3dc99248",
-            "link": "https://azure.github.io/application-gateway-kubernetes-ingress/setup/install-existing/",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc411",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/fine-tuning?tabs=turbo%2Cpython-new&pivots=programming-language-studio#import-training-data-from-azure-blob-store",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "If using AGIC, do not share an AppGW across clusters",
+            "text": "Follow the guidance for fine-tuning with large data files and import the data from an Azure blob store. Large files, 100 MB or larger, can become unstable when uploaded through multipart forms because the requests are atomic and can't be retried or resumed",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnull(properties.addonProfiles.httpApplicationRouting) or properties.addonProfiles.httpApplicationRouting.enabled==false) | distinct id,compliant",
-            "guid": "8008ae7d-7e4b-4475-a6c8-bdbf59bce65d",
-            "link": "https://learn.microsoft.com/azure/aks/http-application-routing",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Do not use AKS HTTP Routing Add-On, use instead the managed NGINX ingress with the application routing add-on.",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc412",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/quota?tabs=rest",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Manage rate limits for your model deployments and monitor usage of tokens per minute (TPM) and requests per minute (RPM) for pay-as-you-go deployments",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "7bacd7b9-c025-4a9d-a5d2-25d6bc5439d9",
-            "link": "https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc413",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitor-openai",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "For Windows workloads use Accelerated Networking",
-            "waf": "Performance"
+            "text": "Monitor provision-managed utilization if you're using the provisioned throughput payment model",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (tolower(properties.networkProfile.loadBalancerSku)=='standard') | distinct id,compliant",
-            "guid": "ba7da7be-9952-4914-a384-5d997cb39132",
-            "link": "https://learn.microsoft.com/azure/aks/load-balancer-standard",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Use the standard ALB (as opposed to the basic one)",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc414",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/content-filters",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Tune content filters to minimize false positives from overly aggressive filters",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "22fbe8d6-9b40-47ef-9011-25bb1a555a6b",
-            "link": "https://learn.microsoft.com/azure/aks/use-multiple-node-pools#add-a-node-pool-with-a-unique-subnet",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc415",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/encrypt-data-at-rest",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "If using Azure CNI, consider using different Subnets for NodePools",
+            "text": "Use customer-managed keys for fine-tuned models and training data that's uploaded to Azure OpenAI",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c3c39c98-6bb2-4c12-859a-114b5e3df584",
-            "link": "https://learn.microsoft.com/azure/private-link/private-link-overview",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "graph": "resources | where type == 'microsoft.cognitiveservices/accounts' and kind =~ 'contentsafety' | project id, compliant = 1",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc416",
+            "link": "https://learn.microsoft.com/azure/ai-services/content-safety/concepts/jailbreak-detection",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Use Private Endpoints (preferred) or Virtual Network Service Endpoints to access PaaS services from the cluster",
+            "text": "Implement jailbreak risk detection to safeguard your language model deployments against prompt injection attacks",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.networkProfile.networkPlugin=='azure') | distinct id,compliant",
-            "guid": "a0f61565-9de5-458f-a372-49c831112dbd",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-network",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Choose the best CNI network plugin for your requirements (Azure CNI recommended)",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc417",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitor-openai",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Use security controls like throttling, service isolation and gateway pattern to prevent attacks that might exhaust model usage quotas",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "7faf12e7-0943-4f63-8472-2da29c2b1cd6",
-            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
-            "service": "AKS",
-            "severity": "High",
-            "text": "If using Azure CNI, size your subnet accordingly considering the maximum number of pods per node",
-            "waf": "Performance"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a9",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Develop your cost model, considering prompt sizes. Understanding prompt input and response sizes and how text translates into tokens helps you create a viable cost model",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "22f54b29-bade-43aa-b1e8-c38ec9366673",
-            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
-            "service": "AKS",
-            "severity": "High",
-            "text": "If using Azure CNI, check the maximum pods/node (default 30)",
-            "waf": "Performance"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a1",
+            "link": "https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Consider model pricing and capabilities when you choose models. Start with less-costly models for less-complex tasks like text generation or completion tasks and for complex tasks like language translation or content understanding, consider using more advanced models. Optimize costs while still achieving the desired application performance",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "description": "For internal apps organizations often open the whole AKS subnet in their firewalls. This opens network access to the nodes too, and potentially to the pods as well (if using Azure CNI). If LoadBalancer IPs are in a different subnet, only this one needs to be available to the app clients. Another reason is that if the IP addresses in the AKS subnet are a scarce resource, consuming its IP addresses for services will reduce the maximum scalability of the cluster .",
-            "guid": "13c00567-4b1e-4945-a459-c373e7ed6162",
-            "link": "https://learn.microsoft.com/azure/aks/internal-lb",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If using private-IP LoadBalancer services, use a dedicated subnet (not the AKS subnet)",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a2",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Maximize Azure OpenAI price breakpoints like fine-tuning and model breakpoints like image generation to your advantage. Fine-tuning is charged per hour, use as much time as you have available per hour to improve results without slipping into the next billing period. The cost for generating 100 images is the same as the cost for 1 image",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "43f63047-22d9-429c-8b1c-d622f54b29ba",
-            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Size the service IP address range accordingly (it is going to limit the cluster scalability)",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a3",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Remove unused fine-tuned models when they're no longer being consumed to avoid incurring an ongoing hosting fee",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "57bf217f-6dc8-481c-81e2-785773e9c00f",
-            "link": "https://learn.microsoft.com/azure/aks/use-byo-cni",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required add your own CNI plugin",
-            "waf": "Security"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "7f42c78e-78cb-46a2-8ad1-90916e6a8d8g",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Create concise prompts that provide enough context for the model to generate a useful response. Also ensure that you optimize the limit of the response length.",
+            "waf": "Cost Optimization"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "4b3bb365-9458-44d9-9ed1-5c8f52890364",
-            "link": "https://learn.microsoft.com/azure/aks/use-multiple-node-pools#assign-a-public-ip-per-node-for-your-node-pools",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required configure Public IP per node in AKS",
-            "waf": "Performance"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "b4861bc3-bc14-4aeb-9e66-e8d9a3aec219",
+            "link": "https://learn.microsoft.com/azure/ai-services/create-account-bicep",
+            "service": "OpenAI",
+            "severity": "Medium",
+            "text": "Use infrastructure as code (IaC) to deploy Azure OpenAI, model deployments, and other infrastructure required for fine-tuning models",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "b3808b9f-a1cf-4204-ad01-3a923ce474db",
-            "link": "https://learn.microsoft.com/azure/aks/concepts-network",
-            "service": "AKS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Azure OpenAI Review",
+            "guid": "2744293b-b628-4537-a551-19b08e8f5855",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/multitenant/service/openai",
+            "service": "OpenAI",
             "severity": "Medium",
-            "text": "Use an ingress controller to expose web-based apps instead of exposing them with LoadBalancer-type services",
-            "waf": "Reliability"
+            "text": "Consider using dedicated model deployments per consumer group to provide per-model usage isolation that can help prevent noisy neighbors between your consumer groups",
+            "waf": "Operational Excellence"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "ccb534e7-416e-4a1d-8e93-533b53199085",
-            "link": "https://learn.microsoft.com/azure/aks/nat-gateway",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use Azure NAT Gateway as outboundType for scaling egress traffic",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "d7941d4a-7b6f-458f-8714-2f8f8c059ad4",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-error-handling-policies",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Implement an error handling policy at the global level",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "8ee9a69a-1b58-4b1e-9c61-476e110a160b",
-            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni#dynamic-allocation-of-ips-and-enhanced-subnet-support",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "0b0c0765-ff37-4369-90bd-3eb23ce71b08",
+            "link": "https://learn.microsoft.com/azure/api-management/set-edit-policies?tabs=form#use-base-element-to-set-policy-evaluation-order",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Use Dynamic allocations of IPs in order to avoid Azure CNI IP exhaustion",
-            "waf": "Reliability"
+            "text": "Ensure all APIs policies include a <base/> element.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.networkProfile.outboundType=='userDefinedRouting') | distinct id,compliant",
-            "guid": "3b365a91-7ecb-4e48-bbe5-4cd7df2e8bba",
-            "link": "https://learn.microsoft.com/azure/aks/limit-egress-traffic",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Filter egress traffic with AzFW/NVA if your security requirements mandate it",
-            "waf": "Security"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "a5c45b03-93b6-42fe-b16b-8fccb6a79902",
+            "link": "https://learn.microsoft.com/azure/api-management/policy-fragments",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Use Policy Fragments to avoid repeating same policies definitions across multiple APIs",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = ((isnull(properties.apiServerAccessProfile.enablePrivateCluster) or properties.apiServerAccessProfile.enablePrivateCluster==false) and isnotnull(properties.apiServerAccessProfile.authorizedIPRanges)) | distinct id,compliant",
-            "guid": "c4581559-bb91-463e-a908-aed8c44ce3b2",
-            "link": "https://learn.microsoft.com/azure/aks/api-server-authorized-ip-ranges",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "c3818a95-6ff3-4474-88dc-e809b46dad6a",
+            "link": "https://learn.microsoft.com/azure/api-management/monetization-support",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "If using a public API endpoint, restrict the IP addresses that can access it",
-            "waf": "Security"
+            "text": "If you are planning to monetize your APIs, review the 'monetization support' article for best practices",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | where isnotnull(properties.apiServerAccessProfile.enablePrivateCluster) | extend compliant = (properties.apiServerAccessProfile.enablePrivateCluster==true) | distinct id, compliant",
-            "guid": "ecccd979-3b6b-4cda-9b50-eb2eb03dda6d",
-            "link": "https://learn.microsoft.com/azure/aks/private-clusters",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "a7d0840a-c8c4-4e83-adec-5ca578eb4049",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-use-azure-monitor#resource-logs",
+            "service": "APIM",
             "severity": "High",
-            "text": "Use private clusters if your requirements mandate it",
-            "waf": "Security"
+            "text": "Enable Diagnostics Settings to export logs to Azure Monitor",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | where isnotnull(properties.apiServerAccessProfile.enablePrivateCluster) | extend compliant = (properties.apiServerAccessProfile.enablePrivateCluster==true) | distinct id, compliant",
-            "guid": "ce7f2a7c-297c-47c6-adea-a6ff838db665",
-            "link": "https://learn.microsoft.com/azure/aks/use-network-policies",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "8691fa38-45ed-4299-a247-fecd98d35deb",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-app-insights",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "For Windows 2019 and 2022 AKS nodes Calico Network Policies can be used ",
-            "waf": "Security"
+            "text": "Enable Application Insights for more detailed telemetry",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = isnotnull(properties.networkProfile.networkPolicy) | distinct id,compliant",
-            "guid": "58d7c892-ddb1-407d-9769-ae669ca48e4a",
-            "link": "https://learn.microsoft.com/azure/aks/use-network-policies",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "55fd27bb-76ac-4a91-bc37-049e885be6b7",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-use-azure-monitor",
+            "service": "APIM",
             "severity": "High",
-            "text": "Enable a Kubernetes Network Policy option (Calico/Azure)",
-            "waf": "Security"
+            "text": "Configure alerts on the most critical metrics",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "85e2223e-ce8b-4b12-907c-a5f16f158e3e",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-network",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "39460bdb-156f-4dc2-a87f-1e8c11ab0998",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#certificate-management-in-azure-key-vault",
+            "service": "APIM",
             "severity": "High",
-            "text": "Use Kubernetes network policies to increase intra-cluster security",
+            "text": "Ensure that custom SSL certificates are stored an Azure Key Vault so they can be securely accessed and updated",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "a3a92c2d-e7e2-4165-a3a8-7af4a7a1f893",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-network",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "e9217997-5f6c-479d-8576-8f2adf706ec8",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#azure-ad-authentication-required-for-data-plane-access",
+            "service": "APIM",
             "severity": "High",
-            "text": "Use a WAF for web workloads (UIs or APIs)",
+            "text": "Protect incoming requests to APIs (data plane) with Azure AD",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "Resources | where type=~'microsoft.containerservice/managedclusters' | project resourceGroup,name,pools=properties.agentPoolProfiles | mv-expand pools | project subnetId=tostring(pools.vnetSubnetID) | where isnotempty(subnetId) | join (Resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,enableDdosProtection=tostring(properties.enableDdosProtection),subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,enableDdosProtection,subnetId=tostring(subnets.id)) on subnetId | distinct id,resourceGroup,name,enableDdosProtection | extend compliant = (enableDdosProtection == 'true')",
-            "guid": "9bda4776-8f24-4c11-9775-c2ea55b46a94",
-            "link": "https://learn.microsoft.com/azure/virtual-network/ddos-protection-overview",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "5e5f64ba-c90e-480e-8888-398d96cf0bfb",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-aad",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Use DDoS Standard in the AKS Virtual Network",
+            "text": "Use Microsoft Entra ID to authenticate users in the Developer Portal",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "Resources | where type=~'microsoft.containerservice/managedclusters' | project resourceGroup,name,pools=properties.agentPoolProfiles | mv-expand pools | project subnetId=tostring(pools.vnetSubnetID) | where isnotempty(subnetId) | join (Resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,enableDdosProtection=tostring(properties.enableDdosProtection),subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,enableDdosProtection,subnetId=tostring(subnets.id)) on subnetId | distinct id,resourceGroup,name,enableDdosProtection | extend compliant = (enableDdosProtection == 'true')",
-            "guid": "6c46b91a-1107-4485-ad66-3183e2a8c266",
-            "link": "https://learn.microsoft.com/azure/aks/http-proxy",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required add company HTTP Proxy",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "f8e574ce-280f-49c8-b2ef-68279b081cf3",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-create-groups",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Create appropriate groups to control the visibility of the products",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "e9855d04-c3c3-49c9-a6bb-2c12159a114b",
-            "link": "https://learn.microsoft.com/azure/aks/servicemesh-about",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "06862505-2d9a-4874-9491-2837b00a3475",
+            "link": "https://learn.microsoft.com/azure/api-management/backends",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Use Backends feature to eliminate redundant API backend configurations",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "03b125d5-b69b-4739-b7fd-84b86da4933e",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-properties?tabs=azure-portal",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Use Named Values to store common values that can be used in policies",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = ( sku.name == 'Premium' and  isnotnull(properties.additionalLocations)) | distinct id, compliant",
+            "guid": "beae759e-4ddb-4326-bf26-47f87d3454b6",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-deploy-multi-region",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "For DR, leverage the premium tier with deployments scaled across two or more regions for 99.99% SLA",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = ( sku.name == 'Premium' and  isnotnull(zones) and sku.capacity >= 2 ) | distinct id, compliant",
+            "guid": "9c8d1664-dd9a-49d4-bd83-950af0af4044",
+            "link": "https://learn.microsoft.com/azure/api-management/high-availability",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Consider using a service mesh for advanced microservice communication management",
-            "waf": "Security"
+            "text": "Deploy at least one unit in two or more availability zones for an increased SLA of 99.99%",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "67f7a9ed-5b31-4f38-a3f3-9812b2463cff",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/container-insights-metric-alerts",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "8d2db6e8-85c6-4118-a52c-ae76a4f27934",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#service-native-backup-capability",
+            "service": "APIM",
             "severity": "High",
-            "text": "Configure alerts on the most critical metrics (see Container Insights for recommendations)",
-            "waf": "Operations"
+            "text": "Ensure there is an automated backup routine",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "337453a3-cc63-4963-9a65-22ac19e80696",
-            "link": "https://learn.microsoft.com/azure/advisor/advisor-get-started",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Check regularly Azure Advisor for recommendations on your cluster",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "43e60b94-7bca-43a2-aadf-efb04d63a485",
+            "link": "https://learn.microsoft.com/azure/api-management/retry-policy",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Use Policies to add a fail-over backend URL and caching to reduce failing calls.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "3aa70560-e7e7-4968-be3d-628af35b2ced",
-            "link": "https://learn.microsoft.com/azure/aks/certificate-rotation",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "8210699f-8d43-45c2-8f19-57e54134bd8f",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-log-event-hubs",
+            "service": "APIM",
             "severity": "Low",
-            "text": "Enable AKS auto-certificate rotation",
+            "text": "If you need to log at high performance levels, consider Event Hubs policy",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "e189c599-df0d-45a7-9dd4-ce32c1881370",
-            "link": "https://learn.microsoft.com/azure/aks/supported-kubernetes-versions",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Have a regular process to upgrade your kubernetes version periodically (quarterly, for example), or use the AKS autoupgrade feature",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "121bfc39-fa7b-4096-b93b-ab56c1bc0bed",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-sample-flexible-throttling",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Apply throttling policies to control the number of requests per second",
+            "training": "https://learn.microsoft.com/training/modules/protect-apis-on-api-management/",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "6f7c4c0d-4e51-4464-ad24-57ed67138b82",
-            "link": "https://learn.microsoft.com/azure/aks/node-updates-kured",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Use kured for Linux node upgrades in case you are not using node-image upgrade",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | join kind = leftouter (resources | where type == 'microsoft.insights/autoscalesettings' | extend targetResourceUri = tostring(properties.targetResourceUri)) on $left.id == $right.targetResourceUri | extend compliant = (sku.name == 'Premium' and isnotempty(targetResourceUri) and properties1.enabled == true) | distinct id, compliant",
+            "guid": "bb5f356b-3daf-47a2-a9ee-867a8100bbd5",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-autoscale",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Configure autoscaling to scale out the number of instances when the load increases",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "139c9580-ade3-426a-ba09-cf157d9f6477",
-            "link": "https://learn.microsoft.com/azure/aks/node-image-upgrade",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Have a regular process to upgrade the cluster node images periodically (weekly, for example)",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "84b94abb-59b6-4b9d-8587-3413669468e8",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-provision-self-hosted-gateway",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Deploy self-hosted gateways where Azure doesn't have a region close to the backend APIs.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "0102ce16-ee30-41e6-b882-e52e4621dd68",
-            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/bedrock/bedrock-automated-deployments",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Consider gitops to deploy applications or cluster configuration to multiple clusters",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "1fe8db45-a017-4888-8c4d-4422583cfae0",
+            "link": "https://learn.microsoft.com/azure/api-management/upgrade-and-scale#upgrade-and-scale",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Use the premium tier for production workloads.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "d7672c26-7602-4482-85a4-14527fbe855c",
-            "link": "https://learn.microsoft.com/azure/aks/command-invoke",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Consider using AKS command invoke on private clusters",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "1b8d68a4-66cd-44d5-ba94-3ee94440e8d6",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-deploy-multi-region#-route-api-calls-to-regional-backend-services",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "In multi-region model, use Policies to route the requests to regional backends based on availability or latency.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "31d7aaab-7571-4449-ab80-53d89e89d17b",
-            "link": "https://learn.microsoft.com/azure/aks/node-auto-repair#node-autodrain",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "For planned events consider using Node Auto Drain",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "46f07d33-ef9a-44e8-8f98-67c097c5d8cd",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits#api-management-limits",
+            "service": "APIM",
+            "severity": "High",
+            "text": "Be aware of APIM's limits",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "ed0fda7f-211b-47c7-8b6e-c18873fb473c",
-            "link": "https://learn.microsoft.com/azure/aks/faq",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type =~ 'microsoft.apimanagement/service' | extend compliant = (properties.platformVersion != 'stv1') | project id, compliant",
+            "guid": "46f07d33-ef9a-44e8-8f98-67c097c5d8ce",
+            "link": "https://learn.microsoft.com/en-us/azure/api-management/migrate-stv1-to-stv2",
+            "service": "APIM",
             "severity": "High",
-            "text": "Develop own governance practices to make sure no changes are performed by operators in the node RG (aka 'infra RG')",
-            "waf": "Operations"
+            "text": "Upgrade the platform version and follow lifecyle. stv1 is retirng on 31 August 2024",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (properties.nodeResourceGroup !startswith 'MC_') | distinct id,compliant",
-            "guid": "73b32a5a-67f7-4a9e-b5b3-1f38c3f39812",
-            "link": "https://learn.microsoft.com/azure/aks/cluster-configuration",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Use custom Node RG (aka 'Infra RG') name",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "10f58602-f0f9-4d77-972a-956f6e0f2600",
+            "link": "https://learn.microsoft.com/en-us/azure/api-management/self-hosted-gateway-overview",
+            "service": "APIM",
+            "severity": "High",
+            "text": "Ensure that the self-hosted gateway deployments are resilient.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "b2463cff-e189-4c59-adf0-d5a73dd4ce32",
-            "link": "https://kubernetes.io/docs/setup/release/notes/",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "7519e385-a88b-4d34-966b-6269d686e890",
+            "link": "https://learn.microsoft.com/azure/api-management/front-door-api-management",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Do not use deprecated Kubernetes APIs in your YAML manifests",
-            "waf": "Operations"
-        },
-        {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c1881370-6f7c-44c0-b4e5-14648d2457ed",
-            "link": "https://learn.microsoft.com/azure-stack/aks-hci/adapt-apps-mixed-os-clusters",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Taint Windows nodes",
-            "waf": "Operations"
+            "text": "Use Azure Front Door in front of APIM for multi-region deployment",
+            "waf": "Performance"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "67138b82-0102-4ce1-9ee3-01e6e882e52e",
-            "link": "https://learn.microsoft.com/virtualization/windowscontainers/deploy-containers/version-compatibility?tabs=windows-server-20H2%2Cwindows-10-20H2",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Keep windows containers patch level in sync with host patch level",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (isnotnull(properties.virtualNetworkConfiguration)) | distinct id, compliant",
+            "guid": "cd45c90e-7690-4753-930b-bf290c69c074",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#virtual-network-integration",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Deploy the service within a Virtual Network (VNet)",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "description": "Via Diagnostic Settings at the cluster level",
-            "guid": "5b56ad48-408f-4e72-934c-476ba280dcf5",
-            "link": "https://learn.microsoft.com/azure/aks/monitor-aks",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Send master logs (aka API logs) to Azure Monitor or your preferred log management solution",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "02661582-b3d1-48d1-9d7b-c6a918a0ca33",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#network-security-group-support",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Deploy network security groups (NSG) to your subnets to restrict or monitor traffic to/from APIM.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "64d1a846-e28a-4b6b-9a33-22a635c15a21",
-            "link": "https://learn.microsoft.com/azure/aks/node-pool-snapshot",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If required use nodePool snapshots",
-            "waf": "Cost"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (properties.virtualNetworkType == 'None' and isnotnull(properties.privateEndpointConnections)) | distinct id, compliant",
+            "guid": "67437a28-2721-4a2c-becd-caa54c8237a5",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#azure-private-link",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Deploy Private Endpoints to filter incoming traffic when APIM is not deployed to a VNet.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c5a5b252-1e44-4a59-a9d2-399c4d7b68d0",
-            "link": "https://learn.microsoft.com/azure/aks/spot-node-pool",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Consider spot node pools for non time-sensitive workloads",
-            "waf": "Operations"
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (properties.virtualNetworkType == 'Internal') | distinct id, compliant",
+            "guid": "d698adbd-3288-44cb-b10a-9b572da395ae",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#disable-public-network-access",
+            "service": "APIM",
+            "severity": "High",
+            "text": "Disable Public Network Access",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.addonProfiles.aciConnectorLinux) and properties.addonProfiles.aciConnectorLinux.enabled==true) | distinct id,compliant",
-            "guid": "c755562f-2b4e-4456-9b4d-874a748b662e",
-            "link": "https://learn.microsoft.com/azure/aks/concepts-scale",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Consider AKS virtual node for quick bursting",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "0674d750-0c6f-4ac0-8717-ceec04d0bdbd",
+            "link": "https://learn.microsoft.com/azure/api-management/automation-manage-api-management",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Simplify management with PowerShell automation scripts",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "6f8389a7-f82c-4b8e-a8c0-aa63a25a4956",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/container-insights-overview",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Monitor your cluster metrics with Container Insights (or other tools like Prometheus)",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "c385bfcd-49fd-4786-81ba-cedbb4c57345",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/app-platform/api-management/platform-automation-and-devops#design-recommendations",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Configure APIM via Infrastructure-as-code. Review DevOps best practices from the Cloud Adaption Framework APIM Landing Zone Accelerator",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.addonProfiles.omsagent) and properties.addonProfiles.omsagent.enabled==true) | distinct id,compliant",
-            "guid": "eaa8dc4a-2436-47b3-9697-15b1752beee0",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/container-insights-overview",
-            "service": "AKS",
-            "severity": "High",
-            "text": "Store and analyze your cluster logs with Container Insights (or other tools like Telegraf/ElasticSearch)",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "6c3a27c0-197f-426c-9ffa-86fed51d9ab6",
+            "link": "https://learn.microsoft.com/azure/api-management/visual-studio-code-tutorial",
+            "service": "APIM",
+            "severity": "Medium",
+            "text": "Promote usage of Visual Studio Code APIM extension for faster API development",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "4621dd68-c5a5-4be2-bdb1-1726769ef669",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/containers/container-insights-analyze",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "354f1c03-8112-4965-85ad-c0074bddf231",
+            "link": "https://learn.microsoft.com/azure/api-management/devops-api-development-templates",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Monitor CPU and memory utilization of the nodes",
+            "text": "Implement DevOps and CI/CD in your workflow",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "1a4835ac-9422-423e-ae80-b123081a5417",
-            "link": "https://learn.microsoft.com/azure/aks/configure-azure-cni",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "b6439493-426a-45f3-9697-cf65baee208d",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-mutual-certificates-for-clients",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "If using Azure CNI, monitor % of pod IPs consumed per node",
-            "waf": "Operations"
+            "text": "Secure APIs using client certificate authentication",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "description": "I/O in the OS disk is a critical resource. If the OS in the nodes gets throttled on I/O, this could lead to unpredictable behavior, typically ending up in node being declared NotReady",
-            "guid": "415833ea-3ad3-4c2d-b733-165c3acbe04b",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/premium-storage-performance",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "2a67d143-1033-4c0a-8732-680896478f08",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-mutual-certificates",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Monitor OS disk queue depth in nodes",
-            "waf": "Operations"
+            "text": "Secure backend services using client certificate authentication",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "be209d39-fda4-4777-a424-d116785c2fa5",
-            "link": "https://learn.microsoft.com/azure/aks/load-balancer-standard",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "074435f5-4a46-41ac-b521-d6114cb5d845",
+            "link": "https://learn.microsoft.com/azure/api-management/mitigate-owasp-api-threats",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "If not using egress filtering with AzFW/NVA, monitor standard ALB allocated SNAT ports",
-            "waf": "Operations"
+            "text": "Review 'Recommendations to mitigate OWASP API Security Top 10 threats' article and check what is applicable to your APIs",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "74c2ee76-569b-4a79-a57e-dedf91b022c9",
-            "link": "https://learn.microsoft.com/azure/aks/aks-resource-health",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "5507c4b8-a7f8-41d6-9661-418c987100c9",
+            "link": "https://learn.microsoft.com/azure/api-management/authorizations-overview",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Subscribe to resource health notifications for your AKS cluster",
-            "waf": "Operations"
+            "text": "Use Authorizations feature to simplify management of OAuth 2.0 token for your backend APIs",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "b54eb2eb-03dd-4aa3-9927-18e2edb11726",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-scheduler",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "2deee033-b906-4bc2-9f26-c8d3699fe091",
+            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-manage-protocols-ciphers",
+            "service": "APIM",
             "severity": "High",
-            "text": "Configure requests and limits in your pod specs",
-            "waf": "Operations"
+            "text": "Use the latest TLS version when encrypting information in transit. Disable outdated and unnecessary protocols and ciphers when possible.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "769ef669-1a48-435a-a942-223ece80b123",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-scheduler",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "f8af3d94-1d2b-4070-846f-849197524258",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#im-8-restrict-the-exposure-of-credential-and-secrets",
+            "service": "APIM",
+            "severity": "High",
+            "text": "Ensure that secrets (Named values) are stored an Azure Key Vault so they can be securely accessed and updated",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (isnotnull(identity)) | distinct id, compliant",
+            "guid": "791abd8b-7706-4e31-9569-afefde724be3",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#managed-identities",
+            "service": "APIM",
             "severity": "Medium",
-            "text": "Enforce resource quotas for namespaces",
-            "waf": "Operations"
+            "text": "Use managed identities to authenticate to other Azure resources whenever possible",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "081a5417-4158-433e-a3ad-3c2de733165c",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits",
-            "service": "AKS",
+            "arm-service": "Microsoft.ApiManagement/service",
+            "checklist": "Azure API Management Review",
+            "guid": "220c4ca6-6688-476b-b2b5-425a78e6fb87",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#ns-6-deploy-web-application-firewall",
+            "service": "APIM",
             "severity": "High",
-            "text": "Ensure your subscription has enough quota to scale out your nodepools",
-            "waf": "Operations"
+            "text": "Use web application firewall (WAF) by deploying Application Gateway in front of APIM",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "f4fd0602-7ab5-46f1-b66a-e9dea9654a65",
-            "link": "https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Leverage zone-redundancy to ensure high availability in the event of zone-level failures. Use Premium V2/V3 or Isolated v2 tiers, which provide support for zone-redundant deployments and ensure minimal downtime during disasters.",
+            "guid": "b32e1aa1-4813-4602-88fe-27ca2891f421",
+            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/app-service-web-app/zone-redundant?source=recommendations",
+            "service": "App Services",
+            "severity": "Low",
+            "text": "Implement a baseline highly available zone-redundant web application architecture. Ensure your Azure App Service is on Premium V2/V3 or Isolated v2 tiers for zone-redundant support.",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Leverage staging slots for zero-downtime deployments and automated backups to ensure disaster recovery. Choose the appropriate tier (Standard or Premium) based on the number of slots and disaster recovery requirements.",
+            "graph": "resources | where type =~ 'microsoft.web/serverfarms' | extend compliant = (sku.tier == 'Premium' or sku.tier == 'Standard') | distinct id,compliant",
+            "guid": "e4b31c6a-2e3f-4df1-8e8b-9c3aa5a27820",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-hosting-plans",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Use Premium and Standard tiers for staging slots and automated backups. Align your backup retention period with disaster recovery needs.",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Availability Zones provide physical isolation across datacenters in a region, reducing downtime during outages. Verify your region supports Availability Zones and use Premium V2/V3 tiers for zone-redundant deployments.",
+            "guid": "a7e2e6c2-491f-4fa4-a82b-521d0bc3b202",
+            "link": "https://learn.microsoft.com/azure/reliability/migrate-app-service",
+            "service": "App Services",
             "severity": "High",
-            "text": "Configure Liveness and Readiness probes for all deployments",
-            "waf": "Operations"
+            "text": "Leverage Availability Zones where regionally applicable (Premium V2/V3 tier required). Check region support for Availability Zones.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.autoScalerProfile)) | distinct id,compliant",
-            "guid": "90ce65de-8e13-4f9c-abd4-69266abca264",
-            "link": "https://learn.microsoft.com/azure/aks/concepts-scale",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Enable health checks to detect unhealthy instances in real-time and automatically replace them to maintain high availability and application reliability.",
+            "graph": "appserviceresources  | where type =~ 'microsoft.web/sites/config' | extend compliant = (properties.HealthCheckPath != '') | distinct id,compliant",
+            "guid": "1275e4a9-7b6a-43c3-a9cd-5ee18d8995ad",
+            "link": "https://learn.microsoft.com/azure/app-service/monitor-instances-health-check",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Use the Cluster Autoscaler",
-            "waf": "Performance"
+            "text": "Implement health checks to monitor and detect issues with App Service instances. Health checks enable automatic instance replacement on failure.",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Follow best practices for configuring backups and restores in Azure App Service and ASE to guarantee data availability and ensure recovery during disaster scenarios.",
+            "guid": "35a91c5d-4ad6-4d9b-8e0f-c47db9e6d1e7",
+            "link": "https://learn.microsoft.com/azure/app-service/manage-backup",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Refer to backup and restore best practices for Azure App Service and App Service Environments (ASE) to ensure data availability and recovery.",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Ensure high availability by incorporating scaling, fault tolerance, monitoring, and zone redundancy into your App Service architecture. Leverage health checks and availability zones to maintain uptime.",
+            "guid": "e68cd0ec-afc6-4bd8-a27f-7860ad9a0db2",
+            "link": "https://learn.microsoft.com/azure/architecture/framework/services/compute/azure-app-service/reliability",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Implement Azure App Service reliability best practices, including auto-scaling, fault tolerance, health checks, and zone redundancy.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | extend compliant = (isnotnull(properties.austoscalerProfile)) | distinct id,compliant",
-            "guid": "831c2872-c693-4b39-a887-a561bada49bc",
-            "link": "https://learn.microsoft.com/azure/aks/custom-node-configuration",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Prepare for disaster recovery by implementing region failover strategies. Utilize active-active and active-passive configurations, automated failover, and Infrastructure as Code (IaC) for seamless failover during outages.",
+            "guid": "bd2a865c-0835-4418-bb58-4df91a5a9b3f",
+            "link": "https://learn.microsoft.com/azure/app-service/manage-disaster-recovery#recover-app-content-only",
+            "service": "App Services",
             "severity": "Low",
-            "text": "Customize node configuration for AKS node pools",
-            "waf": "Performance"
-        },
-        {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "faa19bfe-9d55-4d04-a3c4-919ca1b2d121",
-            "link": "https://learn.microsoft.com/azure/aks/concepts-scale",
-            "service": "AKS",
-            "severity": "Medium",
-            "text": "Use the Horizontal Pod Autoscaler when required",
-            "waf": "Performance"
+            "text": "Familiarize with App Service region failover, including active-active and active-passive configurations, automated failover, and IaC deployment.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "description": "Larger nodes will bring higher performance and features such as ephemeral disks and accelerated networking, but they will increase the blast radius and decrease the scaling granularity",
-            "guid": "5ae124ba-34df-4585-bcdc-e9bd3bb0cdb3",
-            "link": "https://blog.cloudtrooper.net/2020/10/23/which-vm-size-should-i-choose-as-aks-node/",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Azure App Service offers built-in reliability features, including scaling, fault tolerance, and service-level agreements (SLAs). Leverage these features to maintain consistent performance during outages.",
+            "guid": "f3d2f1e4-e6d4-4b7a-a5a5-e2a9b2c6f293",
+            "link": "https://learn.microsoft.com/azure/reliability/reliability-app-service",
+            "service": "App Services",
             "severity": "High",
-            "text": "Consider an appropriate node size, not too large or too small",
-            "waf": "Performance"
+            "text": "Familiarize with reliability support in Azure App Service, including scaling options, SLAs, and automated recovery mechanisms.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "38800e6a-ae01-40a2-9fbc-ae5a06e5462d",
-            "link": "https://learn.microsoft.com/azure/aks/quotas-skus-regions#service-quotas-and-limits",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "If more than 5000 nodes are required for scalability then consider using an additional AKS cluster",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Enabling 'Always On' for Function Apps ensures that the app does not go idle, maintaining its availability and responsiveness at all times.",
+            "guid": "c7b5f3d1-0569-4fd2-9f32-c0b64e9c0c5e",
+            "link": "https://learn.microsoft.com/azure/azure-functions/dedicated-plan#always-on",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Ensure 'Always On' is enabled for Function Apps running on App Service plans to prevent idling and ensure continuous availability.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "9583c0f6-6083-43f6-aa6b-df7102c901bb",
-            "link": "https://learn.microsoft.com/azure/event-grid/event-schema-aks",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "Consider subscribing to EventGrid Events for AKS automation",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Health checks monitor the health of App Service instances, enabling automatic replacement of unhealthy instances to maintain high availability.",
+            "guid": "a3b4d5f6-758c-4f9d-9e1a-d7c6b7e8f9ab",
+            "link": "https://learn.microsoft.com/azure/app-service/monitor-instances-health-check",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Monitor App Service instances using Health checks to detect unhealthy instances and automatically replace them.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c5016d8c-c6c9-4165-89ae-673ef0fff19d",
-            "link": "https://learn.microsoft.com/azure/aks/manage-abort-operations",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "For long running operation on an AKS cluster consider event termination",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "guid": "c7d3e5f9-a19c-4833-8ca6-1dcb0128e129",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/app/availability-overview",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Monitor availability and responsiveness of web app or website using Application Insights availability tests, ensuring proactive detection of performance issues and downtime.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "c4e37133-f186-4ce1-aed9-9f1b32f6e021",
-            "link": "https://learn.microsoft.com/azure/aks/use-azure-dedicated-hosts",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "guid": "b4e3f2d5-a5c6-4d7e-8b2f-c5d9e7a8f0ea",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/app/availability-standard-tests",
+            "service": "App Services",
             "severity": "Low",
-            "text": "If required consider using Azure Dedicated Hosts for AKS nodes",
-            "waf": "Performance"
+            "text": "Use Application Insights Standard test to monitor availability and responsiveness of web app or website",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "graph": "where type=='microsoft.containerservice/managedclusters' | project id,resourceGroup,name,pools=properties.agentPoolProfiles | mvexpand pools | extend compliant = (pools.osDiskType=='Ephemeral') | project id,name=strcat(name,'-',pools.name), resourceGroup, compliant",
-            "guid": "24367b33-6971-45b1-952b-eee0b9b588de",
-            "link": "https://learn.microsoft.com/azure/aks/cluster-configuration",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Azure Key Vault ensures secrets are encrypted, securely stored, and accessed only by authorized applications. It supports audit logging, and secret versioning, and reduces the risk of accidental exposure of sensitive information.",
+            "guid": "834ac932-223e-4ce8-8b12-3071a5416415",
+            "link": "https://learn.microsoft.com/azure/app-service/app-service-key-vault-references",
+            "service": "App Services",
             "severity": "High",
-            "text": "Use ephemeral OS disks",
-            "waf": "Performance"
+            "text": "Use Azure Key Vault to store any secrets the application needs. Key Vault provides a secure, managed, and audited environment for storing secrets, and integrates seamlessly with App Service via App Service Key Vault References for enhanced security.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "f0ce315f-1120-4166-8206-94f2cf3a4d07",
-            "link": "https://learn.microsoft.com/azure/virtual-machines/disks-types",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Managed Identity eliminates the need for hard-coded credentials by allowing App Service to authenticate to Azure Key Vault securely. This reduces the risk of credential exposure and simplifies secret management for enhanced security.",
+            "guid": "833ea3ad-2c2d-4e73-8165-c3acbef4abe1",
+            "link": "https://learn.microsoft.com/azure/app-service/app-service-key-vault-references",
+            "service": "App Services",
             "severity": "High",
-            "text": "For non-ephemeral disks, use high IOPS and larger OS disks for the nodes when running many pods/node since it requires high performance for running multiple pods and will generate huge logs with default AKS log rotation thresholds",
-            "waf": "Performance"
+            "text": "Use Managed Identity to securely connect to Azure Key Vault for accessing secrets, through App Service Key Vault References.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "39c486ce-d5af-4062-89d5-18bb5fd795db",
-            "link": "https://learn.microsoft.com/azure/aks/use-ultra-disks",
-            "service": "AKS",
-            "severity": "Low",
-            "text": "For hyper performance storage option use Ultra Disks on AKS",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Storing TLS certificates in Azure Key Vault enhances security by providing centralized, secure management and automated renewal of certificates. This reduces the risk of manual handling errors and certificate expiration.",
+            "guid": "f8d39fda-4776-4831-9c11-5775c2ea55b4",
+            "link": "https://learn.microsoft.com/azure/app-service/configure-ssl-certificate",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Use Azure Key Vault to securely store and manage TLS certificates for App Service.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "9f7547c1-747d-4c56-868a-714435bd19dd",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-multi-region",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "To minimize exposure and improve security, isolate systems processing sensitive data. Leverage separate App Service Plans or App Service Environments for isolation, and use different subscriptions or management groups to enforce stricter boundaries and governance.",
+            "guid": "6ad48408-ee72-4734-a475-ba18fdbf590c",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-hosting-plans",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Avoid keeping state in the cluster, and store data outside (AzStorage, AzSQL, Cosmos, etc)",
-            "waf": "Performance"
+            "text": "Isolate systems that process sensitive information using separate App Service Plans, App Service Environments (ASE), and consider different subscriptions or management groups for enhanced security.",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "24429eb7-2281-4376-85cc-57b4a4b18142",
-            "link": "https://learn.microsoft.com/azure/aks/operator-best-practices-storage",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Local disks on App Service are not encrypted and sensitive data should not be stored on those.  (For example: D:\\\\Local and %TMP%).",
+            "guid": "e65de8e0-3f9b-4cbd-9682-66abca264f9a",
+            "link": "https://learn.microsoft.com/azure/app-service/operating-system-functionality#file-access",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "If using AzFiles Standard, consider AzFiles Premium and/or ANF for performance reasons",
-            "waf": "Performance"
+            "text": "Do not store sensitive data on local disk",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.containerservice/managedClusters",
-            "checklist": "Azure AKS Review",
-            "guid": "83958a8c-2689-4b32-ab57-cfc64546135a",
-            "link": "https://learn.microsoft.com/azure/aks/availability-zones#azure-disk-availability-zone-support",
-            "service": "AKS",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Use Microsoft Entra ID or B2C for secure user authentication and Single Sign-On (SSO) across applications. Integrate using the built-in App Service Authentication/Authorization feature for streamlined security and compliance with modern authentication protocols like OpenID Connect.",
+            "guid": "919ca0b2-c121-459e-814b-933df574eccc",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-authentication-authorization",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "If using Azure Disks and AZs, consider having nodepools within a zone for LRS disk with VolumeBindingMode:WaitForFirstConsumer for provisioning storage in right zone or use ZRS disk for nodepools spanning multiple zones",
-            "waf": "Performance"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "a85b86ad-884f-48e3-9273-4b875ba18f10",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/system-message#define-additional-safety-and-behavioral-guardrails",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Follow Metaprompting guardrails for resonsible AI",
-            "waf": "Operational Excellence"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "d4391898-cd28-48be-b6b1-7cb8245451e1",
-            "link": "https://github.com/Azure-Samples/AI-Gateway",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Consider Gateway patterns with APIM  or solutions like AI central for better rate limiting, load balancing, authentication and logging",
-            "waf": "Operational Excellence"
+            "text": "Use Microsoft Entra ID or B2C for secure authentication and Single Sign-On (SSO).",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "aed3453a-ec72-4392-97a1-52d6cc5e4029",
-            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/azure-openai-insights-monitoring-ai-with-confidence/ba-p/4026850",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Ensure all code deployments to App Service originate from a controlled, secured environment, such as a well-managed DevOps pipeline. This practice mitigates the risk of deploying unauthorized or malicious code by enforcing version control, code verification, and secure hosting.",
+            "guid": "3f9bcbd4-6826-46ab-aa26-4f9a19aed9c5",
+            "link": "https://learn.microsoft.com/azure/app-service/deploy-best-practices",
+            "service": "App Services",
             "severity": "High",
-            "text": "Enable monitoring for your AOAI instances",
-            "waf": "Operational Excellence"
+            "text": "Deploy code to App Service from a trusted and secure environment.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type == 'microsoft.insights/metricalerts' | extend compliant = (properties.targetResourceType =~ 'Microsoft.CognitiveServices/accounts') | project id, compliant",
-            "guid": "697cb391-ed16-4b2d-886f-0a0241addde6",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitoring#set-up-alerts",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Disable basic authentication for FTP/FTPS and WebDeploy/SCM to enhance security by enforcing Microsoft Entra ID secured endpoints for deployment. This ensures that only authenticated users using Microsoft Entra ID credentials can access deployment services, including the SCM site.",
+            "guid": "5d04c2c3-919c-4a0b-8c12-159e114b933d",
+            "link": "https://learn.microsoft.com/azure/app-service/deploy-configure-credentials#disable-basic-authentication",
+            "service": "App Services",
             "severity": "High",
-            "text": "Create alerts to notify teams of events such as an entry in the activity log created by an action performed on the resource, such as regenerating its subscription keys or a metric threshold such as the number of errors exceeding 10 in an hour",
-            "waf": "Operational Excellence"
+            "text": "Disable basic authentication for FTP/FTPS and WebDeploy/SCM.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "8a477cde-b486-41bc-9bc1-0ae66e25d4d5",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitoring",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Wherever possible, use Managed Identity to securely connect to Microsoft Entra ID-secured resources without storing credentials. If this is not feasible, store secrets in Azure Key Vault and access them using Managed Identity to maintain security and reduce the risk of credential exposure.",
+            "guid": "f574eccc-d9bd-43ba-bcda-3b54eb2eb03d",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-managed-identity?tabs=portal%2Chttp",
+            "service": "App Services",
             "severity": "High",
-            "text": "Monitor token usage to prevent service disruptions due to capacity",
-            "waf": "Operational Excellence"
+            "text": "Use Managed Identity to connect to Microsoft Entra ID secured resources.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "a3aec2c4-e243-46b0-936c-b45e17960eee",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitoring",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "observe metrics like processed inference tokens, generated completion tokens monitor for rate limit",
-            "waf": "Operational Excellence"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "When using images stored in Azure Container Registry, pull these images using a Managed Identity to avoid storing credentials. This ensures secure access to container images and reduces the risk of credential exposure.",
+            "guid": "d9a25827-18d2-4ddb-8072-5769ee6691a4",
+            "link": "https://learn.microsoft.com/azure/app-service/configure-custom-container#use-managed-identity-to-pull-image-from-azure-container-registry",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Pull container images from Azure Container Registry using a Managed Identity.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "fbdf4cc2-eec4-4d76-8c31-d25ffbb46a39",
-            "link": "https://techcommunity.microsoft.com/t5/apps-on-azure-blog/build-an-enterprise-ready-azure-openai-solution-with-azure-api/ba-p/3907562",
-            "service": "OpenAI",
-            "severity": "Low",
-            "text": "Enable and configure Diagnostics for the Azure OpenAI Service. If not sufficient, consider using a gateway such as Azure API Managements in front of Azure OpenAI to log both incoming prompts and outgoing responses, where permitted",
-            "waf": "Operational Excellence"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Configure diagnostic settings to send telemetry and security logs (including HTTP, platform, and audit logs) to Log Analytics. Centralized logging enhances monitoring, threat detection, and compliance reporting.",
+            "guid": "47768314-c115-4775-a2ea-55b46ad48408",
+            "link": "https://learn.microsoft.com/azure/app-service/troubleshoot-diagnostic-logs",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Send App Service runtime and security logs to Log Analytics for centralized monitoring and alerting.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "3af30ed3-2947-498b-8178-a2c5a46ceb54",
-            "link": "https://github.com/Azure-Samples/openai-enterprise-iac",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Use Infrastructure as code to deploy the Azure OpenAI Service, model deployments, and all related resources",
-            "waf": "Operational Excellence"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Set up a diagnostic setting to send the activity log to Log Analytics as the central destination for logging and monitoring. This allows you to monitor control plane activity on the App Service resource itself.",
+            "guid": "ee72734b-475b-4a18-bdbf-590ce65de8e0",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/essentials/activity-log",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Send App Service activity logs to Log Analytics",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "4350d092-d234-4292-a752-8537a551c5bf",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/managed-identity",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Use Microsoft Entra Authentication with Managed Identity instead of API Key",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Use regional VNet integration, Network Security Groups (NSGs), and User-Defined Routes (UDRs) to control outbound network access. Route traffic through a Network Virtual Appliance (NVA), such as Azure Firewall, and monitor firewall logs to ensure traffic is properly controlled and secure.",
+            "guid": "c12159e1-14b9-433d-b574-ecccd9bd3baf",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-vnet-integration",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Control outbound network access for App Service using VNet integration, NSGs, UDRs, and firewalls.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "4e4f1854-287d-45cd-a126-cc031af5b1fc",
-            "link": "https://learn.microsoft.com/azure/machine-learning/prompt-flow/how-to-bulk-test-evaluate-flow?view=azureml-api-2",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Evaluate the performance/accuracy of the system with a known golden dataset which has the inputs and the correct answers. Leverage capabilities in PromptFlow for Evaluation.",
-            "waf": "Operational Excellence"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Provide a stable outbound IP by using VNet integration with a NAT Gateway or Network Virtual Appliance (NVA) like Azure Firewall. This enables the receiving party to allow-list based on IP, if necessary. For communications with Azure services, use mechanisms like Service Endpoints or private endpoints to avoid relying on static IPs, ensuring secure and efficient connectivity.",
+            "guid": "cda3b54e-b2eb-403d-b9a2-582718d2ddb1",
+            "link": "https://learn.microsoft.com/azure/app-service/networking/nat-gateway-integration",
+            "service": "App Services",
+            "severity": "Low",
+            "text": "Ensure a stable IP for outbound communications by using VNet NAT Gateway or Azure Firewall.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "68889535-e327-4897-b31b-67d67be5962a",
-            "link": "https://learn.microsoft.com/azure/architecture/ai-ml/architecture/baseline-openai-e2e-chat#azure-openai---performance-efficiency",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Control inbound network access by configuring App Service Access Restrictions, Service Endpoints, or Private Endpoints. Ensure appropriate restrictions are set for both the web app and the SCM (deployment) site to limit unauthorized access and enhance security.",
+            "guid": "0725769e-e669-41a4-a34a-c932223ece80",
+            "link": "https://learn.microsoft.com/azure/app-service/networking-features#access-restrictions",
+            "service": "App Services",
             "severity": "High",
-            "text": "Evaluate usage of Provisioned throughput model ",
-            "waf": "Performance"
+            "text": "Control inbound network access using Access Restrictions, Service Endpoints, or Private Endpoints.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "cd288bed-6b17-4cb8-8454-51e1aed3453a",
-            "link": "https://learn.microsoft.com/azure/ai-services/content-safety/overview",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Protect App Service from malicious inbound traffic by deploying a Web Application Firewall (WAF) using Azure Application Gateway or Azure Front Door. Ensure WAF logs are monitored regularly to detect and respond to security threats.",
+            "guid": "b123071a-5416-4415-a33e-a3ad2c2de732",
+            "link": "https://learn.microsoft.com/azure/app-service/networking/app-gateway-with-service-endpoints",
+            "service": "App Services",
             "severity": "High",
-            "text": "Review and implement Azure AI content safety",
-            "waf": "Operational Excellence"
+            "text": "Use a Web Application Firewall (WAF) in front of App Service.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "1193846d-697c-4b39-8ed1-6b2d186f0a02",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#system-level-throughput",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "To prevent the Web Application Firewall (WAF) from being bypassed, lock down access to App Service by using Access Restrictions, Service Endpoints, and Private Endpoints. This ensures that all traffic is routed through the WAF, providing a secure front layer of protection.",
+            "guid": "165c3acb-ef4a-4be1-b8d3-9fda47768314",
+            "link": "https://learn.microsoft.com/azure/app-service/networking-features#access-restrictions",
+            "service": "App Services",
             "severity": "High",
-            "text": "Define and evaluate the throughput of the system based on tokens & response per minute and align with requirements",
-            "waf": "Performance"
+            "text": "Ensure the WAF cannot be bypassed by securing access to App Service.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "41addde6-8a47-47cd-bb48-61bc3bc10ae6",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#improve-performance",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Ensure that the minimum TLS policy is set to 1.2 or higher, with a preference for TLS 1.3, to enhance security through stronger encryption protocols. TLS 1.3 provides additional security improvements and faster handshake times, reducing vulnerabilities associated with older versions.",
+            "graph": "appserviceresources | where type =~ 'microsoft.web/sites/config' | extend compliant = (properties.MinTlsVersion>=1.2) | distinct id,compliant",
+            "guid": "c115775c-2ea5-45b4-9ad4-8408ee72734b",
+            "link": "https://learn.microsoft.com/azure/app-service/configure-ssl-bindings#enforce-tls-versions",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Improve latency of the system by limiting token sizes, streaming options for applications like chatbots or conversational interfaces. Streaming can enhance the perceived performance of Azure OpenAI applications by delivering responses to users in an incremental manner",
-            "waf": "Performance"
+            "text": "Set minimum TLS policy to 1.2 or higher, preferably 1.3, in App Service configuration.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "6e25d4d5-a3ae-4c2c-9e24-36b0336cb45e",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#batching",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Estimate elasticity demands to determine synchronous and batch request segregation based on priority. For high priority, use synchronous approach and for low priority, asynchronous batch processing with queue is preferred",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Configure App Service to enforce HTTPS-only, automatically redirecting all HTTP traffic to HTTPS. Additionally, implement HTTP Strict Transport Security (HSTS) in your code or via a Web Application Firewall (WAF) to ensure browsers only access the site over HTTPS, enhancing security by preventing downgrade attacks.",
+            "graph": "where (type=='microsoft.web/sites' and (kind == 'app' or kind == 'app,linux' )) | extend compliant = (properties.httpsOnly==true) | distinct id,compliant",
+            "guid": "475ba18f-dbf5-490c-b65d-e8e03f9bcbd4",
+            "link": "https://learn.microsoft.com/azure/app-service/configure-ssl-bindings#enforce-https",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Use HTTPS only and consider enabling HTTP Strict Transport Security (HSTS).",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "5bda4332-4f24-4811-9331-82ba51752694",
-            "link": "https://github.com/Azure/azure-openai-benchmark/",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Do not use wildcards (*) in your CORS configuration, as this permits unrestricted access from any origin, compromising security. Instead, explicitly specify trusted origins that are allowed to access the service, ensuring controlled access.",
+            "guid": "68266abc-a264-4f9a-89ae-d9c55d04c2c3",
+            "link": "https://learn.microsoft.com/azure/app-service/app-service-web-tutorial-rest-api",
+            "service": "App Services",
             "severity": "High",
-            "text": "Benchmark token consumption requirements based on estimated demands from consumers. Consider using the Azure OpenAI benchmarking tool to help you validate the throughput if you are using Provisioned Throughput Unit deployments",
-            "waf": "Performance"
+            "text": "Avoid using wildcards for CORS; specify allowed origins explicitly.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "4008ae7d-7e47-4432-96d8-bdcf55bce619",
-            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/optimizing-azure-openai-a-guide-to-limits-quotas-and-best/ba-p/4076268",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "If you are using Provisioned Throughput Units (PTUs), consider deploying a token-per-minute (TPM) deployment for overflow requests. Use a gateway to route requests to the TPM deployment when the PTU limits are reached.",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Remote debugging should not be enabled in production as it opens additional ports, increasing the attack surface. Although App Service automatically turns off remote debugging after 48 hours, it is recommended to disable it manually in production to maintain a secure environment.",
+            "graph": "appserviceresources | where type =~ 'microsoft.web/sites/config' | extend compliant = (properties.RemoteDebuggingEnabled == false) | distinct id,compliant",
+            "guid": "d9bd3baf-cda3-4b54-bb2e-b03dd9a25827",
+            "link": "https://learn.microsoft.com/azure/app-service/configure-common#configure-general-settings",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Turn off remote debugging in production environments.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "e8a13f98-8794-424d-9267-86d60b96c97b",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/models",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Choose the right model for the right task. Pick models with right tradeoff between speed, quality of response and output complexity",
-            "waf": "Performance"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Enable Defender for App Service.  This (amongst other threats) detects communications to known malicious IP addresses.  Review the recommendations from Defender for App Service as part of your operations.",
+            "guid": "18d2ddb1-0725-4769-be66-91a4834ac932",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/defender-for-app-service-introduction",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Enable Defender for Cloud - Defender for App Service",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "e9951904-8384-45c9-a6cb-2912156a1147",
-            "link": "https://github.com/Azure/azure-openai-benchmark/",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Azure provides DDoS Basic protection on its network, which can be improved with intelligent DDoS Standard capabilities which learns about normal traffic patterns and can detect unusual behavior. DDoS Standard applies to a Virtual Network so it must be configured for the network resource in front of the app, such as Application Gateway or an NVA.",
+            "guid": "223ece80-b123-4071-a541-6415833ea3ad",
+            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-overview",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Have a baseline for performance without fine-tuning for knowing whether or not fine-tuning has improved model performance",
-            "waf": "Performance"
+            "text": "Enable DDOS Protection Standard on the WAF VNet",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "5e39f541-accc-4d97-a376-bcdb3750ab2a",
-            "link": "https://learn.microsoft.com/azure/architecture/ai-ml/architecture/baseline-openai-e2e-chat#azure-openai---reliability",
-            "service": "OpenAI",
-            "severity": "Low",
-            "text": "Deploy multiple OAI instances across regions",
-            "waf": "Reliability"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "When using images stored in Azure Container Registry, ensure they are pulled over a virtual network by using a private endpoint and configuring the app setting 'WEBSITE_PULL_IMAGE_OVER_VNET'. This ensures secure communication between App Service and the registry, preventing exposure to the public internet.",
+            "guid": "2c2de732-165c-43ac-aef4-abe1f8d39fda",
+            "link": "https://learn.microsoft.com/azure/app-service/configure-custom-container#use-an-image-from-a-network-protected-registry",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Pull container images over a Virtual Network from Azure Container Registry.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "b039da6d-55d7-4c89-8adb-107d5325af62",
-            "link": "https://learn.microsoft.com/azure/architecture/ai-ml/architecture/baseline-openai-e2e-chat#azure-openai---reliability",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Implement retry & healthchecks with Gateway pattern like APIM",
-            "waf": "Reliability"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Perform a penetration test on the web application in accordance with Azure's penetration testing rules of engagement. This helps identify vulnerabilities and security weaknesses that can be addressed before they are exploited.",
+            "guid": "eb2eb03d-d9a2-4582-918d-2ddb10725769",
+            "link": "https://learn.microsoft.com/azure/security/fundamentals/pen-testing",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Conduct a penetration test on the web application.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "5ca44e46-85e2-4223-ace8-bb12308ca5f1",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/quota?tabs=rest#introduction-to-quota",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Ensure that only trusted code, which has been validated and scanned for vulnerabilities, is deployed to production following DevSecOps practices. This minimizes the risk of introducing security vulnerabilities into the application environment.",
+            "guid": "19aed9c5-5d04-4c2c-9919-ca0b2c12159e",
+            "link": "https://learn.microsoft.com/azure/architecture/solution-ideas/articles/devsecops-in-azure",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Ensure having adequate quotas of TPM & RPM for the workload",
-            "waf": "Reliability"
+            "text": "Deploy validated and vulnerability-scanned code.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "ec723923-7a15-42d6-ac5e-402925387e5c",
-            "link": "https://www.microsoft.com/research/project/guidelines-for-human-ai-interaction/",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Review the considerations in HAI toolkit guidance and apply those interaction practices for the slution",
-            "waf": "Operational Excellence"
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Ensure that the latest versions of supported platforms, programming languages, protocols, and frameworks are used. Regular updates mitigate the risk of security vulnerabilities and ensure compatibility with security patches.",
+            "guid": "114b933d-f574-4ecc-ad9b-d3bafcda3b54",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-patch-os-runtime",
+            "service": "App Services",
+            "severity": "High",
+            "text": "Use up-to-date platforms, languages, protocols and frameworks",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "7f154e3a-a369-4282-ae7e-316183687a04",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/business-continuity-disaster-recovery",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Leverage Auto-Healing in Azure App Service to automatically restart instances or trigger custom actions based on pre-defined failure conditions like memory thresholds, HTTP errors, or specific event logs.",
+            "guid": "60b3a935-33e5-45c9-87c7-53882e395b46",
+            "link": "https://learn.microsoft.com/azure/app-service/overview-diagnostics",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Deploy separate fine tuned models across regions if finetuning is employed",
+            "text": "Use Auto-Healing with custom rules to restart App Service instances automatically when failures occur.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "77a1f893-5bda-4433-84f2-4811633182ba",
-            "link": "https://learn.microsoft.com/azure/backup/backup-overview",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Configure Azure Monitor alerts based on Application Insights metrics for response times, failure rates, and overall availability. Alerts help detect issues proactively and reduce mean-time-to-recovery (MTTR).",
+            "guid": "e52e4514-02a7-4e81-a98e-88ce1b18e557",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/app/alerts",
+            "service": "App Services",
             "severity": "Medium",
-            "text": "Regularly backup and replicate critical data to ensure data availability and recoverability in case of data loss or system failures. Leverage Azure's backup and disaster recovery services to protect your data.",
+            "text": "Set up alerts for critical Application Insights metrics, such as response time and failure rates.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type == 'microsoft.search/searchservices' | extend compliant = (sku.name != 'free' and properties.replicaCount >= 3) | project id, compliant",
-            "guid": "95b96ad8-844c-4e3b-8b38-b876ba2cf204",
-            "link": "https://learn.microsoft.com/azure/search/search-reliability",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Use Azure Policy to enforce security, compliance, and governance configurations for App Service. Policies can ensure that critical settings such as TLS versions, backup configurations, and network restrictions are enforced across all App Service instances.",
+            "guid": "361e886f-ca40-4ead-a8e9-1379c642ae9c",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "App Services",
             "severity": "High",
-            "text": "Azure AI search service tiers should be choosen to have a SLA ",
-            "waf": "Reliability"
+            "text": "Apply Azure Policy to enforce compliance across App Service configurations.",
+            "waf": "Governance"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "99013a5d-3ce4-474d-acbd-8682a6abca2a",
-            "link": "https://learn.microsoft.com/purview/purview",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "Leverage Azure Cost Management to track and forecast App Service expenses. Set up alerts for budget thresholds to avoid overspending, and optimize costs based on resource utilization trends.",
+            "guid": "42eb48f0-28ff-497c-b2c0-a8fa1f989832",
+            "link": "https://learn.microsoft.com/azure/cost-management-billing/",
+            "service": "App Services",
             "severity": "Low",
-            "text": "Classify data and sensitivity, labeling with Microsoft Purview before generating the embeddings and make sure to treat the embeddings generated with same sensitivity and classification",
-            "waf": "Security"
+            "text": "Monitor App Service costs using Azure Cost Management and create cost alerts.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "4fda1dbf-3dd9-45d4-ac7c-891dca1f6d56",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/use-your-data-securely",
-            "service": "OpenAI",
+            "arm-service": "microsoft.web/sites",
+            "checklist": "Azure App Service Review",
+            "description": "If you have predictable and steady usage of App Service, purchasing Reserved Instances can significantly reduce long-term costs. Commit to one or three years for lower pricing compared to pay-as-you-go.",
+            "guid": "e489221b-487e-48a3-aaab-48e3d205ca12",
+            "link": "https://learn.microsoft.com/azure/cost-management-billing/reservations/",
+            "service": "App Services",
+            "severity": "Medium",
+            "text": "Purchase reserved instances for App Service plans to optimize long-term costs.",
+            "waf": "Cost"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "32e42e36-11c8-418b-8a0b-c510e43a18a9",
+            "service": "AVS",
             "severity": "High",
-            "text": "Encrypt data used for RAG with SSE/Disk encryption with optional BYOK",
+            "text": "Ensure ADDS domain controller(s) are deployed in the identity subscription in native Azure",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "59ae558b-937d-4498-9e11-12dbd7ba012f",
-            "link": "https://learn.microsoft.com/azure/search/search-security-overview",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Ensure TLS is enforced for data in transit across data sources, AI search used for Retrieval-Augmented Generation (RAG) and LLM communication",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "75089c20-990d-4927-b105-885576f76fc2",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Ensure ADDS sites and services is configured to keep authentication requests from Azure-based resources (including Azure VMware Solution) local to Azure",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "7b94ef6e-047d-42ea-8992-b1cd6e2054b2",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/role-based-access-control",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "de3aad1e-7c28-4ec9-9666-b7570449aa80",
+            "service": "AVS",
             "severity": "High",
-            "text": "Use RBAC to manage access to Azure OpenAI services. Assign appropriate permissions to users and restrict access based on their roles and responsibilities",
+            "text": "Ensure that vCenter is connected to ADDS to enable authentication based on 'named user accounts'",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9769e4a6-91e8-4838-ac93-6667e13c0056",
-            "link": "https://learn.microsoft.com/azure/security/fundamentals/data-encryption-best-practices",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "cd289ced-6b17-4db8-8554-61e2aee3553a",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Implement data encryption,  masking or redaction techniques to hide sensitive data or replace it with obfuscated values in non-production environments or when sharing data for testing or troubleshooting purposes",
+            "text": "Ensure that the connection from vCenter to ADDS is using a secure protocol (LDAPS)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "74b1e945-b459-4837-be7a-d6c6d3b375a5",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/ai-onboarding",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "b9d37dac-43bc-46cd-8d79-a9b24604489a",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "CloudAdmin account in vCenter IdP is used only as an emergency account (break-glass)",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "53d88e89-d17b-473b-82a5-a67e7a9ed5b3",
+            "service": "AVS",
             "severity": "High",
-            "text": "Utilize Azure Defender to detect and respond to security threats and set up monitoring and alerting mechanisms to identify suspicious activities or breaches. Leverage Azure Sentinel for advanced threat detection and response",
+            "text": "Ensure that NSX-Manager is integrated with an external Identity provider (LDAPS)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "c7acbe48-abe5-44cd-99f2-e87768468c55",
-            "link": "https://techcommunity.microsoft.com/t5/azure-storage-blog/managing-long-term-log-retention-or-any-business-data/ba-p/2494791",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "ae0e37ce-e297-411b-b352-caaab79b198d",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Establish data retention and disposal policies to adhere to compliance regulations. Implement secure deletion methods for data that is no longer required and maintain an audit trail of data retention and disposal activities",
+            "text": "Has an RBAC model been created for use within VMware vSphere",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "a9c27d9c-42bb-46bd-8c69-99a246f3389a",
-            "link": "https://learn.microsoft.com/azure/ai-services/content-safety/concepts/jailbreak-detection",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Implement Prompt shields and groundedness detection using Content Safety ",
-            "waf": "Operational Excellence"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "ab81932c-9fc9-4d1b-a780-36f5e6bfbb9e",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "RBAC permissions should be granted on ADDS groups and not on specific users",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "a775c6ee-95b9-46ad-a844-ce3b2b38b876",
-            "link": "https://learn.microsoft.com/azure/compliance/",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d503547c-c447-4e82-9128-a71f0f1cac6d",
+            "service": "AVS",
             "severity": "High",
-            "text": "Ensure compliance with relevant data protection regulations, such as GDPR or HIPAA, by implementing privacy controls and obtaining necessary consents or permissions for data processing activities.",
+            "text": "RBAC permissions on the Azure VMware Solution resource in Azure are 'locked down' to a limited set of owners only",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "ba2cf204-9901-43a5-b3ce-474dccbd8682",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Educate your employees about data security best practices, the importance of handling data securely, and potential risks associated with data breaches. Encourage them to follow data security protocols diligently.",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "fd9f0df4-68dc-4976-b9a9-e6a79f7682c5",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure all custom roles are scoped with CloudAdmin permitted authorizations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "eae01e6e-842e-452f-9721-d928c1b1cd52",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "9ef1d5e8-32e4-42e3-911c-818b0a0bc510",
+            "link": "https://github.com/Azure/AzureCAT-AVS/tree/main/networking",
+            "service": "AVS",
             "severity": "High",
-            "text": "Keep production data separate from development and testing data. Only use real sensitive data in production and utilize anonymized or synthetic data in development and test environments.",
-            "waf": "Security"
+            "text": "Is the correct Azure VMware Solution connectivity model selected for the customer use case at hand",
+            "waf": "Performance"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "eb710a37-cbc1-4055-8dd5-a936a8bb7cf5",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure ExpressRoute or VPN connections from on-premises to Azure are monitored using 'connection monitor'",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "1e54a29a-9de3-499c-bd7b-28dc93555620",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "976e24f2-a7f8-426c-9253-2a92a2a7ed99",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "If you have varying levels of data sensitivity, consider creating separate indexes for each level. For instance, you could have one index for general data and another for sensitive data, each governed by different access protocols",
-            "waf": "Security"
+            "text": "Ensure a connection monitor is created from an Azure native resource to an Azure VMware Solution virtual machine to monitor the Azure VMware Solution back-end ExpressRoute connection",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "2bfe4564-b0d8-434a-948b-263e6dd60512",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "f41ce6a0-64f3-4805-bc65-3ab50df01265",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Take segregation a step further by placing sensitive datasets in different instances of the service. Each instance can be controlled with its own specific set of RBAC policies",
-            "waf": "Security"
+            "text": "Ensure a connection monitor is created from an on-premises resource to an Azure VMware Solution virtual machine to monitor end-2-end connectivity",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "a36498f6-dbad-438e-ad53-cc7ce1d7aaab",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "563b4dc7-4a74-48b6-933a-d1a0916a6649",
+            "service": "AVS",
             "severity": "High",
-            "text": "Recognize that embeddings and vectors generated from sensitive information are themselves sensitive. This data should be afforded the same protective measures as the source material",
-            "waf": "Security"
+            "text": "When route server is used, ensure no more then 1000 routes are propagated from route server to ExR gateway to on-premises (ARS limit).",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "3571449a-b805-43d8-af89-dc7b33be2a1a",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/role-based-access-control",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "6128a71f-0f1c-4ac6-b9ef-1d5e832e42e3",
+            "service": "AVS",
             "severity": "High",
-            "text": "Apply RBAC to th data stores having embeddings and vectors and scope access based on role's access requirements",
+            "text": "Is Privileged Identity Management implemented for roles managing the Azure VMware Solution resource in the Azure Portal (no standing permissions allowed)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type =~ 'Microsoft.CognitiveServices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (properties.privateEndpointConnections != '[]' and properties.publicNetworkAccess !~ 'enabled')",
-            "guid": "27f7b9e9-1be1-4f38-aef3-9812bd463cbb",
-            "link": "https://techcommunity.microsoft.com/t5/azure-architecture-blog/azure-openai-private-endpoints-connecting-across-vnet-s/ba-p/3913325",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "c4e2436b-b336-4d71-9f17-960eee0b9b5c",
+            "service": "AVS",
             "severity": "High",
-            "text": "Configure private endpoint for AI services to restrict service access within your network",
+            "text": "Privileged Identity Management audit reporting should be implemented for the Azure VMware Solution PIM roles",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "ac8ac199-ebb9-41a3-9d90-cae2cc881370",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Enforce strict inbound and outbound traffic control with Azure Firewall and UDRs and limit the external integration points",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "78c447a8-26b2-4863-af0f-1cac599ef1d5",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "If using Privileged Identity Management is being used, ensure that a valid Entra ID enabled account is created with a valid SMTP record for Azure VMware Solution Automatic Host replacement notifications. (standing permissions required)",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "6f7c0cba-fe51-4464-add4-57e927138b82",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "8defc4d7-21d3-41d2-90fb-707ae9eab40e",
+            "service": "AVS",
             "severity": "High",
-            "text": "Implement network segmentation and access controls to restrict access to the LLM application only to authorized users and systems and prevent lateral movement",
+            "text": "Limit use of CloudAdmin account to emergency access only",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "7f42c78e-78cb-46a2-8ad1-90916e6a8d8f",
-            "link": "https://www.microsoft.com/research/blog/llmlingua-innovating-llm-efficiency-with-prompt-compression/",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d329f798-bc17-48bd-a5a0-6ca7144351d1",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Use prompt compression tools like LLMLingua or gprtrim",
-            "waf": "Cost Optimization"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type =~ 'Microsoft.CognitiveServices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (isnotnull(identity))",
-            "guid": "1102cac6-eae0-41e6-b842-e52f4721d928",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/managed-identity",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Ensure that APIs and endpoints used by the LLM application are properly secured with authentication and authorization mechanisms, such as Managed identities,  API keys or OAuth, to prevent unauthorized access.",
+            "text": "Create custom RBAC roles in vCenter to implement a least-privilege model inside vCenter",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "c1b1cd52-1e54-4a29-a9de-399cfd7b28dc",
-            "link": "https://techcommunity.microsoft.com/t5/azure-architecture-blog/security-best-practices-for-genai-applications-openai-in-azure/ba-p/4027885",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "9dd24429-eb72-4281-97a1-51c5bb4e4f18",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Enforce strong end user authentication mechanisms, such as multi-factor authentication, to prevent unauthorized access to the LLM application and associated network resources",
+            "text": "Is a process defined to regularly rotate cloudadmin (vCenter) and admin (NSX) credentials",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "93555620-2bfe-4456-9b0d-834a348b263e",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Implement network monitoring tools to detect and analyze network traffic for any suspicious or malicious activities. Enable logging to capture network events and facilitate forensic analysis in case of security incidents",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "586cb291-ec16-4a1d-876e-f9f141acdce5",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Use a centralized identity provider to be used for workloads (VM's) running on Azure VMware Solution",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "6dd60512-a364-498f-9dba-d38ead53cc7c",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "79377bcd-b375-41ab-8ab0-ead66e15d3d4",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Conduct security audits and penetration testing to identify and address any network security weaknesses or vulnerabilities in the LLM application's network infrastructure",
+            "text": "Is East-West traffic filtering implemented within NSX-T",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type == 'microsoft.cognitiveservices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (tags != '{}')",
-            "guid": "e1d7aaab-3571-4449-ab80-53d89f89dc7b",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/tag-resources?tabs=json",
-            "service": "OpenAI",
-            "severity": "Low",
-            "text": "Azure AI Services are properly tagged for better management",
-            "waf": "Operational Excellence"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "77036e5e-6b4b-4ed3-b503-547c1347dc56",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations",
-            "service": "OpenAI",
-            "severity": "Low",
-            "text": "Azure AI Service accounts follows organizational naming conventions",
-            "waf": "Operational Excellence"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "028a71ff-e1ce-415d-b3f0-d5e772d41e36",
-            "link": "https://learn.microsoft.com/azure/ai-services/diagnostic-logging",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Diagnostic logs in Azure AI services resources should be enabled",
-            "waf": "Operational Excellence"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type =~ 'Microsoft.CognitiveServices/accounts' or type == 'microsoft.search/searchservices' | project id, compliant = (properties.disableLocalAuth == true)",
-            "guid": "11cc57b4-a4b1-4410-b439-58a8c2289b3d",
-            "link": "https://learn.microsoft.com/azure/ai-services/authentication",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "a2adb1c3-d232-46af-825c-a44e1695fddd",
+            "service": "AVS",
             "severity": "High",
-            "text": "Key access (local authentication) is recommended to be disabled for security.  After disabling key based access, Microsoft Entra ID becomes the only access method, which allows maintaining minimum privilege principle and granular control. ",
+            "text": "Workloads on Azure VMware Solution are not directly exposed to the internet. Traffic is filtered and inspected by Azure Application Gateway, Azure Firewall or 3rd party solutions",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "6b57cfc6-5546-41e1-a3e3-453a3c863964",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "eace4cb1-deb4-4c65-8c3f-c14eeab36938",
+            "service": "AVS",
             "severity": "High",
-            "text": "Store and manage keys securely using Azure Key Vault. Avoid hard-coding or embedding sensitive keys within your LLM application's code and retrieve them securely from Azure Key Vault using managed identities",
+            "text": "Auditing and logging is implemented for inbound internet requests to Azure VMware Solution and Azure VMware Solution based workloads",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "8b652d6c-15f5-4129-9539-8e6ded227dd1",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Regularly rotate and expire keys stored in Azure Key Vault to minimize the risk of unauthorized access.",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "29e3eec2-1836-487a-8077-a2b5945bda43",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Session monitoring is implemented for outbound internet connections from Azure VMware Solution or Azure VMware Solution based workloads to identify suspicious/malicious activity",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "adfe27be-e297-401a-a352-baaab79b088d",
-            "link": "https://github.com/openai/tiktoken",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Use tiktoken to understand token sizes for token optimizations in conversational mode",
-            "waf": "Cost Optimization"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "42b06c21-d799-49a6-96f4-389a7f42c78e",
-            "link": "https://learn.microsoft.com/azure/security/develop/secure-dev-overview",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Follow secure coding practices to prevent common vulnerabilities such as injection attacks, cross-site scripting (XSS), or security misconfigurations",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "graph": "resources| where type =~ 'Microsoft.Network/virtualNetworkGateways'| mv-expand ipConfigurations=properties.ipConfigurations| project subnetId=tostring(ipConfigurations.properties.subnet.id)| where isnotempty(subnetId)| join (resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,enableDdosProtection=tostring(properties.enableDdosProtection),subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,enableDdosProtection,subnetId=tostring(subnets.id)) on subnetId | distinct id,resourceGroup,name,enableDdosProtection | project id, compliant = (enableDdosProtection == 'true')",
+            "guid": "334fdf91-c234-4182-a652-75269440b4be",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Is DDoS standard protection enabled on ExR/VPN Gateway subnet in Azure",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "78c06a73-a22a-4495-9e6a-8dc4a20e27c3",
-            "link": "https://learn.microsoft.com/azure/devops/repos/security/github-advanced-security-dependency-scanning?view=azure-devops",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Setup a process to regularly update and patch the LLM libraries and other system components",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "3d3e0843-276d-44bd-a015-bcf219e4a1eb",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Use a dedicated privileged access workstation (PAW) to manage Azure VMware Solution, vCenter, NSX manager and HCX manager",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "e29711b1-352b-4eee-879b-588defc4972c",
-            "link": "https://learn.microsoft.com/legal/cognitive-services/openai/code-of-conduct",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Adhere to Azure OpenAI or other LLMs terms of use, policies and guidance and allowed use cases",
-            "waf": "Operational Excellence"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "9ccbd869-266a-4cca-874f-aa19bf39d95d",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Enable Advanced Threat Detection (Microsoft Defender for Cloud aka ASC) for workloads running on Azure VMware Solution",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "d3cd21bf-7703-46e5-b6b4-bed3d503547c",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs#base-series-and-codex-series-fine-tuned-models",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "44c7c891-9ca1-4f6d-9315-ae524ba34d45",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Understand difference in cost of base models and fine tuned models and token step sizes",
-            "waf": "Cost Optimization"
+            "text": "Use Azure ARC for Servers to properly govern workloads running on Azure VMware Solution using Azure native technologies (Azure ARC for Azure VMware Solution is not yet available)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "1347dc56-028a-471f-be1c-e15dd3f0d5e7",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/latency#batching",
-            "service": "OpenAI",
-            "severity": "High",
-            "text": "Batch requests, where possible, to minimize the per-call overhead which can reduce overall costs. Ensure you optimize batch size",
-            "waf": "Cost Optimization"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "85e12139-bd7b-4b01-8f7b-95ef6e043e2a",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "Ensure workloads on Azure VMware Solution use sufficient data encryption during run-time (like in-guest disk encryption and SQL TDE). (vSAN encryption at rest is default)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a8",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Set up a cost tracking system that monitors model usage and use that information to help inform model choices and prompt sizes",
-            "waf": "Cost Optimization"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "a3592718-e6e2-4051-9267-6ae46691e883",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "When in-guest encryption is used, store encryption keys in Azure Key vault when possible",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "166cd072-af9b-4141-a898-a535e737897e",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/quota?tabs=rest#understanding-rate-limits",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "5ac94222-3e13-4810-9230-81a941741583",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Set a maximum limit on the number of tokens per model response (max_tokens and the number of completions to generate). Optimize the size to ensure it is large enough for a valid response",
-            "waf": "Cost Optimization"
+            "text": "Consider using extended security update support for workloads running on Azure VMware Solution (Azure VMware Solution is eligible for ESU)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "3266b225-86f4-4a16-92bd-ddea8a487cde",
-            "link": "https://learn.microsoft.com/azure/search/vector-search-index-size?tabs=portal-vector-quota",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Plan and manage AI Search Vector storage",
-            "waf": "Operational Excellence"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "3ef7ad7c-6d37-4331-95c7-acbe44bbe609",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure that the appropriate vSAN Data redundancy method is used (RAID specification)",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "b4861bc3-bc14-4aeb-9e66-e8d9a3aec218",
-            "link": "https://learn.microsoft.com/azure/machine-learning/prompt-flow/how-to-end-to-end-llmops-with-prompt-flow?view=azureml-api-2",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Ensure deployment of Azure OpenAI instances across your various environments, such as development, test, and production supporting lrarning & experimentation. Apply LLMOps practices to automate the lifecycle management of your GenAI applications",
-            "waf": "Operational Excellence"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d88408f3-7273-44c8-96ba-280214590146",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure that the Failure-to-tolerate policy is in place to meet your vSAN storage needs",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "aa80932c-8ec9-4d1b-a770-26e5e6beba9e",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/provisioned-throughput-onboarding#understanding-the-provisioned-throughput-purchase-model",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d89f2e87-7784-424d-9167-85c6fa95b96a",
+            "service": "AVS",
             "severity": "High",
-            "text": "Evaluate usage of billing models - PAYG vs PTU. Start with PAYG and consider PTU when the usage is predictable in production since it offers dedicated memory and compute, reserved capacity, and consistent maximum latency for the specified model version",
-            "waf": "Cost Optimization"
+            "text": "Ensure that you have requested enough quota, ensuring you have considered growth and Disaster Recovery requirement",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "e6436b07-36db-455f-9796-03334bdf9cc2",
-            "link": "https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/how-to-control-azure-openai-models/ba-p/4146793",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "5d38e53f-9ccb-4d86-a266-acca274faa19",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Evaluate the quality of  prompts and applications when switching between model versions",
-            "waf": "Operational Excellence"
+            "text": "Ensure that access constraints to ESXi are understood, there are access limits which might affect 3rd party solutions.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "3418db61-2712-4650-9bb4-7a393a080327",
-            "link": "https://learn.microsoft.com/azure/machine-learning/prompt-flow/concept-model-monitoring-generative-ai-evaluation-metrics?view=azureml-api-2",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "bf39d95d-44c7-4c89-89ca-1f6d5315ae52",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Evaluate, monitor and refine your GenAI apps for features like groundedness, relevance, accuracy, coherence and fluency",
-            "waf": "Operational Excellence"
+            "text": "Ensure that you have a policy around ESXi host density and efficiency, keeping in mind the lead time for requesting new nodes",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "294798b1-578b-4219-a46c-eb5443513592",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "4ba34d45-85e1-4213-abd7-bb012f7b95ef",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Evaluate your Azure AI Search results based on different search parameters",
-            "waf": "Operational Excellence"
+            "text": "Ensure a good cost management process is in place for Azure VMware Solution - Azure Cost Management can be used",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "2744293b-b628-4537-a551-19b08e8f5854",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/fine-tuning-considerations",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Look at fine tuning models as way of increasing accuracy only when you have tried other basic approaches like prompt engineering and RAG with your data",
-            "waf": "Operational Excellence"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "6e043e2a-a359-4271-ae6e-205172676ae4",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "Are Azure reserved instances used to optimize cost for using Azure VMware Solution",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "287d9cec-166c-4d07-8af9-b141a898a535",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/advanced-prompt-engineering?pivots=programming-language-chat-completions",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "6691e883-5ac9-4422-83e1-3810523081a9",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Use prompt engineering techniques to improve the accuracy of LLM responses",
-            "waf": "Operational Excellence"
+            "text": "Consider the use of Azure Private-Link when using other Azure Native Services",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "e737897e-71ca-47da-acfa-962a1594946d",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/red-teaming",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "db611712-6904-40b4-aa3d-3e0803276d4b",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure all required resource reside within the same Azure availability zone(s)",
+            "waf": "Performance"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "48b262d6-cc5f-4512-a253-98e6db9d37da",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Red team your GenAI applications",
+            "text": "Enable Microsoft Defender for Cloud for Azure VMware Solution guest VM workloads",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "edb117e6-76aa-4f66-aca4-8e5a95f2223e",
-            "link": "https://www.microsoft.com/haxtoolkit/guideline/encourage-granular-feedback/",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "41741583-3ef7-4ad7-a6d3-733165c7acbe",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Provide end users with scoring options for LLM responses and track these scores. ",
-            "waf": "Operational Excellence"
+            "text": "Use Azure Arc enabled servers to manage your Azure VMware Solution guest VM workloads",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "d5f3547c-c346-4d81-9028-a71ffe1b9b5d",
-            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/optimizing-azure-openai-a-guide-to-limits-quotas-and-best/ba-p/4076268",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "88f03a4d-2cd4-463c-abbc-868295abc91a",
+            "service": "AVS",
             "severity": "High",
-            "text": "Consider Quota management practices. Use dynamic quota for certain use cases when your application can use extra capacity opportunistically or the application itself is driving the rate at which the Azure OpenAI API is called",
-            "waf": "Cost Optimization"
-        },
-        {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc410",
-            "link": "https://github.com/Azure/aoai-apim/blob/main/README.md",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Use Load balancer solutions like APIM based gateway for balancing load and capacity across services and regions",
-            "waf": "Operational Excellence"
+            "text": "Enable Diagnostic and metric logging on Azure VMware Solution",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc411",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/fine-tuning?tabs=turbo%2Cpython-new&pivots=programming-language-studio#import-training-data-from-azure-blob-store",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "4ed90dae-2cc8-44c4-9b6b-781cbafe6c46",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Follow the guidance for fine-tuning with large data files and import the data from an Azure blob store. Large files, 100 MB or larger, can become unstable when uploaded through multipart forms because the requests are atomic and can't be retried or resumed",
-            "waf": "Reliability"
+            "text": "Deploy the Log Analytics Agents to Azure VMware Solution guest VM workloads",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc412",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/quota?tabs=rest",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "589d457a-927c-4397-9d11-02cad6aae11e",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Manage rate limits for your model deployments and monitor usage of tokens per minute (TPM) and requests per minute (RPM) for pay-as-you-go deployments",
-            "waf": "Reliability"
+            "text": "Ensure you have a documented and implemented backup policy and solution for Azure VMware Solution VM workloads",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc413",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitor-openai",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "ee29711b-d352-4caa-ab79-b198dab81932",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Monitor provision-managed utilization if you're using the provisioned throughput payment model",
-            "waf": "Reliability"
+            "text": "Use Microsoft Defender for Cloud for compliance monitoring of workloads running on Azure VMware Solution",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc414",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/content-filters",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "c9fc9d1b-b780-436f-9e6b-fbb9ed503547",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Tune content filters to minimize false positives from overly aggressive filters",
-            "waf": "Reliability"
+            "text": "Are the applicable compliance baselines added to Microsoft Defender for Cloud",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc415",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/encrypt-data-at-rest",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Use customer-managed keys for fine-tuned models and training data that's uploaded to Azure OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "cc447e82-6128-4a71-b0f1-cac6d9ef1d5e",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Was data residency evaluated when selecting Azure regions to use for Azure VMware Solution deployment",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "graph": "resources | where type == 'microsoft.cognitiveservices/accounts' and kind =~ 'contentsafety' | project id, compliant = 1",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc416",
-            "link": "https://learn.microsoft.com/azure/ai-services/content-safety/concepts/jailbreak-detection",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Implement jailbreak risk detection to safeguard your language model deployments against prompt injection attacks",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "832e42e3-611c-4818-a0a0-bc510e43a18a",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Are data processing implications (service provider / service consumer model) clear and documented",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "9de0d5d7-31d4-41e3-911c-817bfafbc417",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/monitor-openai",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "547c1747-dc56-4068-a714-435cd19dd244",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Use security controls like throttling, service isolation and gateway pattern to prevent attacks that might exhaust model usage quotas",
+            "text": "Consider using CMK (Customer Managed Key) for vSAN only if needed for compliance reason(s).",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a9",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Develop your cost model, considering prompt sizes. Understanding prompt input and response sizes and how text translates into tokens helps you create a viable cost model",
-            "waf": "Cost Optimization"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "e43a18a9-cd28-49ce-b6b1-7db8255461e2",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Create dashboards to enable core Azure VMware Solution monitoring insights",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a1",
-            "link": "https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Consider model pricing and capabilities when you choose models. Start with less-costly models for less-complex tasks like text generation or completion tasks and for complex tasks like language translation or content understanding, consider using more advanced models. Optimize costs while still achieving the desired application performance",
-            "waf": "Cost Optimization"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "graph": "resources| where type =~ 'Microsoft.AVS/privateClouds'| join kind=leftouter(resources| where type =~ 'Microsoft.Insights/metricalerts'| mv-expand scopes=properties.scopes| mv-expand criteria=properties.criteria.allOf| extend metricName=criteria.metricName| distinct tostring(scopes), tostring(metricName))on $left.id == $right.scopes| extend compliant=toint(metricName in ('UsageAverage', 'EffectiveCpuAverage', 'DiskUsedPercentage'))| summarize compliant=min(compliant) by id",
+            "guid": "6b84ee5d-f47d-42d9-8881-b1cd5d1e54a2",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Create warning alerts for critical thresholds for automatic alerting on Azure VMware Solution performance (CPU >80%, Avg Memory >80%, vSAN >70%)",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a2",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Maximize Azure OpenAI price breakpoints like fine-tuning and model breakpoints like image generation to your advantage. Fine-tuning is charged per hour, use as much time as you have available per hour to improve results without slipping into the next billing period. The cost for generating 100 images is the same as the cost for 1 image",
-            "waf": "Cost Optimization"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "graph": "resources| where type =~ 'Microsoft.AVS/privateClouds'| join kind=leftouter(resources| where type =~ 'Microsoft.Insights/metricalerts'| mv-expand scopes=properties.scopes| mv-expand criteria=properties.criteria.allOf| extend metricName=criteria.metricName| distinct tostring(scopes), tostring(metricName))on $left.id == $right.scopes| extend compliant=toint(metricName in ('UsageAverage', 'EffectiveCpuAverage', 'DiskUsedPercentage'))| summarize compliant=min(compliant) by id",
+            "guid": "9659e396-80e7-4828-ac93-5657d02bff45",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure critical alert is created to monitor if vSAN consumption is below 75% as this is a support threshold from VMware",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "72d41e36-11cc-457b-9a4b-1410d43958a3",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Remove unused fine-tuned models when they're no longer being consumed to avoid incurring an ongoing hosting fee",
-            "waf": "Cost Optimization"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "graph": "resources| distinct subscriptionId| join kind=leftouter(    resources    | where type =~ 'microsoft.insights/activitylogalerts'    | mv-expand condition1 = properties.condition.allOf    | mv-expand condition2 = condition1.anyOf    | extend alertEnabled = tostring(properties.enabled)    | summarize set_condition1=make_set(condition1.equals), set_condition2=make_set(condition2.equals) by id, name,type,tenantId,resourceGroup,subscriptionId, alertEnabled    | where set_has_element(set_condition1, 'ServiceHealth')    | extend category = 'ServiceHealth'    | extend all = iff(set_has_element(set_condition1, 'ServiceHealth') and array_length(set_condition2) == 0, true, false)    | extend incident = iff(all, true, iff(set_has_element(set_condition1, 'Incident'), true, set_has_element(set_condition2, 'Incident')))    | extend maintenance = iff(all, true, iff(set_has_element(set_condition1, 'Maintenance'), true, set_has_element(set_condition2, 'Maintenance')))    | extend informational = iff(all, true, iff(set_has_element(set_condition1, 'Informational') or set_has_element(set_condition1, 'ActionRequired'), true, set_has_element(set_condition2, 'Informational') or set_has_element(set_condition2, 'ActionRequired')))    | extend security = iff(all, true, iff(set_has_element(set_condition1, 'Security'), true, set_has_element(set_condition2, 'Security')))    | project id, name, subscriptionId, category, tostring(alertEnabled), tostring(incident), tostring(maintenance), tostring(informational), tostring(security)    | summarize count_alertEnabled=countif(alertEnabled == 'true'), count_incident=countif(incident == 'True'), count_maintenance=countif(maintenance == 'True'), count_informational=countif(informational == 'True'), count_security=countif(security == 'True') by subscriptionId)     on subscriptionId| project subscriptionId, alertEnabled=iff(isnotnull(count_alertEnabled), count_alertEnabled, 0), incident=iff(isnotnull(count_incident), count_incident, 0), security=iff(isnotnull(count_security), count_security, 0), maintenance=iff(isnotnull(count_maintenance), count_maintenance, 0), informational=iff(isnotnull(count_informational), count_informational, 0)| order by incident, maintenance, informational, security desc| project id=subscriptionId, compliant=(alertEnabled > 0 and incident > 0 and security > 0 and maintenance > 0 and informational > 0)",
+            "guid": "64b0d934-a348-4726-be79-d6b5c3a36495",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure alerts are configured for Azure Service Health alerts and notifications",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "7f42c78e-78cb-46a2-8ad1-90916e6a8d8g",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/manage-costs",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "b6abad38-aad5-43cc-99e1-d86667357c54",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Create concise prompts that provide enough context for the model to generate a useful response. Also ensure that you optimize the limit of the response length.",
-            "waf": "Cost Optimization"
+            "text": "Configure Azure VMware Solution logging to be send to an Azure Storage account or Azure EventHub for processing",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "b4861bc3-bc14-4aeb-9e66-e8d9a3aec219",
-            "link": "https://learn.microsoft.com/azure/ai-services/create-account-bicep",
-            "service": "OpenAI",
-            "severity": "Medium",
-            "text": "Use infrastructure as code (IaC) to deploy Azure OpenAI, model deployments, and other infrastructure required for fine-tuning models",
-            "waf": "Operational Excellence"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "9674c5ed-85b8-459c-9733-be2b1a27b775",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "If deep insight in VMware vSphere is required: Is vRealize Operations and/or vRealize Network Insights used in the solution?",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Azure OpenAI Review",
-            "guid": "2744293b-b628-4537-a551-19b08e8f5855",
-            "link": "https://learn.microsoft.com/azure/architecture/guide/multitenant/service/openai",
-            "service": "OpenAI",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "a91be1f3-88f0-43a4-b2cd-463cbbbc8682",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Ensure the vSAN storage policy for VM's is NOT the default storage policy as this policy applies thick provisioning",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d9ef1d5e-832d-442e-9611-c818b0afbc51",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Consider using dedicated model deployments per consumer group to provide per-model usage isolation that can help prevent noisy neighbors between your consumer groups",
-            "waf": "Operational Excellence"
+            "text": "Ensure vSphere content libraries are not placed on vSAN as vSAN is a finite resource",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "Using the correct approach to feed a datalake with cold data and having the Kusto query engine at your disposal at the same time, as in the short-term storage",
-            "guid": "ba7da7be-9951-4914-a384-5d997cb39132",
-            "link": "https://learn.microsoft.com/azure/data-explorer/kusto/management/data-export/continuous-data-export",
-            "service": "Azure Data Explorer",
-            "text": "Leverage External Tables and Continuous data export overview to reduce costs",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "0e43a18a-9cd2-489b-bd6b-17db8255461e",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Ensure data repositories for the backup solution are stored outside of vSAN storage. Either in Azure native or on a disk pool-backed datastore",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "Azure Data Explorer provides an optional follower capability for a leader cluster to be followed by other follower clusters for read-only access to the leader's data and metadata. Changes in the leader, such as create, append, and drop are automatically synchronized to the follower. While the leaders could span Azure regions, the follower clusters should be hosted in the same region(s) as the leader. If the leader cluster is down or databases or tables are accidentally dropped, the follower clusters will lose access until access is recovered in the leader.",
-            "guid": "56a22586-f490-4641-addd-ea8a377cdeb3",
-            "link": "https://learn.microsoft.com/azure/data-explorer/follower?tabs=csharp",
-            "service": "Azure Data Explorer",
-            "text": "To share data, explore Leader-follower cluster configuration",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "2aee3453-aec8-4339-848b-262d6cc5f512",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Ensure workloads running on Azure VMware Solution are hybrid managed using Azure Arc for Servers (Arc for Azure VMware Solution is in preview)",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "Azure Data Explorer doesn't support automatic protection against the outage of an entire Azure region. This disruption can happen during a natural disaster, like an earthquake. If you require a solution for a disaster recovery situation, do the following steps to ensure business continuity. In these steps, you'll replicate your clusters, management, and data ingestion in two Azure paired regions.",
-            "guid": "861bb2bc-14ae-4a6e-95d8-d9a3adc218e6",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-create-solution#create-multiple-independent-clusters",
-            "service": "Azure Data Explorer",
-            "text": "To protect against regional failure, create Multiple independent clusters, preferably in two Azure Paired regions",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "925398e6-da9d-437d-ac43-bc6cd1d79a9b",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Ensure workloads running on Azure VMware Solution are monitored using Azure Log Analytics and Azure Monitor",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "guid": "436b0635-cb45-4e57-a603-324ace8cc123",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-create-solution#replicate-management-activities",
-            "service": "Azure Data Explorer",
-            "text": "Replicate all management activities such as creating new tables or managing user roles on each cluster.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "24604489-a8f4-42d7-ae78-cb6a33bd2a09",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Include workloads running on Azure VMware Solution in existing update management tooling or in Azure Update Management",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "guid": "18ca6017-0265-4f4b-a46a-393af7f31728",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-create-solution",
-            "service": "Azure Data Explorer",
-            "text": "Ingest data into each cluster in parallel",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "17e7a8d9-0ae0-4e27-aee2-9711bd352caa",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Use Azure Policy to onboard Azure VMware Solution workloads in the Azure Management, Monitoring and Security solutions",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "This configuration is also called 'always-on'. For critical application deployments with no tolerance for outages, you should use multiple Azure Data Explorer clusters across Azure paired regions.",
-            "guid": "58a9c279-9c42-4bb6-9d0c-65556246b338",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#active-active-active-configuration",
-            "service": "Azure Data Explorer",
-            "text": "For critical application with no tolerance for outages, create Active-Active-Active (always-on) configuration",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "aee3553a-fc83-4392-98b2-62d6cc5f5129",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Ensure workloads running on Azure VMware Solution are onboarded to Microsoft Defender for Cloud",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "This configuration is identical to the active-active-active configuration, but only involves two Azure paired regions. Configure dual ingestion, processing, and curation. Users are routed to the nearest region. The cluster SKU must be the same across regions.",
-            "guid": "563a4dc7-4a74-48b6-922a-d190916a6649",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#active-active-configuration",
-            "service": "Azure Data Explorer",
-            "text": "For critical applications, create Active-Active configuration in two paired regions",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "25398e6d-b9d3-47da-a43b-c6cd1d79a9b2",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Ensure backups are not stored on vSAN as vSAN is a finite resource",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "The Active-Hot configuration is similar to the Active-Active configuration in dual ingest, processing, and curation. While the standby cluster is online for ingestion, process, and curation, it isn't available to query. The standby cluster doesn't need to be in the same SKU as the primary cluster. It can be of a smaller SKU and scale, which may result in it being less performant. In a disaster scenario, users are redirected to the standby cluster, which can optionally be scaled up to increase performance.",
-            "guid": "8fadfe27-7de2-483b-8ac3-52baa9b75708",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#active-hot-standby-configuration",
-            "service": "Azure Data Explorer",
-            "text": "For applications, which required only read during failure, create Active-Hot standby configuration",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "5e6bfbb9-ed50-4354-9cc4-47e826028a71",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Have all DR solutions been considered and a solution that is best for your business been decided upon? [SRM/JetStream/Zerto/Veeam/...]",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "This solution offers the least resiliency (highest RPO and RTO), is the lowest in cost and highest in effort. In this configuration, there's no data recovery cluster. Configure continuous export of curated data (unless raw and intermediate data is also required) to a storage account that is configured GRS (Geo Redundant Storage). A data recovery cluster is spun up if there is a disaster recovery scenario. At that time, DDLs, configuration, policies, and processes are applied. Data is ingested from storage with the ingestion property kustoCreationTime to over-ride the ingestion time that defaults to system time.",
-            "guid": "49aa8092-dc8e-4b9d-8bb7-3b26a5a67eba",
-            "link": "https://learn.microsoft.com/azure/data-explorer/business-continuity-overview#on-demand-data-recovery-configuration",
-            "service": "Azure Data Explorer",
-            "text": "For applications, where cost is a concern and can withstand some downtime during failure, create on-demand data recovery cluster configuration",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "f0f1cac6-d9ef-41d5-b832-d42e3611c818",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Use Azure Site Recovery when the Disaster Recovery technology is native Azure IaaS",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "description": "All database objects, policies, and configurations should be persisted in source control so they can be released to the cluster from your release automation tool.",
-            "guid": "5a907e1e-348e-4f25-9c27-d32e8bbac757",
-            "link": "https://learn.microsoft.com/azure/data-explorer/devops",
-            "service": "Azure Data Explorer",
-            "text": "Wrap DevOps and source control around all your code",
-            "training": "https://learn.microsoft.com/learn/paths/secure-your-cloud-data/",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "b0afbc51-0e43-4a18-a9cd-289bed6b17db",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Use Automated recovery plans with either of the Disaster solutions, avoid manual tasks as much as possible",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "guid": "1559ab91-53e8-4908-ae28-b84c33b6b780",
-            "link": "https://learn.microsoft.com/azure/data-explorer/devops",
-            "service": "Azure Data Explorer",
-            "text": "Design, develop, and implement validation routines to ensure all clusters are in-sync from a data perspective.",
-            "training": "https://learn.microsoft.com/learn/modules/azure-active-directory/",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "8255461e-2aee-4345-9aec-8339248b262d",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Use the geopolitical region pair as the secondary disaster recovery environment",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Kusto/clusters",
-            "checklist": "Azure Data Explorer Review Checklist",
-            "guid": "8b9fe5c4-1049-4d40-9a82-2c3474d00f18",
-            "link": "https://learn.microsoft.com/azure/data-explorer/devops",
-            "service": "Azure Data Explorer",
-            "text": "Be fully cognizant of what it takes to build a cluster from scratch. Leverage Infrastructure as a Code for your deployments",
-            "training": "https://learn.microsoft.com/learn/modules/implement-hybrid-identity-windows-server/",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "6cc5f512-9253-498e-9da9-d37dac43bc6c",
+            "service": "AVS",
+            "severity": "High",
+            "text": "Use 2 different address spaces between the regions, for example: 10.0.0.0/16 and 192.168.0.0/16 for the different regions",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "Azure Data Factory Review Checklist",
-            "guid": "ab91932c-9fc9-4d1b-a881-37f5e6c0cb9e",
-            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/paas-foundations-playbooks-ADF_v1.docx",
-            "service": "Azure Data Factory",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d1d79a9b-2460-4448-aa8f-42d78e78cb6a",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Leverage FTA Resiliency Playbook for Azure Data Factory",
+            "text": "Will ExpressRoute Global Reach be used for connectivity between the primary and secondary Azure VMware Solution Private Clouds or is routing done through network virtual appliances?",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "Azure Data Factory Review Checklist",
-            "guid": "e503547c-d447-4e82-9138-a7200f1cac6d",
-            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/analytics/pipelines-disaster-recovery",
-            "service": "Azure Data Factory",
-            "severity": "High",
-            "text": "Use zone redundant pipelines in regions that support Availability Zones",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "33bd2a09-17e7-4a8d-a0ae-0e27cee29711",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "Have all Backup solutions been considered and a solution that is best for your business been decided upon? [ MABS/CommVault/Metallic.io/Veeam/�. ]",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "Azure Data Factory Review Checklist",
-            "guid": "9ef1d6e8-32e5-42e3-911c-818b1a0bc511",
-            "link": "https://learn.microsoft.com/azure/data-factory/source-control",
-            "service": "Azure Data Factory",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "bd352caa-ab79-4b18-adab-81932c9fc9d1",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Use DevOps to Backup the ARM templates with Github/Azure DevOps integration ",
+            "text": "Deploy your backup solution in the same region as your Azure VMware Solution private cloud",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "Azure Data Factory Review Checklist",
-            "guid": "e43a18a9-cd29-49cf-b7b1-7db8255562f2",
-            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/analytics/pipelines-disaster-recovery",
-            "service": "Azure Data Factory",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "bb77036f-5e6b-4fbb-aed5-03547cc447e8",
+            "service": "AVS",
             "severity": "Medium",
-            "text": "Make sure you replicate the Self-Hosted Integration Runtime VMs in another region ",
+            "text": "Deploy your backup solution outside of vSan, on Azure native components",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "Azure Data Factory Review Checklist",
-            "guid": "aee4563a-fd83-4393-98b2-62d6dc5f512a",
-            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/analytics/pipelines-disaster-recovery",
-            "service": "Azure Data Factory",
-            "severity": "Medium",
-            "text": "Make sure you replicate or duplicate your network in the sister region. You have to make a copy of your Vnet in another region",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "26028a71-f0f1-4cac-9d9e-f1d5e832d42e",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "Is a process in place to request a restore of the VMware components managed by the Azure Platform?",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "Azure Data Factory Review Checklist",
-            "description": "If your ADF Pipelines use Key Vault you don't have to do anything to replicate Key Vault. Key Vault is a managed service and Microsoft takes care of it for you",
-            "guid": "25498f6d-bad3-47da-a43b-c6ce1d7aa9b2",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/disaster-recovery-guidance",
-            "service": "Azure Data Factory",
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "4604489a-8f42-4d78-b78c-b7a33bd2a0a1",
+            "service": "AVS",
             "severity": "Low",
-            "text": "If using Keyvault integration, use SLA of Keyvault to understand your availablity",
-            "waf": "Reliability"
+            "text": "For manual deployments, all configuration and deployments must be documented",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.cache/redis",
-            "checklist": "Redis Resiliency checklist",
-            "guid": "65285269-440b-44be-9d3e-0844276d4bdc",
-            "link": "https://learn.microsoft.com/azure/azure-cache-for-redis/cache-how-to-zone-redundancy",
-            "service": "Redis",
-            "severity": "High",
-            "text": "Enable zone redundancy for Azure Cache for Redis. Azure Cache for Redis supports zone redundant configurations in the Premium and Enterprise tiers. A zone redundant cache can place its nodes across different Azure Availability Zones in the same region. It eliminates data center or AZ outage as a single point of failure and increases the overall availability of your cache.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "7e7a8d90-ae0e-437c-be29-711bd352caaa",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "For manual deployments, consider implementing resource locks to prevent accidental actions on your Azure VMware Solution Private Cloud",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.cache/redis",
-            "checklist": "Redis Resiliency checklist",
-            "guid": "bc178bdc-5a06-4ca7-8443-51e19dd34429",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-cache-for-redis/cache-high-availability#persistence",
-            "service": "Redis",
-            "severity": "Medium",
-            "text": "Configure data persistence for an Azure Cache for Redis instance. Because your cache data is stored in memory, a rare and unplanned failure of multiple nodes can cause all the data to be dropped. To avoid losing data completely, Redis persistence allows you to take periodic snapshots of in-memory data, and store it to your storage account.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "b79b198d-ab81-4932-a9fc-9d1bb78036f5",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "For automated deployments, deploy a minimal private cloud and scale as needed",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.cache/redis",
-            "checklist": "Redis Resiliency checklist",
-            "guid": "eb722823-7a15-41c5-ab4e-4f1814387e5c",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-cache-for-redis/cache-high-availability#storage-account-for-persistence",
-            "service": "Redis",
-            "severity": "Medium",
-            "text": "Use Geo-redundant storage account to persist Azure Cache for Redis data, or zonally redundant where geo-redundancy is not available",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "e6bfbb9e-d503-4547-ac44-7e826128a71f",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "For automated deployments,  request or reserve quota prior to starting the deployment",
+            "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.cache/redis",
-            "checklist": "Redis Resiliency checklist",
-            "guid": "a8c26c9b-32ab-45bd-bc69-98a135e33789",
-            "link": "https://learn.microsoft.com/azure/azure-cache-for-redis/cache-how-to-geo-replication",
-            "service": "Redis",
-            "severity": "Medium",
-            "text": "Configure passive geo-replication for Premium Azure Cache for Redis instances. Geo-replication is a mechanism for linking two or more Azure Cache for Redis instances, typically spanning two Azure regions. Geo-replication is designed mainly for cross-region disaster recovery. Two Premium tier cache instances are connected through geo-replication in a way that provides reads and writes to your primary cache, and that data is replicated to the secondary cache.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "0f1cac6d-9ef1-4d5e-a32e-42e3611c818b",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "For automated deployment, ensure that relevant resource locks are created through the automation or through Azure Policy for proper governance",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "32e42e36-11c8-418b-8a0b-c510e43a18a9",
+            "guid": "e2cc95d4-8c6b-4791-bca0-f6c56589e558",
             "service": "AVS",
-            "severity": "High",
-            "text": "Ensure ADDS domain controller(s) are deployed in the identity subscription in native Azure",
-            "waf": "Security"
+            "severity": "Low",
+            "text": "Implement human understandable names for ExR authorization keys to allow for easy identification of the keys purpose/use",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "75089c20-990d-4927-b105-885576f76fc2",
+            "guid": "255461e2-aee3-4553-afc8-339248b262d6",
             "service": "AVS",
-            "severity": "Medium",
-            "text": "Ensure ADDS sites and services is configured to keep authentication requests from Azure-based resources (including Azure VMware Solution) local to Azure",
-            "waf": "Security"
+            "severity": "Low",
+            "text": "Use Key vault to store secrets and authorization keys when separate Service Principles are used for deploying Azure VMware Solution and ExpressRoute",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "de3aad1e-7c28-4ec9-9666-b7570449aa80",
+            "guid": "cc5f5129-2539-48e6-bb9d-37dac43bc6cd",
             "service": "AVS",
-            "severity": "High",
-            "text": "Ensure that vCenter is connected to ADDS to enable authentication based on 'named user accounts'",
-            "waf": "Security"
+            "severity": "Low",
+            "text": "Define resource dependencies for serializing actions in IaC when many resources need to be deployed in/on Azure VMware Solution as Azure VMware Solution only supports a limited number of parallel operations.",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "cd289ced-6b17-4db8-8554-61e2aee3553a",
+            "guid": "1d79a9b2-4604-4489-a8f4-2d78e78cb7a3",
+            "service": "AVS",
+            "severity": "Low",
+            "text": "When performing automated configuration of NSX-T segments with a single Tier-1 gateway, use Azure Portal APIs instead of NSX-Manager APIs",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "3bd2a0a1-7e7a-48d9-8ae0-e37cee29711b",
+            "service": "AVS",
+            "severity": "Medium",
+            "text": "When intending to use automated scale-out, be sure to apply for sufficient Azure VMware Solution quota for the subscriptions running Azure VMware Solution",
+            "waf": "Performance"
+        },
+        {
+            "arm-service": "Microsoft.AVS/privateClouds",
+            "checklist": "Azure VMware Solution Design Review",
+            "guid": "d352caaa-b79b-4198-bab8-1932c9fc9d1b",
             "service": "AVS",
             "severity": "Medium",
-            "text": "Ensure that the connection from vCenter to ADDS is using a secure protocol (LDAPS)",
-            "waf": "Security"
+            "text": "When intending to use automated scale-in, be sure to take storage policy requirements into account before performing such action",
+            "waf": "Performance"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "b9d37dac-43bc-46cd-8d79-a9b24604489a",
+            "guid": "b78036f5-e6bf-4bb9-bd50-3547cc447e82",
             "service": "AVS",
             "severity": "Medium",
-            "text": "CloudAdmin account in vCenter IdP is used only as an emergency account (break-glass)",
-            "waf": "Security"
+            "text": "Scaling operations always need to be serialized within a single SDDC as only one scale operation can be performed at a time (even when multiple clusters are used)",
+            "waf": "Performance"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "53d88e89-d17b-473b-82a5-a67e7a9ed5b3",
+            "guid": "bf15bce2-19e4-4a0e-a588-79424d226786",
             "service": "AVS",
-            "severity": "High",
-            "text": "Ensure that NSX-Manager is integrated with an external Identity provider (LDAPS)",
-            "waf": "Security"
+            "severity": "Medium",
+            "text": "Consider and validate scaling operations on 3rd party solutions used in the architecture (supported or not)",
+            "waf": "Performance"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "ae0e37ce-e297-411b-b352-caaab79b198d",
+            "guid": "d20b56c5-7be5-4851-a0f8-3835c586cb29",
             "service": "AVS",
             "severity": "Medium",
-            "text": "Has an RBAC model been created for use within VMware vSphere",
-            "waf": "Security"
+            "text": "Define and enforce scale in/out maximum limits for your environment in the automations",
+            "waf": "Performance"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "ab81932c-9fc9-4d1b-a780-36f5e6bfbb9e",
+            "guid": "1dc15a1c-075e-4e9f-841a-cccd579376bc",
             "service": "AVS",
             "severity": "Medium",
-            "text": "RBAC permissions should be granted on ADDS groups and not on specific users",
-            "waf": "Security"
+            "text": "Implement monitoring rules to monitor automated scaling operations and monitor success and failure to enable appropriate (automated) responses",
+            "waf": "Operations"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "d503547c-c447-4e82-9128-a71f0f1cac6d",
+            "guid": "c5972cd4-cd21-4b07-9036-f5e6b4bfd3d5",
+            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
             "service": "AVS",
             "severity": "High",
-            "text": "RBAC permissions on the Azure VMware Solution resource in Azure are 'locked down' to a limited set of owners only",
-            "waf": "Security"
+            "text": "When using MON, be aware of the limits of simulataneously configured VMs (MON Limit for HCX [400 - standard, 1000 - Larger appliance])",
+            "training": "https://learn.microsoft.com/learn/modules/configure-azure-ad-application-proxy/",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "fd9f0df4-68dc-4976-b9a9-e6a79f7682c5",
+            "guid": "be1f38cf-03a8-422b-b463-cbbbc8ac299e",
+            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
             "service": "AVS",
             "severity": "High",
-            "text": "Ensure all custom roles are scoped with CloudAdmin permitted authorizations",
-            "waf": "Security"
+            "text": "When using MON, you cannot enable MON on more than 100 Network extensions",
+            "training": "https://learn.microsoft.com/learn/paths/implement-applications-external-access-azure-ad/",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "9ef1d5e8-32e4-42e3-911c-818b0a0bc510",
-            "link": "https://github.com/Azure/AzureCAT-AVS/tree/main/networking",
+            "guid": "bc91a43d-90da-4e2c-a881-4706f7c1cbaf",
             "service": "AVS",
-            "severity": "High",
-            "text": "Is the correct Azure VMware Solution connectivity model selected for the customer use case at hand",
+            "severity": "Medium",
+            "text": "If using a VPN connection for migrations, adjust your MTU size accordingly.",
             "waf": "Performance"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "eb710a37-cbc1-4055-8dd5-a936a8bb7cf5",
+            "guid": "e614658d-d457-4e92-9139-b821102cad6e",
             "service": "AVS",
-            "severity": "High",
-            "text": "Ensure ExpressRoute or VPN connections from on-premises to Azure are monitored using 'connection monitor'",
-            "waf": "Operations"
+            "severity": "Medium",
+            "text": "For low connectivity regions connecting into Azure (500Mbps or less), considering deploying the HCX WAN optimization appliance",
+            "waf": "Performance"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "976e24f2-a7f8-426c-9253-2a92a2a7ed99",
+            "guid": "ae01e6e8-43e5-42f4-922d-928c1b1cd521",
             "service": "AVS",
             "severity": "Medium",
-            "text": "Ensure a connection monitor is created from an Azure native resource to an Azure VMware Solution virtual machine to monitor the Azure VMware Solution back-end ExpressRoute connection",
-            "waf": "Operations"
+            "text": "Ensure that migrations are started from the on-premises appliance and NOT from the Cloud appliance (do NOT perform a reverse migration)",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "f41ce6a0-64f3-4805-bc65-3ab50df01265",
+            "guid": "e54a29a9-de39-4ac0-b7c2-8dc935657202",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-policy-settings",
             "service": "AVS",
             "severity": "Medium",
-            "text": "Ensure a connection monitor is created from an on-premises resource to an Azure VMware Solution virtual machine to monitor end-2-end connectivity",
-            "waf": "Operations"
+            "text": "When Azure Netapp Files is used to extend storage for Azure VMware Solution,consider using this as a VMware datastore instead of attaching directly to a VM.",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "563b4dc7-4a74-48b6-933a-d1a0916a6649",
+            "guid": "bff4564b-0d93-44a3-98b2-63e7dd60513a",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#avoid-combining-traffic-manager-and-front-door",
             "service": "AVS",
-            "severity": "High",
-            "text": "When route server is used, ensure no more then 1000 routes are propagated from route server to ExR gateway to on-premises (ARS limit).",
-            "waf": "Operations"
+            "severity": "Medium",
+            "text": "Ensure that a dedicated ExpressRoute Gateway is being used for external data storage solutions",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "6128a71f-0f1c-4ac6-b9ef-1d5e832e42e3",
+            "guid": "3649906e-bad3-48ea-b53c-c7de1d8aaab3",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-the-same-domain-name-on-front-door-and-your-origin",
             "service": "AVS",
-            "severity": "High",
-            "text": "Is Privileged Identity Management implemented for roles managing the Azure VMware Solution resource in the Azure Portal (no standing permissions allowed)",
-            "waf": "Security"
+            "severity": "Medium",
+            "text": "Ensure that FastPath is enabled on the ExpressRoute Gateway that is being used for external data storage solutions",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "c4e2436b-b336-4d71-9f17-960eee0b9b5c",
+            "guid": "571549ab-8153-4d89-b89d-c7b33be2b1a2",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#disable-health-probes-when-theres-only-one-origin-in-an-origin-group",
             "service": "AVS",
             "severity": "High",
-            "text": "Privileged Identity Management audit reporting should be implemented for the Azure VMware Solution PIM roles",
-            "waf": "Security"
+            "text": "If using stretched cluster, ensure that your selected Disaster Recovery solution is supported by the vendor",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "78c447a8-26b2-4863-af0f-1cac599ef1d5",
+            "guid": "4c486b6d-8bdc-4059-acf7-5ee8a1309888",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#select-good-health-probe-endpoints",
             "service": "AVS",
-            "severity": "Medium",
-            "text": "If using Privileged Identity Management is being used, ensure that a valid Entra ID enabled account is created with a valid SMTP record for Azure VMware Solution Automatic Host replacement notifications. (standing permissions required)",
-            "waf": "Security"
+            "severity": "High",
+            "text": "If using stretched cluster, ensure that the SLA provided will meet your requirements",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "8defc4d7-21d3-41d2-90fb-707ae9eab40e",
+            "guid": "9579d66b-896d-471f-a6ca-7be9955d04c3",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-head-health-probes",
             "service": "AVS",
             "severity": "High",
-            "text": "Limit use of CloudAdmin account to emergency access only",
-            "waf": "Security"
+            "text": "If using stretched cluster, ensure that both ExpressRoute circuits are connected to your connectivity hub.",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "d329f798-bc17-48bd-a5a0-6ca7144351d1",
+            "guid": "c49d987c-b3d1-4325-aa12-4b6e4d0685ed",
+            "link": "https://learn.microsoft.com/azure/nat-gateway/nat-overview#outbound-connectivity",
             "service": "AVS",
-            "severity": "Medium",
-            "text": "Create custom RBAC roles in vCenter to implement a least-privilege model inside vCenter",
-            "waf": "Security"
+            "severity": "High",
+            "text": "If using stretched cluster, ensure that both ExpressRoute circuits have GlobalReach enabled.",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.AVS/privateClouds",
             "checklist": "Azure VMware Solution Design Review",
-            "guid": "9dd24429-eb72-4281-97a1-51c5bb4e4f18",
+            "guid": "dce9793b-7bcd-4b3b-91eb-2ec14eea6e59",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-managed-tls-certificates",
             "service": "AVS",
-            "severity": "Medium",
-            "text": "Is a process defined to regularly rotate cloudadmin (vCenter) and admin (NSX) credentials",
-            "waf": "Security"
+            "severity": "High",
+            "text": "Have site disaster tolerance settings been properly considered and changed for your business if needed.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "586cb291-ec16-4a1d-876e-f9f141acdce5",
-            "service": "AVS",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "4238f409-2ea0-43be-a06b-2a993c98aa7b",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-scale#overview-of-plans",
+            "service": "Azure Functions",
             "severity": "High",
-            "text": "Use a centralized identity provider to be used for workloads (VM's) running on Azure VMware Solution",
-            "waf": "Security"
+            "text": "Select the right Function hosting plan based on your business & SLO requirements",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "79377bcd-b375-41ab-8ab0-ead66e15d3d4",
-            "service": "AVS",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "a9808100-d640-4f77-ac56-1ec0600f6752",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-scale#overview-of-plans",
+            "query": "resources | where type =~ 'Microsoft.Web/sites' and kind has 'functionapp' and tolower(kind) !contains 'workflow' | extend aspResourceId = tostring(properties.serverFarmId), managedEnvId = tostring(properties.managedEnvironmentId), sku = tostring(properties.sku) | extend sku = iif(isnotempty(sku), sku, iif(isnotempty(managedEnvId), 'ContainerApps', '')) | where sku !in ('Dynamic', 'FlexConsumption', '') | extend aspName = tostring(split(aspResourceId, '/').[-1]), managedEnvName = tostring(split(managedEnvId, '/').[-1]) | extend HostingPlan = tostring(iif(isnotempty(aspName), aspName, managedEnvName)) | project functionAppName = name, functionAppId = id, HostingPlan, sku | join kind=inner ( resources | where type =~ 'Microsoft.Web/serverfarms' or type =~ 'Microsoft.App/managedEnvironments' | extend HostingPlan = tostring(name), zoneRedundant = tostring(properties.zoneRedundant), compliant = tobool(properties.zoneRedundant) | project HostingPlan, resourceId = id, zoneRedundant, compliant ) on HostingPlan | project functionAppName, functionAppId, sku, HostingPlan, resourceId, zoneRedundant, compliant",
+            "service": "Azure Functions",
+            "severity": "High",
+            "text": "Leverage Availability Zones where regionally applicable (not available for Consumption tier)",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "5969d03e-eacf-4042-b127-73c55e3575fa",
+            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-functions?tabs=azure-portal#cross-region-disaster-recovery-and-business-continuity",
+            "service": "Azure Functions",
             "severity": "Medium",
-            "text": "Is East-West traffic filtering implemented within NSX-T",
-            "waf": "Security"
+            "text": "Consider a Cross-Region DR strategy for critical workloads",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "a2adb1c3-d232-46af-825c-a44e1695fddd",
-            "service": "AVS",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "47a0aae0-d8a0-43b1-9791-e934dee3754c",
+            "link": "https://learn.microsoft.com/en-us/azure/app-service/environment/intro",
+            "service": "Azure Functions",
             "severity": "High",
-            "text": "Workloads on Azure VMware Solution are not directly exposed to the internet. Traffic is filtered and inspected by Azure Application Gateway, Azure Firewall or 3rd party solutions",
-            "waf": "Security"
+            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "eace4cb1-deb4-4c65-8c3f-c14eeab36938",
-            "service": "AVS",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "17232891-f89f-4eaa-90f1-3b34bf798ed5",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/dedicated-plan#always-on",
+            "query": "resources | where type =~ 'Microsoft.Web/sites' and kind has 'functionapp' | where tolower(kind) !contains 'workflow' | where isnotempty(properties.serverFarmId) | extend sku = tostring(properties.sku) | where isnotempty(sku) | where sku !in ('Dynamic', 'FlexConsumption', 'ElasticPremium') | extend alwaysOn = properties.siteConfig.alwaysOn | project functionAppName = name, functionAppId = id, serverFarmId = tostring(properties.serverFarmId), sku, alwaysOn, compliant = tobool(alwaysOn)",
+            "service": "Azure Functions",
             "severity": "High",
-            "text": "Auditing and logging is implemented for inbound internet requests to Azure VMware Solution and Azure VMware Solution based workloads",
-            "waf": "Security"
+            "text": "Ensure 'Always On' is enabled for all Function Apps running on App Service Plan",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "40a325c2-7c0e-49e6-86d8-c273b4dc21ba",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/storage-considerations?tabs=azure-cli#shared-storage-accounts",
+            "service": "Azure Functions",
+            "severity": "Medium",
+            "text": "Pair a Function App to its own storage account. Try not to re-use storage accounts for Function Apps unless they are tightly coupled",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Azure Function Review",
+            "guid": "bb42650c-257d-4cb0-822a-131138b8e6f0",
+            "link": "https://learn.microsoft.com/en-us/training/modules/deploy-azure-functions/",
+            "service": "Azure Functions",
+            "severity": "Medium",
+            "text": "Leverage Azure DevOps or GitHub to streamline CI/CD and safeguard your Function App code",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "Microsoft.BotService/botServices",
+            "checklist": "Azure Bot Service",
+            "guid": "6ad48408-ee72-4734-a476-ba28fdcf590c",
+            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-bot",
+            "service": "Bot service",
+            "severity": "Medium",
+            "text": "Follow reliability support recommendations in Azure Bot Service",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.BotService/botServices",
+            "checklist": "Azure Bot Service",
+            "guid": "e65de8e1-3f9c-4cbd-9682-66abca264f9a",
+            "link": "https://learn.microsoft.com/en-us/azure/bot-service/bot-builder-concept-regionalization",
+            "service": "Bot service",
+            "severity": "Medium",
+            "text": "Deploying bots with local data residency and regional compliance",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.BotService/botServices",
+            "checklist": "Azure Bot Service",
+            "guid": "19bfe9d5-5d04-4c3c-9919-ca1b2d1215ae",
+            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-bot#cross-region-disaster-recovery-in-multi-region-geography",
+            "service": "Bot service",
+            "severity": "Medium",
+            "text": "Azure Bot Service runs in active-active mode for both global and regional services. When an outage occurs, you don't need to detect errors or manage the service. Azure Bot Service automatically performs auto failover and auto recovery in a multi-region geographical architecture. For the EU bot regional service, Azure Bot Service provides two full regions inside Europe with active/active replication to ensure redundancy. For the global bot service, all available regions/geographies can be served as the global footprint.",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "6d8e32a8-3892-479d-a40b-10f6b4f6f298",
+            "link": "https://learn.microsoft.com/azure/spring-apps/concepts-blue-green-deployment-strategies",
+            "service": "Spring Apps",
+            "severity": "Medium",
+            "text": "Azure Spring Apps permits two deployments for every app, only one of which receives production traffic. You can achieve zero downtime with blue green deployment strategies. Blue green deployment is only available in Standard and Enterprise tiers. You could automate deployment using CI/CD with ADO/GitHub actions",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "29e3eec2-1836-487a-8077-a2b5945bda43",
-            "service": "AVS",
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "fbcb40ac-9480-4a6d-bcf4-8081252a6716",
+            "link": "https://learn.microsoft.com/azure/architecture/web-apps/spring-apps/architectures/spring-apps-multi-region",
+            "service": "Spring Apps",
             "severity": "Medium",
-            "text": "Session monitoring is implemented for outbound internet connections from Azure VMware Solution or Azure VMware Solution based workloads to identify suspicious/malicious activity",
-            "waf": "Security"
+            "text": "Azure Spring Apps instances could be created in multiple regions for your applications and traffic could be routed by Traffic Manager/Front Door.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "graph": "resources| where type =~ 'Microsoft.Network/virtualNetworkGateways'| mv-expand ipConfigurations=properties.ipConfigurations| project subnetId=tostring(ipConfigurations.properties.subnet.id)| where isnotempty(subnetId)| join (resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,enableDdosProtection=tostring(properties.enableDdosProtection),subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,enableDdosProtection,subnetId=tostring(subnets.id)) on subnetId | distinct id,resourceGroup,name,enableDdosProtection | project id, compliant = (enableDdosProtection == 'true')",
-            "guid": "334fdf91-c234-4182-a652-75269440b4be",
-            "service": "AVS",
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "ff1ae6a7-9301-4feb-9d11-56cd72f1d4ef",
+            "link": "https://learn.microsoft.com/azure/reliability/reliability-spring-apps",
+            "service": "Spring Apps",
             "severity": "Medium",
-            "text": "Is DDoS standard protection enabled on ExR/VPN Gateway subnet in Azure",
-            "waf": "Security"
+            "text": "In supported region, Azure Spring Apps can be deployed as zone redundant, which means that instances are automatically distributed across availability zones. This feature is only available in Standard and Enterprise tiers.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "3d3e0843-276d-44bd-a015-bcf219e4a1eb",
-            "service": "AVS",
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "ffc735ad-fbb1-4802-b43f-ad6387c4c066",
+            "link": "https://learn.microsoft.com/azure/spring-apps/concept-understand-app-and-deployment",
+            "service": "Spring Apps",
             "severity": "Medium",
-            "text": "Use a dedicated privileged access workstation (PAW) to manage Azure VMware Solution, vCenter, NSX manager and HCX manager",
-            "waf": "Security"
+            "text": "Use more than 1 app instance for your apps",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "9ccbd869-266a-4cca-874f-aa19bf39d95d",
-            "service": "AVS",
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "7504c230-6035-4183-95a5-85762acc6075",
+            "link": "https://learn.microsoft.com/azure/spring-apps/diagnostic-services",
+            "service": "Spring Apps",
             "severity": "Medium",
-            "text": "Enable Advanced Threat Detection (Microsoft Defender for Cloud aka ASC) for workloads running on Azure VMware Solution",
-            "waf": "Security"
+            "text": "Monitor Azure Spring Apps with logs, metrics and tracing. Integrate ASA with application insights and track failures and create workbooks.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "44c7c891-9ca1-4f6d-9315-ae524ba34d45",
-            "service": "AVS",
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "1eb48d58-3eec-4ef5-80b0-d2b0dde3f0c6",
+            "link": "https://learn.microsoft.com/azure/spring-apps/how-to-configure-enterprise-spring-cloud-gateway",
+            "service": "Spring Apps",
             "severity": "Medium",
-            "text": "Use Azure ARC for Servers to properly govern workloads running on Azure VMware Solution using Azure native technologies (Azure ARC for Azure VMware Solution is not yet available)",
-            "waf": "Security"
+            "text": "Set up autoscaling in Spring Cloud Gateway",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "85e12139-bd7b-4b01-8f7b-95ef6e043e2a",
-            "service": "AVS",
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "97411607-b6fd-4335-99d1-9885faf4e392",
+            "link": "https://learn.microsoft.com/azure/spring-apps/how-to-setup-autoscale",
+            "service": "Spring Apps",
             "severity": "Low",
-            "text": "Ensure workloads on Azure VMware Solution use sufficient data encryption during run-time (like in-guest disk encryption and SQL TDE). (vSAN encryption at rest is default)",
-            "waf": "Security"
+            "text": "Enable autoscale for the apps with Standard consumption & dedicated plan.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "a3592718-e6e2-4051-9267-6ae46691e883",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "When in-guest encryption is used, store encryption keys in Azure Key vault when possible",
-            "waf": "Security"
+            "arm-service": "Microsoft.AppPlatform/Spring",
+            "checklist": "Azure Spring Apps Review",
+            "guid": "dfcaffd1-d27c-4ef2-998d-64c1df3a7ac3",
+            "link": "https://learn.microsoft.com/azure/spring-apps/overview",
+            "service": "Spring Apps",
+            "severity": "Medium",
+            "text": "Use Enterprise plan for commercial support of spring boot for mission critical apps. With other tiers you get OSS support.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "5ac94222-3e13-4810-9230-81a941741583",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Apply guidance from the Microsoft cloud security benchmark related to Storage",
+            "guid": "d237de14-3b16-4c21-b7aa-9b64604489a8",
+            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/storage-security-baseline",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Consider using extended security update support for workloads running on Azure VMware Solution (Azure VMware Solution is eligible for ESU)",
+            "text": "Consider the 'Azure security baseline for storage'",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "3ef7ad7c-6d37-4331-95c7-acbe44bbe609",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Azure Storage by default has a public IP address and is Internet-reachable. Private endpoints allow to securely expose Azure Storage only to those Azure Compute resources that need access, thus eliminating exposure to the public Internet",
+            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | where isnull(properties.privateEndpointConnections) or properties.privateEndpointConnections[0].properties.provisioningState != ('Succeeded') or (isnull(properties.networkAcls) and properties.publicNetworkAccess == 'Enabled') | extend compliant = (isnotnull(properties.privateEndpointConnections) and properties.privateEndpointConnections[0].properties.provisioningState == 'Succeeded' and properties.publicNetworkAccess == 'Disabled') | distinct id, compliant",
+            "guid": "f42d78e7-9d17-4a73-a22a-5a67e7a8ed4b",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-private-endpoints",
+            "service": "Storage",
             "severity": "High",
-            "text": "Ensure that the appropriate vSAN Data redundancy method is used (RAID specification)",
-            "waf": "Reliability"
+            "text": "Consider using private endpoints for Azure Storage",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "d88408f3-7273-44c8-96ba-280214590146",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Ensure that the Failure-to-tolerate policy is in place to meet your vSAN storage needs",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Newly created storage accounts are created using the ARM deployment model, so that RBAC, auditing etc. are all enabled. Ensure that there are no old storage accounts with classic deployment model in a subscription",
+            "guid": "30e37c3e-2971-41b2-963c-eee079b598de",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/migration-classic-resource-manager-overview#migration-of-storage-accounts",
+            "service": "Storage",
+            "severity": "Medium",
+            "text": "Ensure older storage accounts are not using 'classic deployment model'",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "d89f2e87-7784-424d-9167-85c6fa95b96a",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Leverage Microsoft Defender to learn about suspicious activity and misconfigurations.",
+            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | project storageAccountId = id | join kind=leftouter (resourceContainers | where type == 'microsoft.security/pricings' | where name == 'StorageAccounts' | project resourceId = id, pricingTier = properties.pricingTier) on $left.storageAccountId == $right.resourceId | where isnull(pricingTier) or pricingTier != 'Standard' | extend compliant = false | distinct storageAccountId, compliant",
+            "guid": "fc5972cd-4cd2-41b0-a803-7f5e6b4bfd3d",
+            "link": "https://learn.microsoft.com/azure/storage/common/azure-defender-storage-configure",
+            "service": "Storage",
             "severity": "High",
-            "text": "Ensure that you have requested enough quota, ensuring you have considered growth and Disaster Recovery requirement",
-            "waf": "Reliability"
+            "text": "Enable Microsoft Defender for all of your storage accounts",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "5d38e53f-9ccb-4d86-a266-acca274faa19",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "The soft-delete mechanism allows to recover accidentally deleted blobs.",
+            "guid": "503547c1-447e-4c66-828a-7100f1ce16dd",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-overview",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Ensure that access constraints to ESXi are understood, there are access limits which might affect 3rd party solutions.",
-            "waf": "Operations"
+            "text": "Enable 'soft delete' for blobs",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "bf39d95d-44c7-4c89-89ca-1f6d5315ae52",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Consider selectively disabling 'soft delete' for certain blob containers, for example if the application must ensure that deleted information is immediately deleted, e.g. for confidentiality, privacy or compliance reasons. ",
+            "guid": "3f1d5e87-2e52-4e36-81cc-58b4a4b1510e",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-enable",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Ensure that you have a policy around ESXi host density and efficiency, keeping in mind the lead time for requesting new nodes",
-            "waf": "Operations"
+            "text": "Disable 'soft delete' for blobs",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "4ba34d45-85e1-4213-abd7-bb012f7b95ef",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Soft delete for containers enables you to recover a container after it has been deleted, for example recover from an accidental delete operation.",
+            "guid": "43a58a9c-2289-4c3d-9b57-d0c655462f2a",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-container-overview",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Enable 'soft delete' for containers",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Consider selectively disabling 'soft delete' for certain blob containers, for example if the application must ensure that deleted information is immediately deleted, e.g. for confidentiality, privacy or compliance reasons. ",
+            "guid": "3e3453a3-c863-4964-ab65-2d6c15f51296",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-container-enable",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Ensure a good cost management process is in place for Azure VMware Solution - Azure Cost Management can be used",
-            "waf": "Cost"
+            "text": "Disable 'soft delete' for containers",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "6e043e2a-a359-4271-ae6e-205172676ae4",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "Are Azure reserved instances used to optimize cost for using Azure VMware Solution",
-            "waf": "Cost"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Prevents accidental deletion of a storage account, by forcing the user to first remove the deletion lock, prior to deletion",
+            "guid": "5398e6de-d227-4dd1-92b0-6c21d7999a64",
+            "link": "https://learn.microsoft.com/azure/storage/common/lock-account-resource",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Enable resource locks on storage accounts",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "6691e883-5ac9-4422-83e1-3810523081a9",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Consider the use of Azure Private-Link when using other Azure Native Services",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Consider 'legal hold' or 'time-based retention' policies for blobs, so that is is impossible to delete the blob, the container, or the storage account. Please note that 'impossible' actually means 'impossible'; once a storage account contains an immutable blob, the only way to 'get rid' of that storage account is by cancelling the Azure subscription.",
+            "guid": "6f4389a8-f42c-478e-98c0-6a73a22a4956",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/immutable-storage-overview",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Consider immutable blobs",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "db611712-6904-40b4-aa3d-3e0803276d4b",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Consider disabling unprotected HTTP/80 access to the storage account, so that all data transfers are encrypted, integrity protected, and the server is authenticated. ",
+            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | extend compliant = (properties.supportsHttpsTrafficOnly == false) | distinct id, compliant",
+            "guid": "e7a8dc4a-20e2-47c3-b297-11b1352beee0",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-require-secure-transfer",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Require HTTPS, i.e. disable port 80 on the storage account",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "When configuring a custom domain (hostname) on a storage account, check whether you need TLS/HTTPS; if so, you might have to put Azure CDN in front of your storage account.",
+            "guid": "79b588de-fc49-472c-b3cd-21bf77036e5e",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/storage-custom-domain-name",
+            "service": "Storage",
             "severity": "High",
-            "text": "Ensure all required resource reside within the same Azure availability zone(s)",
-            "waf": "Performance"
-        },
-        {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "48b262d6-cc5f-4512-a253-98e6db9d37da",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Enable Microsoft Defender for Cloud for Azure VMware Solution guest VM workloads",
+            "text": "When enforcing HTTPS (disabling HTTP), check that you do not use custom domains (CNAME) for the storage account.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "41741583-3ef7-4ad7-a6d3-733165c7acbe",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Requiring HTTPS when a client uses a SAS token to access blob data helps to minimize the risk of credential loss.",
+            "guid": "6b4bed3d-5035-447c-8347-dc56028a71ff",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-sas-overview",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Use Azure Arc enabled servers to manage your Azure VMware Solution guest VM workloads",
+            "text": "Limit shared access signature (SAS) tokens to HTTPS connections only",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "88f03a4d-2cd4-463c-abbc-868295abc91a",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": ". Enforcing the latest TLS version will reject request from clients using the older version. ",
+            "graph": "resources | where type == 'microsoft.storage/storageaccounts' | extend compliant = (isnull(properties.minimumTlsVersion) == false and properties.minimumTlsVersion in ('TLS1_2', 'TLS1_3')) | distinct id, compliant",
+            "guid": "e12be569-a18f-4562-8d5d-ce151b9e7d55",
+            "link": "https://learn.microsoft.com/azure/storage/common/transport-layer-security-configure-minimum-version",
+            "service": "Storage",
             "severity": "High",
-            "text": "Enable Diagnostic and metric logging on Azure VMware Solution",
-            "waf": "Operations"
+            "text": "Enforce the latest TLS version for a storage account",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "4ed90dae-2cc8-44c4-9b6b-781cbafe6c46",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Deploy the Log Analytics Agents to Azure VMware Solution guest VM workloads",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Microsoft Entra ID tokens should be favored over shared access signatures, wherever possible",
+            "guid": "e1ce15dd-3f0d-45e7-92d4-1e3611cc57b4",
+            "link": "https://learn.microsoft.com/azure/storage/common/authorize-data-access",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Use Microsoft Entra ID tokens for blob access",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "589d457a-927c-4397-9d11-02cad6aae11e",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "When assigning a role to a user, group, or application, grant that security principal only those permissions that are necessary for them to perform their tasks. Limiting access to resources helps prevent both unintentional and malicious misuse of your data.",
+            "guid": "a4b1410d-4395-48a8-a228-9b3d6b57cfc6",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Ensure you have a documented and implemented backup policy and solution for Azure VMware Solution VM workloads",
-            "waf": "Operations"
+            "text": "Least privilege in IaM permissions",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "ee29711b-d352-4caa-ab79-b198dab81932",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Use Microsoft Defender for Cloud for compliance monitoring of workloads running on Azure VMware Solution",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "A user delegation SAS is secured with Azure Active Directory (Azure AD) credentials and also by the permissions specified for the SAS. A user delegation SAS is analogous to a service SAS in terms of its scope and function, but offers security benefits over the service SAS. ",
+            "guid": "55461e1a-3e34-453a-9c86-39648b652d6c",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-sas-overview?toc=%2Fazure%2Fstorage%2Fblobs%2Ftoc.json#best-practices-when-using-sas",
+            "service": "Storage",
+            "severity": "High",
+            "text": "When using SAS, prefer 'user delegation SAS' over storage-account-key based SAS.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "c9fc9d1b-b780-436f-9e6b-fbb9ed503547",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Are the applicable compliance baselines added to Microsoft Defender for Cloud",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Storage account keys ('shared keys') have very little audit capabilities. While it can be monitored on who/when fetched a copy of the keys, once the keys are in the hands of multiple people, it is impossible to attribute usage to a specific user. Solely relying on Entra ID authentication makes it easier to tie storage access to a user. ",
+            "graph": "resources | where type == 'microsoft.storage/storageaccounts' | extend allowSharedKeyAccess = tostring(properties.allowSharedKeyAccess) | extend compliant = (isnotempty(allowSharedKeyAccess) and allowSharedKeyAccess == 'false') | distinct id, compliant",
+            "guid": "15f51296-5398-4e6d-bd22-7dd142b06c21",
+            "link": "https://learn.microsoft.com/rest/api/storageservices/authorize-with-shared-key",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Consider disabling storage account keys, so that only Microsoft Entra ID access (and user delegation SAS) is supported.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "cc447e82-6128-4a71-b0f1-cac6d9ef1d5e",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Use Activity Log data to identify 'when', 'who', 'what' and 'how' the security of your storage account is being viewed or changed (i.e. storage account keys, access policies, etc.).",
+            "guid": "d7999a64-6f43-489a-af42-c78e78c06a73",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/blob-storage-monitoring-scenarios#audit-account-activity",
+            "service": "Storage",
             "severity": "High",
-            "text": "Was data residency evaluated when selecting Azure regions to use for Azure VMware Solution deployment",
+            "text": "Consider using Azure Monitor to audit control plane operations on the storage account",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "832e42e3-611c-4818-a0a0-bc510e43a18a",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Are data processing implications (service provider / service consumer model) clear and documented",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "A key expiration policy enables you to set a reminder for the rotation of the account access keys. The reminder is displayed if the specified interval has elapsed and the keys have not yet been rotated.",
+            "guid": "a22a4956-e7a8-4dc4-a20e-27c3e29711b1",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-account-keys-manage?tabs=azure-portal#create-a-key-expiration-policy",
+            "service": "Storage",
+            "severity": "Medium",
+            "text": "When using storage account keys, consider enabling a 'key expiration policy'",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "547c1747-dc56-4068-a714-435cd19dd244",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "A SAS expiration policy specifies a recommended interval over which the SAS is valid. SAS expiration policies apply to a service SAS or an account SAS. When a user generates service SAS or an account SAS with a validity interval that is larger than the recommended interval, they'll see a warning.",
+            "guid": "352beee0-79b5-488d-bfc4-972cd3cd21bf",
+            "link": "https://learn.microsoft.com/azure/storage/common/sas-expiration-policy",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Consider using CMK (Customer Managed Key) for vSAN only if needed for compliance reason(s).",
+            "text": "Consider configuring an SAS expiration policy",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "e43a18a9-cd28-49ce-b6b1-7db8255461e2",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Create dashboards to enable core Azure VMware Solution monitoring insights",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Stored access policies give you the option to revoke permissions for a service SAS without having to regenerate the storage account keys. ",
+            "guid": "77036e5e-6b4b-4ed3-b503-547c1347dc56",
+            "link": "https://learn.microsoft.com/rest/api/storageservices/define-stored-access-policy",
+            "service": "Storage",
+            "severity": "Medium",
+            "text": "Consider linking SAS to a stored access policy",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "graph": "resources| where type =~ 'Microsoft.AVS/privateClouds'| join kind=leftouter(resources| where type =~ 'Microsoft.Insights/metricalerts'| mv-expand scopes=properties.scopes| mv-expand criteria=properties.criteria.allOf| extend metricName=criteria.metricName| distinct tostring(scopes), tostring(metricName))on $left.id == $right.scopes| extend compliant=toint(metricName in ('UsageAverage', 'EffectiveCpuAverage', 'DiskUsedPercentage'))| summarize compliant=min(compliant) by id",
-            "guid": "6b84ee5d-f47d-42d9-8881-b1cd5d1e54a2",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Create warning alerts for critical thresholds for automatic alerting on Azure VMware Solution performance (CPU >80%, Avg Memory >80%, vSAN >70%)",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "028a71ff-e1ce-415d-b3f0-d5e772d41e36",
+            "link": "https://microsoft.github.io/code-with-engineering-playbook/continuous-integration/dev-sec-ops/secret-management/recipes/detect-secrets-ado/",
+            "service": "Storage",
+            "severity": "Medium",
+            "text": "Consider configuring your application's source code repository to detect checked-in connection strings and storage account keys.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "graph": "resources| where type =~ 'Microsoft.AVS/privateClouds'| join kind=leftouter(resources| where type =~ 'Microsoft.Insights/metricalerts'| mv-expand scopes=properties.scopes| mv-expand criteria=properties.criteria.allOf| extend metricName=criteria.metricName| distinct tostring(scopes), tostring(metricName))on $left.id == $right.scopes| extend compliant=toint(metricName in ('UsageAverage', 'EffectiveCpuAverage', 'DiskUsedPercentage'))| summarize compliant=min(compliant) by id",
-            "guid": "9659e396-80e7-4828-ac93-5657d02bff45",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Ideally, your application should be using a managed identity to authenticate to Azure Storage. If that is not possible, consider having the storage credential (connection string, storage account key, SAS, service principal credential) in Azure KeyVault or an equivalent service.",
+            "guid": "11cc57b4-a4b1-4410-b439-58a8c2289b3d",
+            "link": "https://learn.microsoft.com/azure/architecture/framework/security/design-storage-keys",
+            "service": "Storage",
             "severity": "High",
-            "text": "Ensure critical alert is created to monitor if vSAN consumption is below 75% as this is a support threshold from VMware",
-            "waf": "Operations"
+            "text": "Consider storing connection strings in Azure KeyVault (in scenarios where managed identities are not possible)",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "graph": "resources| distinct subscriptionId| join kind=leftouter(    resources    | where type =~ 'microsoft.insights/activitylogalerts'    | mv-expand condition1 = properties.condition.allOf    | mv-expand condition2 = condition1.anyOf    | extend alertEnabled = tostring(properties.enabled)    | summarize set_condition1=make_set(condition1.equals), set_condition2=make_set(condition2.equals) by id, name,type,tenantId,resourceGroup,subscriptionId, alertEnabled    | where set_has_element(set_condition1, 'ServiceHealth')    | extend category = 'ServiceHealth'    | extend all = iff(set_has_element(set_condition1, 'ServiceHealth') and array_length(set_condition2) == 0, true, false)    | extend incident = iff(all, true, iff(set_has_element(set_condition1, 'Incident'), true, set_has_element(set_condition2, 'Incident')))    | extend maintenance = iff(all, true, iff(set_has_element(set_condition1, 'Maintenance'), true, set_has_element(set_condition2, 'Maintenance')))    | extend informational = iff(all, true, iff(set_has_element(set_condition1, 'Informational') or set_has_element(set_condition1, 'ActionRequired'), true, set_has_element(set_condition2, 'Informational') or set_has_element(set_condition2, 'ActionRequired')))    | extend security = iff(all, true, iff(set_has_element(set_condition1, 'Security'), true, set_has_element(set_condition2, 'Security')))    | project id, name, subscriptionId, category, tostring(alertEnabled), tostring(incident), tostring(maintenance), tostring(informational), tostring(security)    | summarize count_alertEnabled=countif(alertEnabled == 'true'), count_incident=countif(incident == 'True'), count_maintenance=countif(maintenance == 'True'), count_informational=countif(informational == 'True'), count_security=countif(security == 'True') by subscriptionId)     on subscriptionId| project subscriptionId, alertEnabled=iff(isnotnull(count_alertEnabled), count_alertEnabled, 0), incident=iff(isnotnull(count_incident), count_incident, 0), security=iff(isnotnull(count_security), count_security, 0), maintenance=iff(isnotnull(count_maintenance), count_maintenance, 0), informational=iff(isnotnull(count_informational), count_informational, 0)| order by incident, maintenance, informational, security desc| project id=subscriptionId, compliant=(alertEnabled > 0 and incident > 0 and security > 0 and maintenance > 0 and informational > 0)",
-            "guid": "64b0d934-a348-4726-be79-d6b5c3a36495",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Use near-term expiration times on an ad hoc SAS service SAS or account SAS. In this way, even if a SAS is compromised, it's valid only for a short time. This practice is especially important if you cannot reference a stored access policy. Near-term expiration times also limit the amount of data that can be written to a blob by limiting the time available to upload to it.",
+            "guid": "27138b82-1102-4cac-9eae-01e6e842e52f",
+            "link": "https://learn.microsoft.com/rest/api/storageservices/delegate-access-with-shared-access-signature",
+            "service": "Storage",
             "severity": "High",
-            "text": "Ensure alerts are configured for Azure Service Health alerts and notifications",
-            "waf": "Operations"
+            "text": "Strive for short validity periods for ad-hoc SAS",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "b6abad38-aad5-43cc-99e1-d86667357c54",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "When creating a SAS, be as specific and restrictive as possible. Prefer a SAS for a single resource and operation over a SAS which gives much broader access.",
+            "guid": "4721d928-c1b1-4cd5-81e5-4a29a9de399c",
+            "link": "https://learn.microsoft.com/rest/api/storageservices/delegate-access-with-shared-access-signature",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Configure Azure VMware Solution logging to be send to an Azure Storage account or Azure EventHub for processing",
-            "waf": "Operations"
+            "text": "Apply a narrow scope to a SAS",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "9674c5ed-85b8-459c-9733-be2b1a27b775",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "If deep insight in VMware vSphere is required: Is vRealize Operations and/or vRealize Network Insights used in the solution?",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "A SAS can include parameters on which client IP addresses or address ranges are authorized to request a resource using the SAS. ",
+            "guid": "fd7b28dc-9355-4562-82bf-e4564b0d834a",
+            "link": "https://learn.microsoft.com/rest/api/storageservices/create-account-sas",
+            "service": "Storage",
+            "severity": "Medium",
+            "text": "Consider scoping SAS to a specific client IP address, wherever possible",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "a91be1f3-88f0-43a4-b2cd-463cbbbc8682",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Ensure the vSAN storage policy for VM's is NOT the default storage policy as this policy applies thick provisioning",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "A SAS cannot constrain how much data a client uploads; given the pricing model of amount of storage over time, it might make sense to validate whether clients uploaded maliciously large contents.",
+            "guid": "348b263e-6dd6-4051-8a36-498f6dbad38e",
+            "service": "Storage",
+            "severity": "Low",
+            "text": "Consider checking uploaded data, after clients used a SAS to upload a file. ",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "d9ef1d5e-832d-442e-9611-c818b0afbc51",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Ensure vSphere content libraries are not placed on vSAN as vSAN is a finite resource",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "When accessing blob storage via SFTP using a 'local user account', the 'usual' RBAC controls do not apply. Blob access via NFS or REST might be more restrictive than SFTP access. Unfortunately, as of early 2023, local users are the only form of identity management that is currently supported for the SFTP endpoint",
+            "guid": "ad53cc7c-e1d7-4aaa-a357-1449ab8053d8",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/secure-file-transfer-protocol-support#sftp-permission-model",
+            "service": "Storage",
+            "severity": "High",
+            "text": "SFTP: Limit the amount of 'local users' for SFTP access, and audit whether access is needed over time.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "0e43a18a-9cd2-489b-bd6b-17db8255461e",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "9f89dc7b-33be-42a1-a27f-7b9e91be1f38",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/secure-file-transfer-protocol-known-issues#authentication-and-authorization",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Ensure data repositories for the backup solution are stored outside of vSAN storage. Either in Azure native or on a disk pool-backed datastore",
-            "waf": "Operations"
+            "text": "SFTP: The SFTP endpoint does not support POSIX-like ACLs.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "2aee3453-aec8-4339-848b-262d6cc5f512",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Ensure workloads running on Azure VMware Solution are hybrid managed using Azure Arc for Servers (Arc for Azure VMware Solution is in preview)",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Storage supports CORS (Cross-Origin Resource Sharing), i.e. an HTTP feature that enables web apps from a different domain to loosen the same-origin policy. When enabling CORS, keep the CorsRules to the least privilege.",
+            "guid": "cef39812-bd46-43cb-aac8-ac199ebb91a3",
+            "link": "https://learn.microsoft.com/rest/api/storageservices/cross-origin-resource-sharing--cors--support-for-the-azure-storage-services",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Avoid overly broad CORS policies",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "925398e6-da9d-437d-ac43-bc6cd1d79a9b",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Ensure workloads running on Azure VMware Solution are monitored using Azure Log Analytics and Azure Monitor",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Data at rest is always encrypted server-side, and in addition might be encrypted client-side as well. Server-side encryption might happen using a platform-managed key (default) or customer-managed key. Client-side encryption might happen by either having the client supply an encryption/decryption key on a per-blob basis to Azure storage, or by completely handling encryption on the client-side. thus not relying on Azure Storage at all for confidentiality guarantees.",
+            "guid": "3d90cae2-cc88-4137-86f7-c0cbafe61464",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-service-encryption",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Determine how data at rest should be encrypted. Understand the thread model for data.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "24604489-a8f4-42d7-ae78-cb6a33bd2a09",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "8dd457e9-2713-48b8-8110-2cac6eae01e6",
+            "link": "https://learn.microsoft.com/azure/storage/common/customer-managed-keys-overview?toc=%2Fazure%2Fstorage%2Fblobs%2Ftoc.json&bc=%2Fazure%2Fstorage%2Fblobs%2Fbreadcrumb%2Ftoc.json",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Include workloads running on Azure VMware Solution in existing update management tooling or in Azure Update Management",
-            "waf": "Operations"
+            "text": "Determine which/if platform encryption should be used.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "17e7a8d9-0ae0-4e27-aee2-9711bd352caa",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "e842e52f-4721-4d92-ac1b-1cd521e54a29",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/encryption-customer-provided-keys",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Use Azure Policy to onboard Azure VMware Solution workloads in the Azure Management, Monitoring and Security solutions",
-            "waf": "Operations"
+            "text": "Determine which/if client-side encryption should be used.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "aee3553a-fc83-4392-98b2-62d6cc5f5129",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Ensure workloads running on Azure VMware Solution are onboarded to Microsoft Defender for Cloud",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "description": "Anonymous access may present a security risk. We recommend that you disable anonymous access for optimal security. Disallowing anonymous access helps to prevent data breaches caused by undesired anonymous access.",
+            "graph": "resources | where type == 'microsoft.storage/storageaccounts' | extend compliant = (properties.allowBlobPublicAccess == 'false') | distinct id, compliant",
+            "guid": "659ae558-b937-4d49-a5e1-112dbd7ba012",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/anonymous-read-access-configure?tabs=portal#allow-or-disallow-public-read-access-for-a-storage-account",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Consider whether public blob anonymous access is needed, or whether it can be disabled for certain storage accounts. ",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "25398e6d-b9d3-47da-a43b-c6cd1d79a9b2",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Ensure backups are not stored on vSAN as vSAN is a finite resource",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "cb8eb8c0-aa62-4a25-a495-6eaa8dc4a243",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-account-upgrade?tabs=azure-portal",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Leverage a storagev2 account type for better performance and reliability",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "5e6bfbb9-ed50-4354-9cc4-47e826028a71",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Have all DR solutions been considered and a solution that is best for your business been decided upon? [SRM/JetStream/Zerto/Veeam/...]",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "graph": "resources | where type =~ 'Microsoft.Storage/StorageAccounts' | extend compliant = (sku.name != 'Standard_LRS' and sku.name != 'Premium_LRS') | distinct id, compliant",
+            "guid": "e05bbe20-9d49-4fda-9777-8424d116785c",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-redundancy",
+            "service": "Storage",
+            "severity": "High",
+            "text": "Leverage GRS, ZRS or GZRS storage for the highest availability",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "f0f1cac6-d9ef-41d5-b832-d42e3611c818",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "2fa56c56-ad48-4408-be72-734c486ba280",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Use Azure Site Recovery when the Disaster Recovery technology is native Azure IaaS",
+            "text": "For write operation after failover, use customer-Managed Failover ",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "b0afbc51-0e43-4a18-a9cd-289bed6b17db",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Use Automated recovery plans with either of the Disaster solutions, avoid manual tasks as much as possible",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "dc0590cf-65de-48e1-909c-cbd579266bcc",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-disaster-recovery-guidance#microsoft-managed-failover",
+            "service": "Storage",
+            "severity": "Medium",
+            "text": "Understand Microsoft-Managed Failover details",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "8255461e-2aee-4345-9aec-8339248b262d",
-            "service": "AVS",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Azure Storage Review Checklist",
+            "guid": "a274faa1-abfe-49d5-9d04-c3c4919cb1b3",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-enable?tabs=azure-portal",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Use the geopolitical region pair as the secondary disaster recovery environment",
+            "text": "Enable Soft Delete",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "6cc5f512-9253-498e-9da9-d37dac43bc6c",
-            "service": "AVS",
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "41faa1ed-b7f0-447d-8cba-4a4905e5bb83",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#high-availability",
+            "service": "Cognitive Search",
             "severity": "High",
-            "text": "Use 2 different address spaces between the regions, for example: 10.0.0.0/16 and 192.168.0.0/16 for the different regions",
+            "text": "Enable 2 replicas to have 99.9% availability for read operations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "d1d79a9b-2460-4448-aa8f-42d78e78cb6a",
-            "service": "AVS",
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "7d956fd9-788a-4845-9b9f-c0340972d810",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#high-availability",
+            "service": "Cognitive Search",
             "severity": "Medium",
-            "text": "Will ExpressRoute Global Reach be used for connectivity between the primary and secondary Azure VMware Solution Private Clouds or is routing done through network virtual appliances?",
+            "text": "Enable 3 replicas to have 99.9% availability for read/write operations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "33bd2a09-17e7-4a8d-a0ae-0e27cee29711",
-            "service": "AVS",
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "44dc5f2b-a032-4d03-aae8-90c3f2c0a4c3",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#availability-zone-support",
+            "service": "Cognitive Search",
+            "severity": "High",
+            "text": "Leverage Availability Zones by enabling read and/or write replicas",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "cd0730f0-0ff1-4b77-9a2b-2a1f7dd5e291",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#multiple-services-in-separate-geographic-regions",
+            "service": "Cognitive Search",
             "severity": "Medium",
-            "text": "Have all Backup solutions been considered and a solution that is best for your business been decided upon? [ MABS/CommVault/Metallic.io/Veeam/�. ]",
+            "text": "For regional redudancy, Manually create services in 2 or more regions for Search as it doesn't provide an automated method of replicating search indexes across geographic regions",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "bd352caa-ab79-4b18-adab-81932c9fc9d1",
-            "service": "AVS",
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "3c964882-aec9-4d44-9f68-4b5f2efbbdb6",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#synchronize-data-across-multiple-services",
+            "service": "Cognitive Search",
             "severity": "Medium",
-            "text": "Deploy your backup solution in the same region as your Azure VMware Solution private cloud",
+            "text": "To synchronize data across multiple services either Use indexers for updating content on multiple services or Use REST APIs for pushing content updates on multiple services",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "bb77036f-5e6b-4fbb-aed5-03547cc447e8",
-            "service": "AVS",
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "85ee93c9-f53c-4803-be51-e6e4aa37ff4e",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#use-azure-traffic-manager-to-coordinate-requests",
+            "service": "Cognitive Search",
             "severity": "Medium",
-            "text": "Deploy your backup solution outside of vSan, on Azure native components",
+            "text": "Use Azure Traffic Manager to coordinate requests",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "26028a71-f0f1-4cac-9d9e-f1d5e832d42e",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "Is a process in place to request a restore of the VMware components managed by the Azure Platform?",
+            "arm-service": "Microsoft.Search/searchServices",
+            "checklist": "Cognitive Search Review Checklist",
+            "guid": "7be10278-57c1-4a61-8ee3-895aebfec5aa",
+            "link": "https://learn.microsoft.com/azure/search/search-reliability#back-up-and-restore-alternatives",
+            "service": "Cognitive Search",
+            "severity": "High",
+            "text": "Backup and Restore an Azure Cognitive Search Index. Use this sample code to back up index definition and snapshot to a series of Json files",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "4604489a-8f42-4d78-b78c-b7a33bd2a0a1",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "For manual deployments, all configuration and deployments must be documented",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Cognitive Services Review Checklist",
+            "guid": "21c30d25-ffb7-4f6a-b9ea-b3fec328f787",
+            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/paas-foundations-playbooks-cog_svcs_v1.docx",
+            "service": "Cognitive Services",
+            "severity": "Medium",
+            "text": "Leverage FTA HandBook for Cognitive Services",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "7e7a8d90-ae0e-437c-be29-711bd352caaa",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "For manual deployments, consider implementing resource locks to prevent accidental actions on your Azure VMware Solution Private Cloud",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Cognitive Services Review Checklist",
+            "guid": "78c34698-16b2-4763-aefe-1b9b599de0d5",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/advanced-prompt-engineering?pivots=programming-language-chat-completions",
+            "service": "Cognitive Services",
+            "severity": "Medium",
+            "text": "Backup Your Prompts",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "b79b198d-ab81-4932-a9fc-9d1bb78036f5",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "For automated deployments, deploy a minimal private cloud and scale as needed",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Cognitive Services Review Checklist",
+            "guid": "750ab2ab-039d-4a6d-95d7-c892adb107d5",
+            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/business-continuity-disaster-recovery",
+            "service": "Cognitive Services",
+            "severity": "High",
+            "text": "Business Continuity and Disaster Recovery (BCDR) considerations with Azure OpenAI Service",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "e6bfbb9e-d503-4547-ac44-7e826128a71f",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "For automated deployments,  request or reserve quota prior to starting the deployment",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Cognitive Services Review Checklist",
+            "guid": "325af625-ca44-4e46-a5e2-223ace8bb123",
+            "link": "https://github.com/abacaj/chatgpt-backup#backup-your-chatgpt-conversations",
+            "service": "Cognitive Services",
+            "severity": "Medium",
+            "text": "Backup Your ChatGPT conversations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "0f1cac6d-9ef1-4d5e-a32e-42e3611c818b",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "For automated deployment, ensure that relevant resource locks are created through the automation or through Azure Policy for proper governance",
-            "waf": "Operations"
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Cognitive Services Review Checklist",
+            "guid": "07ca5f17-f154-4e3a-a369-2829e7e31618",
+            "link": "https://learn.microsoft.com/azure/ai-services/speech-service/how-to-custom-speech-continuous-integration-continuous-deployment",
+            "service": "Cognitive Services",
+            "severity": "Medium",
+            "text": "CI/CD for custom speech",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "e2cc95d4-8c6b-4791-bca0-f6c56589e558",
-            "service": "AVS",
+            "arm-service": "Microsoft.CognitiveServices/accounts",
+            "checklist": "Cognitive Services Review Checklist",
+            "guid": "3687a046-7a1f-4893-9bda-43324f248116",
+            "link": "https://learn.microsoft.com/azure/ai-services/qnamaker/tutorials/export-knowledge-base",
+            "service": "Cognitive Services",
             "severity": "Low",
-            "text": "Implement human understandable names for ExR authorization keys to allow for easy identification of the keys purpose/use",
-            "waf": "Operations"
+            "text": "Move a knowledge base using export-import",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "255461e2-aee3-4553-afc8-339248b262d6",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "Use Key vault to store secrets and authorization keys when separate Service Principles are used for deploying Azure VMware Solution and ExpressRoute",
-            "waf": "Operations"
+            "arm-service": "Microsoft.App/containerApps",
+            "checklist": "Container Apps Review",
+            "guid": "af416482-663c-4ed6-b195-b44c7068e09c",
+            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#availability-zone-support",
+            "query": "resources | where type =~ 'Microsoft.App/managedEnvironments' | project name, resourceGroup, location, zoneRedundancy = tolower(tostring(properties.zoneRedundant)) | extend Compliance = iff(zoneRedundancy == 'true', true, false)",
+            "service": "Container Apps",
+            "severity": "High",
+            "text": "Leverage Availability Zones if regionally applicable",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "cc5f5129-2539-48e6-bb9d-37dac43bc6cd",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "Define resource dependencies for serializing actions in IaC when many resources need to be deployed in/on Azure VMware Solution as Azure VMware Solution only supports a limited number of parallel operations.",
-            "waf": "Operations"
+            "arm-service": "Microsoft.App/containerApps",
+            "checklist": "Container Apps Review",
+            "guid": "95bc80ec-6499-4d14-a7d2-7d296b1d8abc",
+            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#set-up-zone-redundancy-in-your-container-apps-environment",
+            "query": "resources | where type =~ 'Microsoft.App/containerApps' | project name, resourceGroup, location, minReplicas = toint(properties.template.scale.minReplicas), maxReplicas = toint(properties.template.scale.maxReplicas) | extend Compliance = iff(minReplicas >= 1, true, false)",
+            "service": "Container Apps",
+            "severity": "High",
+            "text": "Use more than one replica and enable Zone Redundancy.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "1d79a9b2-4604-4489-a8f4-2d78e78cb7a3",
-            "service": "AVS",
-            "severity": "Low",
-            "text": "When performing automated configuration of NSX-T segments with a single Tier-1 gateway, use Azure Portal APIs instead of NSX-Manager APIs",
-            "waf": "Operations"
+            "arm-service": "Microsoft.App/containerApps",
+            "checklist": "Container Apps Review",
+            "guid": "ccaa4fc2-fdbc-4432-8bb7-f7e6469e4dc3",
+            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#cross-region-disaster-recovery-and-business-continuity",
+            "service": "Container Apps",
+            "severity": "High",
+            "text": "For cross-region DR, deploy container apps in multiple regions and follow active/active or active/passive application guidance.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "3bd2a0a1-7e7a-48d9-8ae0-e37cee29711b",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "When intending to use automated scale-out, be sure to apply for sufficient Azure VMware Solution quota for the subscriptions running Azure VMware Solution",
-            "waf": "Performance"
+            "arm-service": "Microsoft.App/containerApps",
+            "checklist": "Container Apps Review",
+            "guid": "2ffada86-c031-4933-bf7d-0c45bc4e5919",
+            "link": "https://learn.microsoft.com/azure/reliability/reliability-azure-container-apps?tabs=azure-cli#cross-region-disaster-recovery-and-business-continuity",
+            "service": "Container Apps",
+            "severity": "High",
+            "text": "Use Front Door or Traffic Manager to route traffic to the closest region",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "d352caaa-b79b-4198-bab8-1932c9fc9d1b",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "guid": "43e52f47-22d9-428c-8b1c-d521e54a29a9",
+            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/pass-foundations-playbooks-CosmosDB_v1.docx",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "When intending to use automated scale-in, be sure to take storage policy requirements into account before performing such action",
-            "waf": "Performance"
+            "text": "FTA Resiliency Playbook",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "b78036f5-e6bf-4bb9-bd50-3547cc447e82",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "Scaling operations always need to be serialized within a single SDDC as only one scale operation can be performed at a time (even when multiple clusters are used)",
-            "waf": "Performance"
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "guid": "de39ac0e-7c28-4dc9-9565-7202bff4564b",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#slas",
+            "service": "CosmosDB",
+            "severity": "High",
+            "text": "Leverage Availablity Zones where regionally applicable and ofcourse if the service offers it",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "bf15bce2-19e4-4a0e-a588-79424d226786",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "guid": "0d934a34-8b26-43e7-bd60-513a3649906e",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#replica-outages",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "Consider and validate scaling operations on 3rd party solutions used in the architecture (supported or not)",
-            "waf": "Performance"
+            "text": "Run multiple replicas of the database (>1 ) in Prod",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "d20b56c5-7be5-4851-a0f8-3835c586cb29",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "Multi-region writes capability allows you to take advantage of the provisioned throughput for your databases and containers across the globe",
+            "guid": "bad38ead-53cc-47de-8d8a-aab3571449ab",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#multiple-write-regions",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "Define and enforce scale in/out maximum limits for your environment in the automations",
-            "waf": "Performance"
+            "text": "Leverage Multi-Region Writes",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "1dc15a1c-075e-4e9f-841a-cccd579376bc",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "Span Cosmos account across two or more regions with multi-region writes",
+            "guid": "8153d89f-89dc-47b3-9be2-b1a27f7b9e91",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#slas",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "Implement monitoring rules to monitor automated scaling operations and monitor success and failure to enable appropriate (automated) responses",
-            "waf": "Operations"
-        },
-        {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "c5972cd4-cd21-4b07-9036-f5e6b4bfd3d5",
-            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
-            "service": "AVS",
-            "severity": "High",
-            "text": "When using MON, be aware of the limits of simulataneously configured VMs (MON Limit for HCX [400 - standard, 1000 - Larger appliance])",
-            "training": "https://learn.microsoft.com/learn/modules/configure-azure-ad-application-proxy/",
+            "text": "Distribute your data globally",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "be1f38cf-03a8-422b-b463-cbbbc8ac299e",
-            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "Choose from various consistency levels such as Eventual, Consistent Prefix, Session, Bounded Staleness and strong",
+            "guid": "9f8ea848-25ec-4140-bc32-2758e6ee9ac0",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/consistency-levels",
+            "service": "CosmosDB",
             "severity": "High",
-            "text": "When using MON, you cannot enable MON on more than 100 Network extensions",
-            "training": "https://learn.microsoft.com/learn/paths/implement-applications-external-access-azure-ad/",
+            "text": "Choose from several well-defined consistency models",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "bc91a43d-90da-4e2c-a881-4706f7c1cbaf",
-            "service": "AVS",
-            "severity": "Medium",
-            "text": "If using a VPN connection for migrations, adjust your MTU size accordingly.",
-            "waf": "Performance"
-        },
-        {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "e614658d-d457-4e92-9139-b821102cad6e",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "Maintain business continuity during regional outages. Azure Cosmos DB supports service-managed failover during a regional outage. During a regional outage, Azure Cosmos DB continues to maintain its latency, availability, consistency, and throughput SLAs. To help make sure that your entire application is highly available, Azure Cosmos DB offers a manual failover API to simulate a regional outage. By using this API, you can carry out regular business continuity drills.",
+            "guid": "a47e4d1e-bb79-43f9-bf87-69e1032b72fe",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/how-to-manage-database-account#automatic-failover",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "For low connectivity regions connecting into Azure (500Mbps or less), considering deploying the HCX WAN optimization appliance",
-            "waf": "Performance"
+            "text": "Enable Service managed failover",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "ae01e6e8-43e5-42f4-922d-928c1b1cd521",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "Azure Cosmos DB automatically takes backups of your data at regular intervals. The automatic backups are taken without affecting the performance or availability of the database operations. All the backups are stored separately in a storage service.",
+            "guid": "3499c9c1-133d-42f7-a4b1-a5bd06ff1a90",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/online-backup-and-restore",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "Ensure that migrations are started from the on-premises appliance and NOT from the Cloud appliance (do NOT perform a reverse migration)",
+            "text": "Enable Automatic Backups",
+            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "e54a29a9-de39-4ac0-b7c2-8dc935657202",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-policy-settings",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "This mode is the default backup mode for all existing accounts. In this mode, backup is taken at a periodic interval and the data is restored by creating a request with the support team. In this mode, you configure a backup interval and retention for your account. The maximum retention period extends to a month. The minimum backup interval can be one hour.",
+            "guid": "a6eb33f6-005c-4d92-9286-7655672d6121",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/periodic-backup-restore-introduction",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "When Azure Netapp Files is used to extend storage for Azure VMware Solution,consider using this as a VMware datastore instead of attaching directly to a VM.",
+            "text": "Perform Periodic Backups",
+            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "bff4564b-0d93-44a3-98b2-63e7dd60513a",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#avoid-combining-traffic-manager-and-front-door",
-            "service": "AVS",
+            "arm-service": "microsoft.documentdb/databaseAccounts",
+            "checklist": "CosmosDB Review Checklist",
+            "description": "Continous 7 day retention and 30 day retention backups. Azure Cosmos DB performs data backup in the background without consuming any extra provisioned throughput (RUs) or affecting the performance and availability of your database. Continuous backups are taken in every region where the account exists.",
+            "guid": "d43918a8-cd28-49be-b6b1-7cb8245461e1",
+            "link": "https://learn.microsoft.com/azure/cosmos-db/continuous-backup-restore-introduction",
+            "service": "CosmosDB",
             "severity": "Medium",
-            "text": "Ensure that a dedicated ExpressRoute Gateway is being used for external data storage solutions",
+            "text": "Continous Backup with point-in-time restore in Azure Cosmos DB",
+            "training": "https://learn.microsoft.com/learn/modules/create-custom-azure-roles-with-rbac/",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "3649906e-bad3-48ea-b53c-c7de1d8aaab3",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-the-same-domain-name-on-front-door-and-your-origin",
-            "service": "AVS",
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "a95b86ad-8840-48e3-9273-4b875ba18f20",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/multitenant/considerations/tenancy-models",
+            "service": "Monitor",
             "severity": "Medium",
-            "text": "Ensure that FastPath is enabled on the ExpressRoute Gateway that is being used for external data storage solutions",
-            "waf": "Reliability"
+            "text": "Data collection rules in Azure Monitor -https://learn.microsoft.com/azure/azure-monitor/essentials/data-collection-rule-overview",
+            "training": "https://azure.microsoft.com/pricing/reservations/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "571549ab-8153-4d89-b89d-c7b33be2b1a2",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#disable-health-probes-when-theres-only-one-origin-in-an-origin-group",
-            "service": "AVS",
-            "severity": "High",
-            "text": "If using stretched cluster, ensure that your selected Disaster Recovery solution is supported by the vendor",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "45901365-d38e-443f-abcb-d868266abca2",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/automation",
+            "service": "Backup",
+            "severity": "Medium",
+            "text": "check backup instances with the underlying datasource not found",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "4c486b6d-8bdc-4059-acf7-5ee8a1309888",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#select-good-health-probe-endpoints",
-            "service": "AVS",
-            "severity": "High",
-            "text": "If using stretched cluster, ensure that the SLA provided will meet your requirements",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "64f9a19a-f29c-495d-94c6-c7919ca0f6c5",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/lighthouse",
+            "service": "VM",
+            "severity": "Medium",
+            "text": "Delete or archive unassociated services (disks, nics, ip addresses etc)",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "9579d66b-896d-471f-a6ca-7be9955d04c3",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-head-health-probes",
-            "service": "AVS",
-            "severity": "High",
-            "text": "If using stretched cluster, ensure that both ExpressRoute circuits are connected to your connectivity hub.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "69bad37a-ad53-4cc7-ae1d-76667357c449",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-microsoft-customer-agreement#design-recommendations",
+            "service": "Backup",
+            "severity": "Medium",
+            "text": "Consider a good balance between site recovery storage and backup for non mission critical applications",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "c49d987c-b3d1-4325-aa12-4b6e4d0685ed",
-            "link": "https://learn.microsoft.com/azure/nat-gateway/nat-overview#outbound-connectivity",
-            "service": "AVS",
-            "severity": "High",
-            "text": "If using stretched cluster, ensure that both ExpressRoute circuits have GlobalReach enabled.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "674b5ed8-5a85-49c7-933b-e2a1a27b765a",
+            "link": "https://learn.microsoft.com/azure/cost-management-billing/manage/direct-ea-administration#manage-notification-contacts",
+            "service": "Monitor",
+            "severity": "Medium",
+            "text": "Check spending and savings opportunities among the 40 different log analytics workspaces- use different retention and data collection for nonprod workspaces-create daily cap for awareness and tier sizing -  If you do set a daily cap, in addition to creating an alert when the cap is reached,ensure that you also create an alert rule to be notified when some percentage has been reached (90% for example). - consider workspace transformation if possible - https://learn.microsoft.com/azure/azure-monitor/essentials/data-collection-transformations#workspace-transformation-dcr ",
+            "training": "https://learn.microsoft.com/azure/cost-management-billing/costs/understand-work-scopes",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AVS/privateClouds",
-            "checklist": "Azure VMware Solution Design Review",
-            "guid": "dce9793b-7bcd-4b3b-91eb-2ec14eea6e59",
-            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-managed-tls-certificates",
-            "service": "AVS",
-            "severity": "High",
-            "text": "Have site disaster tolerance settings been properly considered and changed for your business if needed.",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Insights/components",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "91be1f38-8ef3-494c-8bd4-63cbbac75819",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-enterprise-agreement#design-considerations",
+            "service": "Monitor",
+            "severity": "Medium",
+            "text": "Enforce a purging log policy and automation (if needed, logs can be moved to cold storage)",
+            "training": "https://www.youtube.com/watch?v=nHQYcYGKuyw",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "Azure Event Hub provides encryption of data at rest. If you use your own key, the data is still encrypted using the Microsoft-managed key, but in addition the Microsoft-managed key will be encrypted using the customer-managed key. ",
-            "guid": "7aaf12e7-b94e-4f6e-847d-2d92981b1cd6",
-            "link": "https://learn.microsoft.com/azure/event-hubs/configure-customer-managed-key",
-            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend SkuName = tostring(sku.name) | extend EncryptionEnabled = iif(isnotempty(properties.encryption.keySource), 'Enabled', 'Disabled') | extend compliant = iif(EncryptionEnabled == 'Enabled', true, false) | project name, resourceGroup, location, SkuName, EncryptionEnabled, compliant | where SkuName == 'Premium'",
-            "service": "Event Hubs",
-            "severity": "Low",
-            "text": "Use customer-managed key option in data at rest encryption when required",
-            "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "6aae01e6-a84d-4e5d-b36d-1d92881a1bd5",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-enterprise-agreement#design-considerations",
+            "service": "VM",
+            "severity": "Medium",
+            "text": "Check that the disks are really needed, if not: delete. If they are needed, find lower storage tiers or use backup -",
+            "training": "https://learn.microsoft.com/azure/cost-management-billing/costs/manage-automation",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "Azure Event Hubs namespaces permit clients to send and receive data with TLS 1.0 and above. To enforce stricter security measures, you can configure your Event Hubs namespace to require that clients send and receive data with a newer version of TLS. If an Event Hubs namespace requires a minimum version of TLS, then any requests made with an older version will fail. ",
-            "guid": "d2f54b29-769e-43a6-a0e7-828ac936657e",
-            "link": "https://learn.microsoft.com/azure/event-hubs/transport-layer-security-configure-minimum-version",
-            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend MinimumTlsVersion = tostring(properties.minimumTlsVersion) | extend compliant = iif(MinimumTlsVersion == '1.2' or MinimumTlsVersion == '1.3', true, false) | project name, resourceGroup, location, MinimumTlsVersion, compliant",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "d1e44a19-659d-4395-afd7-7289b835556d",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-enterprise-agreement#design-considerations",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Enforce a minimum required version of Transport Layer Security (TLS) for requests ",
-            "training": "https://learn.microsoft.com/learn/modules/secure-aad-users-with-mfa/",
-            "waf": "Security"
+            "text": "Consider moving unused storage to lower tier, with customized rule - https://learn.microsoft.com/azure/storage/blobs/lifecycle-management-policy-configure  ",
+            "training": "https://learn.microsoft.com/azure/cost-management-billing/costs/enable-tag-inheritance",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "When you create an Event Hubs namespace, a policy rule named RootManageSharedAccessKey is automatically created for the namespace. This policy has manage permissions for the entire namespace. It�s recommended that you treat this rule like an administrative root account and don�t use it in your application. Using AAD as an authentication provider with RBAC is recommended. ",
-            "guid": "13b0f566-4b1e-4944-a459-837ee79d6c6d",
-            "link": "https://learn.microsoft.com/azure/event-hubs/authorize-access-shared-access-signature#shared-access-authorization-policies",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "d0102cac-6aae-401e-9a84-de5de36d1d92",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Avoid using root account when it is not necessary",
-            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-identities-governance/",
-            "waf": "Security"
+            "text": "Make sure advisor is configured for VM right sizing ",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "Managed identities for Azure resources can authorize access to Event Hubs resources using Azure AD credentials from applications running in Azure Virtual Machines (VMs), Function apps, Virtual Machine Scale Sets, and other services. By using managed identities for Azure resources together with Azure AD authentication, you can avoid storing credentials with your applications that run in the cloud. ",
-            "guid": "3a365a5c-7acb-4e48-abd5-4cd79f2e8776",
-            "link": "https://learn.microsoft.com/azure/event-hubs/authenticate-managed-identity?tabs=latest",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "description": "check by searching the Meter Category Licenses in the Cost analysys",
+            "guid": "59ae568b-a38d-4498-9e22-13dbd7bb012f",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/manage/centralize-operations",
+            "service": "VM",
             "severity": "Medium",
-            "text": "When possible, your application should be using a managed identity to authenticate to Azure Event Hub. If not, consider having the storage credential (SAS, service principal credential) in Azure Key Vault or an equivalent service",
-            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
-            "waf": "Security"
+            "text": "run the script on all windows VMs https://learn.microsoft.com/azure/virtual-machines/windows/hybrid-use-benefit-licensing?ref=andrewmatveychuk.com#convert-an-existing-vm-using-azure-hybrid-benefit-for-windows-server- consider implementing a policy if windows VMs are created frequently",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "When creating permissions, provide fine-grained control over a client's access to Azure Event Hub. Permissions in Azure Event Hub can and should be scoped to the individual resource level e.g. consumer group, event hub entity, event hub namespaces, etc.",
-            "guid": "8357c559-675c-45ee-a5b8-6ad8844ce3b2",
-            "link": "https://learn.microsoft.com/azure/event-hubs/authorize-access-azure-active-directory#azure-built-in-roles-for-azure-event-hubs",
-            "service": "Event Hubs",
-            "severity": "High",
-            "text": "Use least privilege data plane RBAC",
-            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "7b95e06e-158e-42ea-9992-c2de6e2065b3",
+            "link": "https://learn.microsoft.com/azure/active-directory/privileged-identity-management/pim-configure",
+            "service": "VM",
+            "severity": "Medium",
+            "text": " this can be also put under AHUB if you already have licenses https://learn.microsoft.com/azure/virtual-machines/linux/azure-hybrid-benefit-linux?tabs=rhelpayg%2Crhelbyos%2CrhelEnablebyos%2Crhelcompliance",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "Azure Event Hub resource logs include operational logs, virtual network and Kafka logs. Runtime audit logs capture aggregated diagnostic information for all data plane access operations (such as send or receive events) in Event Hubs.",
-            "guid": "b38b875b-a1cf-4104-a900-3a4d3ce474db",
-            "link": "https://learn.microsoft.com/azure/event-hubs/monitor-event-hubs-reference",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "75c1e945-b459-4837-bf7a-e7c6d3b475a5",
+            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/active-directory-groups-create-azure-portal",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Enable logging for security investigation. Use Azure Monitor to captured metrics and logs such as resource logs, runtime audit logs and Kafka logs",
-            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
-            "waf": "Security"
+            "text": "Consolidate reserved VM families with flexibility option (no more than 4-5 families)",
+            "training": "https://learn.microsoft.com/azure/automation/automation-solution-vm-management",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "Azure Event Hub by default has a public IP address and is Internet-reachable. Private endpoints allow traffic between your virtual network and Azure Event Hub traverses over the Microsoft backbone network. In addition to that, you should disable public endpoints if those are not used. ",
-            "guid": "5abca2a4-eda1-4dae-8cc9-5d48c6b791dc",
-            "link": "https://learn.microsoft.com/azure/event-hubs/private-link-service",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "c7acbe49-bbe6-44dd-a9f2-e87778468d55",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/identity-access#prerequisites-for-a-landing-zone---design-recommendations",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Consider using private endpoints to access Azure Event Hub and disable public network access when applicable.",
-            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
-            "waf": "Security"
+            "text": "Utilize Azure Reserved Instances: This feature allows you to reserve VMs for a period of 1 or 3 years, providing significant cost savings compared to PAYG prices.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "With IP firewall, you can restrict public endpoint further to only a set of IPv4 addresses or IPv4 address ranges in CIDR (Classless Inter-Domain Routing) notation. ",
-            "guid": "a0e6c465-89e5-458b-a37d-3974d1112dbd",
-            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-ip-filtering",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "a6bcca2b-4fea-41db-b3dd-95d48c7c891d",
+            "link": "https://learn.microsoft.com/azure/active-directory-domain-services/overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Consider only allowing access to Azure Event Hub namespace from specific IP addresses or ranges",
-            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
-            "waf": "Security"
+            "text": "Only larger disks can be reserved => 1 TiB -",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "guid": "31d41e36-11c8-417b-8afb-c410d4391898",
-            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/paas-foundations-playbooks-AEH_v1.docx",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "cb1f7d57-59ae-4568-aa38-d4985e2213db",
+            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/identity/adds-extend-domain",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Leverage FTA Resillency HandBook",
-            "waf": "Reliability"
+            "text": "After the right-sizing optimization",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": " This will be turned on automatically for a new EH namespace created from the portal with Premium, Dedicated, or Standard SKUs in a zone-enabled region. Both the EH metadata and the event data itself are replicated across zones",
-            "guid": "f15bce21-9e4a-40eb-9787-9424d226786d",
-            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-premium-overview#high-availability-with-availability-zones",
-            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend zoneRedundant = tobool(properties.zoneRedundant) | extend compliant = iff(zoneRedundant == true, true, false) | project name, resourceGroup, zoneRedundant, compliant",
-            "service": "Event Hubs",
-            "severity": "High",
-            "text": "Leverage Availability Zones if regionally applicable",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Sql/servers",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "d7bb012f-7b95-4e06-b158-e2ea3992c2de",
+            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy",
+            "service": "SQL",
+            "severity": "Medium",
+            "text": "Check if applicable and enforce policy/change https://learn.microsoft.com/azure/azure-sql/azure-hybrid-benefit?view=azuresql&tabs=azure-portalhttps://learn.microsoft.com/azure/cost-management-billing/scope-level/create-sql-license-assignments?source=recommendations",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "guid": "20b56c56-ad58-4519-8f82-735c586bb281",
-            "link": "https://learn.microsoft.com/azure/event-hubs/compare-tiers",
-            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend sku = tostring(sku.name) | extend compliant = iff(sku == 'Premium', true, false) | project name, resourceGroup, location, sku, compliant",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "6e2065b3-a76a-4f4a-991e-8839ada46667",
+            "link": "https://learn.microsoft.com/azure/active-directory/roles/best-practices",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Use the Premium or Dedicated SKUs   for predicable performance",
-            "waf": "Reliability"
+            "text": "The VM + license part discount (ahub + 3YRI) is around 70% discount",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "The built-in geo-disaster recovery feature, when enabled, ensures that the entire configuration of anamespace (Event Hubs, Consumer Groups and settings) is continuously replicated from a primary namespace to a secondary namespace, and it allows a once-only failover move from the primary to the secondary at any time. Active/Passive feature is designed to make it easier to recover from and abandon a failed Azure region without having to change application configurations",
-            "guid": "dc15a1c0-75ee-49f1-90ac-ccd579376bcd",
-            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-geo-dr?tabs=portal",
-            "service": "Event Hubs",
-            "severity": "High",
-            "text": "Plan for Geo Disaster Recovery using Active Passive configuration",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "ccbd9792-a6bc-4ca2-a4fe-a1dbf3dd95d4",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#send-logs-to-microsoft-sentinel",
+            "service": "VM",
+            "severity": "Medium",
+            "text": "Consider using a VMSS to match demand rather than flat sizing",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "description": "Should be used for DR configurations where an outage or loss of event data in the downed region cannot be tolerated. For these cases, follow the replication guidance and do not use the built-in geo-disaster recovery capability (active/passive). With Active/Active, Maintain multiple Event Hubs in different regions and namespaces, and events will be replicated between the hubs",
-            "guid": "6e31b67d-67ba-4591-89c0-9e805d597c7e",
-            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-federation-overview",
-            "service": "Event Hubs",
+            "arm-service": "microsoft.containerservice/managedClusters",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "c1b1cd52-1e54-4a29-a9de-39ac0e7c28dc",
+            "link": "https://learn.microsoft.com/azure/reliability/cross-region-replication-azure",
+            "service": "AKS",
             "severity": "Medium",
-            "text": "For Business Critical Applications, use Active Active configuration",
-            "waf": "Reliability"
+            "text": "Use AKS autoscaler to match your clusters usage (make sure the pods requirements match the scaler)",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.eventhub/namespaces",
-            "checklist": "Azure Event Hub Review",
-            "guid": "9ced16ad-d186-4f0a-a241-a999a68af77c",
-            "link": "https://learn.microsoft.com/azure/architecture/serverless/event-hubs-functions/resilient-design",
-            "service": "Event Hubs",
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "44be3b1a-27f8-4b9e-a1be-1f38df03a822",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/data-retention-archive?tabs=portal-1%2Cportal-2#how-retention-and-archiving-work",
+            "service": "Backup",
             "severity": "Medium",
-            "text": "Design Resilient Event Hubs",
-            "waf": "Reliability"
+            "text": "Move recovery points to vault-archive where applicable (Validate)",
+            "training": "https://azure.microsoft.com/pricing/reservations/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Cognitive Services Review Checklist",
-            "guid": "21c30d25-ffb7-4f6a-b9ea-b3fec328f787",
-            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/paas-foundations-playbooks-cog_svcs_v1.docx",
-            "service": "Cognitive Services",
+            "arm-service": "Microsoft.Databricks/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "cd463cbb-bc8a-4c29-aebc-91a43da1dae2",
+            "link": "https://learn.microsoft.com/azure/databricks/clusters/cluster-config-best-practices#automatic-termination",
+            "service": "Databricks",
             "severity": "Medium",
-            "text": "Leverage FTA HandBook for Cognitive Services",
-            "waf": "Reliability"
+            "text": "Consider using Spot VMs with fallback where possible. Consider autotermination of clusters.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Cognitive Services Review Checklist",
-            "guid": "78c34698-16b2-4763-aefe-1b9b599de0d5",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/concepts/advanced-prompt-engineering?pivots=programming-language-chat-completions",
-            "service": "Cognitive Services",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "cc881470-607c-41cc-a0e6-14658dd458e9",
+            "link": "https://learn.microsoft.com/azure/governance/policy/how-to/guest-configuration-create",
+            "service": "Functions",
             "severity": "Medium",
-            "text": "Backup Your Prompts",
-            "waf": "Reliability"
+            "text": "Functions - Reuse connections",
+            "training": "https://learn.microsoft.com/azure/cost-management-billing/reservations/reservation-apis?toc=%2Fazure%2Fcost-management-billing%2Ftoc.json",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Cognitive Services Review Checklist",
-            "guid": "750ab2ab-039d-4a6d-95d7-c892adb107d5",
-            "link": "https://learn.microsoft.com/azure/ai-services/openai/how-to/business-continuity-disaster-recovery",
-            "service": "Cognitive Services",
-            "severity": "High",
-            "text": "Business Continuity and Disaster Recovery (BCDR) considerations with Azure OpenAI Service",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "27139b82-1102-4dbd-9eaf-11e6f843e52f",
+            "link": "https://learn.microsoft.com/azure/automation/update-management/overview",
+            "service": "Functions",
+            "severity": "Medium",
+            "text": "Functions - Cache data locally",
+            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-compute-resources/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Cognitive Services Review Checklist",
-            "guid": "325af625-ca44-4e46-a5e2-223ace8bb123",
-            "link": "https://github.com/abacaj/chatgpt-backup#backup-your-chatgpt-conversations",
-            "service": "Cognitive Services",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "4722d928-c1b1-4cd5-81e5-4a29b9de39ac",
+            "link": "https://learn.microsoft.com/azure/network-watcher/network-watcher-monitoring-overview",
+            "service": "Functions",
             "severity": "Medium",
-            "text": "Backup Your ChatGPT conversations",
-            "waf": "Reliability"
+            "text": "Functions - Cold starts-Use the 'Run from package' functionality. This way, the code is downloaded as a single zip file. This can, for example, result in significant improvements with Javascript functions, which have a lot of node modules.Use language specific tools to reduce the package size, for example, tree shaking Javascript applications.",
+            "training": "https://learn.microsoft.com/learn/modules/configure-network-watcher/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Cognitive Services Review Checklist",
-            "guid": "07ca5f17-f154-4e3a-a369-2829e7e31618",
-            "link": "https://learn.microsoft.com/azure/ai-services/speech-service/how-to-custom-speech-continuous-integration-continuous-deployment",
-            "service": "Cognitive Services",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "0e7c28dc-9366-4572-82bf-f4564b0d934a",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/lock-resources?tabs=json",
+            "service": "Functions",
             "severity": "Medium",
-            "text": "CI/CD for custom speech",
-            "waf": "Reliability"
+            "text": "Functions - Keep your functions warm",
+            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.CognitiveServices/accounts",
-            "checklist": "Cognitive Services Review Checklist",
-            "guid": "3687a046-7a1f-4893-9bda-43324f248116",
-            "link": "https://learn.microsoft.com/azure/ai-services/qnamaker/tutorials/export-knowledge-base",
-            "service": "Cognitive Services",
-            "severity": "Low",
-            "text": "Move a knowledge base using export-import",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "359c363e-7dd6-4162-9a36-4a907ebae38e",
+            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
+            "service": "Functions",
+            "severity": "Medium",
+            "text": "When using autoscale with different functions, there might be one driving all the autoscale for all the resources - consider moving it to a separate consumption plan (and consider higher plan for CPU)",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "graph": "resources | where type=~'Microsoft.ServiceFabric/managedClusters' | extend compliant = (sku=~'{\"name\":\"Standard\"}') | distinct id,compliant",
-            "guid": "182840d2-9ef8-4238-8fd6-0d76186830ac",
-            "link": "https://learn.microsoft.com/azure/service-fabric/overview-managed-cluster#service-fabric-managed-cluster-skus",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "ad53cc7d-e2e8-4aaa-a357-1549ab9153d8",
+            "link": "https://learn.microsoft.com/azure/service-health/alerts-activity-log-service-notifications-portal",
+            "service": "Functions",
             "severity": "Medium",
-            "text": "Use Standard SKU for production scenarios.",
-            "waf": "Reliability"
+            "text": "Function apps in a given plan are all scaled together, so any issues with scaling can affect all apps in the plan.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "graph": "resources | where type=~'Microsoft.ServiceFabric/clusters' | extend nodeTypes= array_concat(properties.nodeTypes) | mv-expand nodeTypes | summarize BronzeDurabilityCount = countif(nodeTypes.durabilityLevel == 'Bronze') by id | extend compliant = (BronzeDurabilityCount == 0) | distinct id,compliant",
-            "guid": "182840d2-9ef8-4238-8fd6-0d76186830ac",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity#durability-characteristics-of-the-cluster",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "9f89dc7b-44be-43b1-a27f-8b9e91be1f38",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/alerts/action-groups",
+            "service": "Functions",
             "severity": "Medium",
-            "text": "Use durability level Silver (5 VMs) or greater for production scenarios",
-            "waf": "Reliability"
+            "text": "Am I billed for 'await time'? This question is typically asked in the context of a C# function that does an async operation and waits for the result, e.g. await Task.Delay(1000) or await client.GetAsync('http://google.com'). The answer is yes - the GB second calculation is based on the start and end time of the function and the memory usage over that period. What actually happens over that time in terms of CPU activity is not factored into the calculation.One exception to this rule is if you are using durable functions. You are not billed for time spent at awaits in orchestrator functions.apply demand shaping techinques where possible (dev environments?) https://github.com/Azure-Samples/functions-csharp-premium-scaler",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "graph": "resources | where type=~'Microsoft.ServiceFabric/managedClusters' | extend compliant= ( properties.zonalResiliency =~ 'true') | distinct id,compliant",
-            "guid": "2363878d-55c4-4cbd-9bc2-94523c85f12e",
-            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-cluster-availability-zones",
-            "service": "Azure Service Fabric",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "3da1dae2-cc88-4147-8607-c1cca0e61465",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Consider using Availability Zones for your Service Fabric clusters. Service Fabric managed cluster supports deployments that span across multiple Availability Zones to provide zone resiliency. This configuration will ensure high-availability of the critical system services and your applications to protect from single-points-of-failure.",
-            "waf": "Reliability"
+            "text": "Frontdoor - Turn off the default homepageIn the application settings of your App, set AzureWebJobsDisableHomepage to true. This will return a 204 (No Content) to the PoP so only header data is returned.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "5ba74cc8-3ca2-44d5-9a67-bdc8e102e7b4",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-api-management-overview",
-            "service": "Azure Service Fabric",
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "8dd458e9-2713-49b8-8110-2dbd6eaf11e6",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-setup-guide/monitoring-reporting?tabs=AzureMonitor",
+            "service": "Front Door",
             "severity": "Medium",
-            "text": "Consider using Azure API Management to expose and offload cross-cutting functionality for APIs hosted on the cluster. API Management can integrate with Service Fabric directly.",
-            "waf": "Reliability"
+            "text": "Frontdoor - Route to something that returns nothing. Either set up a Function, Function Proxy, or add a route in your WebApp that returns 200 (OK) and sends no or minimal content. The advantage of this is you will be able to log out when it is called.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "ef17bb8f-4e2c-488b-8ceb-a07c3d750dd3",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-reliable-services-introduction",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "7e31c67d-68cf-46a6-8a11-94956d697dc3",
+            "link": "https://learn.microsoft.com/azure/architecture/best-practices/monitoring",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "For stateful workload scenarios, consider using Reliable Services. The Reliable Services model allows your services to stay up even in unreliable environments where your machines fail or hit network issues, or in cases where the services themselves encounter errors and crash or fail. For stateful services, your state is preserved even in the presence of network or other failures.",
-            "waf": "Reliability"
+            "text": "Consider archiving tiers for less used data",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "graph": "resources | where type=~'Microsoft.Compute/virtualMachineScaleSets' | extend vmssExtension= array_concat(properties.virtualMachineProfile.extensionProfile.extensions) | mv-expand vmssExtension | where vmssExtension.properties.publisher matches regex '^Microsoft.Azure.ServiceFabric.*' | summarize arg_max(id, *) | summarize compliant = countif(sku.name matches regex '^Standard_[^d]*$' ) by id",
-            "guid": "4da21268-f775-4c89-a271-eb80543c8df7",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "a2ed27b2-d186-4f1a-8252-bddde68a487c",
+            "link": "https://learn.microsoft.com/azure/automation/how-to/region-mappings",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Avoid VM SKUs with temp disk offerings. Service Fabric uses managed disks by default, so avoiding temp disk offerings ensures you don't pay for unneeded resources.",
+            "text": "Check disk sizes where the size does not match the tier (i.e. A 513 GiB disk will pay a P30 (1TiB) and consider resizing",
             "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "1890b796-f300-41a3-a8d4-29738c1f4ad0",
-            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-cluster-stateless-node-type#temporary-disk-support",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "dec4861b-c3bc-410a-b77e-26e4d5a3bec2",
+            "link": "https://learn.microsoft.com/azure/governance/policy/concepts/guest-configuration",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "If you need to select a certain VM SKU for capacity reasons and it happens to offer temp disk, consider using temporary disk support for your stateless workloads.",
+            "text": "Consider using standard SSD rather than Premium or Ultra where possible",
             "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "5247bb32-6778-49c7-8b40-e171c9a3ce1e",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "c4e2436b-1336-4db5-9f17-960eee0bdf5c",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#monitoring-for-configuration-drift",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Align SKU selection and managed disk size with workload requirements. Matching your selection to your workload demands ensures you don't pay for unneeded resources.",
+            "text": "For storage accounts, make sure that the chosen tier is not adding up transaction charges (it might be cheaper to move to the next tier)",
             "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "6028759b-446a-41bc-8b0e-7728e61ca704",
-            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-cluster-networking#manage-nsg-rules",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "c2efc5d7-61d4-41d2-900b-b47a393a040f",
+            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-overview",
+            "service": "Site Recovery",
             "severity": "Medium",
-            "text": "Ensure Network Security Groups (NSG) are configured to restrict traffic flow between subnets and node types. For example, you may have an API Management instance (one subnet), a frontend subnet (exposing a website directly), and a backend subnet (accessible only to frontend).",
-            "waf": "Security"
+            "text": "For ASR, consider using Standard SSD disks if the RPO/RTO and replication throughput allow it",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "graph": "resources | where type=~'Microsoft.Compute/virtualMachineScaleSets' | extend vmssExtension= array_concat(properties.virtualMachineProfile.extensionProfile.extensions) | mv-expand vmssExtension | where vmssExtension.properties.publisher matches regex '^Microsoft.Azure.ServiceFabric.*' | summarize arg_max(id, *) | extend compliant = (isnotnull(properties.virtualMachineProfile.osProfile.secrets))",
-            "guid": "4e98c903-14cf-4c72-9c45-b8b23bc4cbd8",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-best-practices-security#deploy-key-vault-certificates-to-service-fabric-cluster-virtual-machine-scale-sets",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "d3294798-b118-48b2-a5a4-6ceb544451e1",
+            "link": "https://learn.microsoft.com/azure/architecture/framework/resiliency/backup-and-recovery",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Deploy Key Vault certificates to Service Fabric cluster virtual machine scale sets. Centralizing storage of application secrets in Azure Key Vault allows you to control their distribution. Key Vault greatly reduces the chances that secrets may be accidentally leaked.",
-            "waf": "Security"
+            "text": "Storage accounts: check hot tier and/or GRS necessary",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "001cbb6f-d88d-4431-8434-d01333397776",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-best-practices-security#apply-an-access-control-list-acl-to-your-certificate-for-your-service-fabric-cluster",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "92d34429-3c76-4286-97a5-51c5b04e4f18",
+            "link": "https://learn.microsoft.com/azure/backup/backup-center-overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Apply an Access Control List (ACL) to your client certificate for your Service Fabric cluster. Using an ACL provides an additional level of authentication.",
-            "waf": "Security"
+            "text": "Disks - validate use of Premium SSD disks everywhere: for example, non-prod could swap to Standard SSD or on-demand Premium SSD  ",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "4b74b7a5-bb1e-4fca-948c-037ba95fb73b",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-resource-governance#resource-governance-mechanism",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Synapse/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "54387e5c-ed12-46cd-832a-f5b2fc6998a5",
+            "link": "https://learn.microsoft.com/azure/reliability/availability-zones-overview",
+            "service": "Synapse",
             "severity": "Medium",
-            "text": "Use resource requests and limits to govern resource usage across the nodes in your cluster. Enforcing resource limits helps ensure that one service doesn't consume too many resources and starve other services.",
-            "waf": "Security"
+            "text": "Create budgets to manage costs and create alerts that automatically notify stakeholders of spending anomalies and overspending risks.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "cd9233ba-f3aa-4353-8d2f-7ea4a64160e6",
-            "link": "",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Synapse/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "35e33789-7e31-4c67-b68c-f6a62a119495",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/availability",
+            "service": "Synapse",
             "severity": "Medium",
-            "text": "Encrypt Service Fabric package secret values. Encryption on your secret values provides an additional level of security.",
-            "waf": "Security"
+            "text": "Export cost data to a storage account for additional data analysis.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "44b989d4-9f72-42b6-99da-ec2a79f83299",
-            "link": "",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Synapse/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "6d697dc3-a2ed-427b-8d18-6f1a1252bddd",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
+            "service": "Synapse",
             "severity": "Medium",
-            "text": "Include client certificates in Service Fabric applications. Having your applications use client certificates for authentication provides opportunities for security at both the cluster and workload level.",
-            "waf": "Security"
+            "text": "Control costs for a dedicated SQL pool by pausing the resource when it is not in use.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "28e66ff7-4a77-4b2c-910d-0335f141208a",
-            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-identity-managed-cluster-virtual-machine-scale-sets",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Synapse/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "e68a487c-dec4-4861-ac3b-c10ae77e26e4",
+            "link": "https://learn.microsoft.com/azure/virtual-machine-scale-sets/overview",
+            "service": "Synapse",
             "severity": "Medium",
-            "text": "Authenticate Service Fabric applications to Azure Resources using Managed Identity. Using Managed Identity allow you to securely manage the credentials in your code for authenticating to various services without saving them locally on a developer workstation or in source control.",
-            "waf": "Security"
+            "text": "Enable the serverless Apache Spark automatic pause feature and set your timeout value accordingly.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Azure Service Fabric Review Checklist",
-            "guid": "f16c413c-00a6-43aa-852c-b97292c33a56",
-            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-best-practices-security#hosting-untrusted-applications-in-a-service-fabric-cluster",
-            "service": "Azure Service Fabric",
+            "arm-service": "Microsoft.Synapse/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "d5a3bec2-c4e2-4436-a133-6db55f17960e",
+            "link": "https://learn.microsoft.com/azure/frontdoor/best-practices#use-latest-version-for-customer-managed-certificates",
+            "service": "Synapse",
             "severity": "Medium",
-            "text": "Follow Service Fabric best practices when hosting untrusted applications. Following the best practices provides a security standard to follow.",
-            "waf": "Security"
+            "text": "Create multiple Apache Spark pool definitions of various sizes.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "6d8e32a8-3892-479d-a40b-10f6b4f6f298",
-            "link": "https://learn.microsoft.com/azure/spring-apps/concepts-blue-green-deployment-strategies",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.Synapse/workspaces",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "ee0bdf5c-c2ef-4c5d-961d-41d2500bb47a",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/resource-org-management-groups#management-groups-in-the-azure-landing-zone-accelerator",
+            "service": "Synapse",
             "severity": "Medium",
-            "text": "Azure Spring Apps permits two deployments for every app, only one of which receives production traffic. You can achieve zero downtime with blue green deployment strategies. Blue green deployment is only available in Standard and Enterprise tiers. You could automate deployment using CI/CD with ADO/GitHub actions",
-            "waf": "Reliability"
+            "text": "Purchase Azure Synapse commit units (SCU) for one year with a pre-purchase plan to save on your Azure Synapse Analytics costs.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "fbcb40ac-9480-4a6d-bcf4-8081252a6716",
-            "link": "https://learn.microsoft.com/azure/architecture/web-apps/spring-apps/architectures/spring-apps-multi-region",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "393a040f-d329-4479-ab11-88b2c5a46ceb",
+            "link": "https://learn.microsoft.com/azure/application-gateway/overview-v2",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Azure Spring Apps instances could be created in multiple regions for your applications and traffic could be routed by Traffic Manager/Front Door.",
-            "waf": "Reliability"
+            "text": "Use Spot VMs for interruptible jobs: These are VMs that can be bid on and purchased at a discounted price, providing a cost-effective solution for non-critical workloads.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "ff1ae6a7-9301-4feb-9d11-56cd72f1d4ef",
-            "link": "https://learn.microsoft.com/azure/reliability/reliability-spring-apps",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "544451e1-92d3-4442-a3c7-628637a551c5",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "In supported region, Azure Spring Apps can be deployed as zone redundant, which means that instances are automatically distributed across availability zones. This feature is only available in Standard and Enterprise tiers.",
-            "waf": "Reliability"
+            "text": "Right-sizing all VMs",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "ffc735ad-fbb1-4802-b43f-ad6387c4c066",
-            "link": "https://learn.microsoft.com/azure/spring-apps/concept-understand-app-and-deployment",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "b04e4f18-5438-47e5-aed1-26cd032af5b2",
+            "link": "https://learn.microsoft.com/azure/application-gateway/configuration-infrastructure#size-of-the-subnet",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Use more than 1 app instance for your apps",
-            "waf": "Reliability"
+            "text": "Swap VM sized with normalized and most recent sizes",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "7504c230-6035-4183-95a5-85762acc6075",
-            "link": "https://learn.microsoft.com/azure/spring-apps/diagnostic-services",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "fc6998a5-35e3-4378-a7e3-1c67d68cf6a6",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Monitor Azure Spring Apps with logs, metrics and tracing. Integrate ASA with application insights and track failures and create workbooks.",
-            "waf": "Reliability"
+            "text": "right-sizing VMs - start with monitoring usage below 5% and then work up to 40%",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "1eb48d58-3eec-4ef5-80b0-d2b0dde3f0c6",
-            "link": "https://learn.microsoft.com/azure/spring-apps/how-to-configure-enterprise-spring-cloud-gateway",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Cost Optimization Checklist",
+            "guid": "2a119495-6d69-47dc-9a2e-d27b2d186f1a",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Set up autoscaling in Spring Cloud Gateway",
+            "text": "Containerizing an application can improve VM density and save money on scaling it",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Cost"
+        },
+        {
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "65285269-440c-44be-9d3e-0844276d4bdc",
+            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/pass-foudations-playbooks-ADB_v1.docx",
+            "service": "Data Factory",
+            "severity": "High",
+            "text": "Reference Databricks HA/DR playbook",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "97411607-b6fd-4335-99d1-9885faf4e392",
-            "link": "https://learn.microsoft.com/azure/spring-apps/how-to-setup-autoscale",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "a0e6c465-89d5-458b-a37d-3974d1112dbd",
+            "link": "https://github.com/databrickslabs/databricks-sync",
+            "service": "Data Factory",
             "severity": "Low",
-            "text": "Enable autoscale for the apps with Standard consumption & dedicated plan.",
+            "text": "Use Databricks Sync",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.AppPlatform/Spring",
-            "checklist": "Azure Spring Apps Review",
-            "guid": "dfcaffd1-d27c-4ef2-998d-64c1df3a7ac3",
-            "link": "https://learn.microsoft.com/azure/spring-apps/overview",
-            "service": "Spring Apps",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "89d558b9-37d3-4974-b111-2dbd7aaf12e6",
+            "link": "https://learn.microsoft.com/azure/databricks/security/secrets/secret-scopes",
+            "service": "Data Factory",
             "severity": "Medium",
-            "text": "Use Enterprise plan for commercial support of spring boot for mission critical apps. With other tiers you get OSS support.",
+            "text": "Backup your workspace configuration including ARM templates and secret scopes",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "Azure Service Bus Premium provides encryption of data at rest. If you use your own key, the data is still encrypted using the Microsoft-managed key, but in addition the Microsoft-managed key will be encrypted using the customer-managed key. ",
-            "guid": "87af4a79-1f89-439b-ba47-768e14c11567",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/configure-customer-managed-key",
-            "service": "Service Bus",
-            "severity": "Low",
-            "text": "Use customer-managed key option in data at rest encryption when required",
-            "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
-            "waf": "Security"
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "b94ee5ef-47d2-4d92-a81b-1cd6d1f54b29",
+            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/sharing-metadata-across-different-databricks-workspaces-using/ba-p/3679757",
+            "service": "Data Factory",
+            "severity": "Medium",
+            "text": "Share metaData across different Databricks workspaces using Hive external metastore",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "Communication between a client application and an Azure Service Bus namespace is encrypted using Transport Layer Security (TLS). Azure Service Bus namespaces permit clients to send and receive data with TLS 1.0 and above. To enforce stricter security measures, you can configure your Service Bus namespace to require that clients send and receive data with a newer version of TLS.",
-            "guid": "5c1ea55b-46a9-448f-b8ae-7d7e4b475b6c",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/transport-layer-security-enforce-minimum-version",
-            "service": "Service Bus",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "769e3969-0e78-428a-a936-657d03b0f466",
+            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/disaster-recovery-strategy-in-azure-databricks-using-the-hive/ba-p/3684581",
+            "service": "Data Factory",
             "severity": "Medium",
-            "text": "Enforce a minimum required version of Transport Layer Security (TLS) for requests ",
-            "training": "https://learn.microsoft.com/learn/modules/secure-aad-users-with-mfa/",
-            "waf": "Security"
+            "text": "Plan Disaster Recovery strategy in Databricks using the Hive External Metastore",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "When you create a Service Bus namespace, a SAS rule named RootManageSharedAccessKey is automatically created for the namespace. This policy has Manage permissions for the entire namespace. It's recommended that you treat this rule like an administrative root account and don't use it in your application.  Using AAD as an authentication provider with RBAC is recommended. ",
-            "guid": "8bcbf59b-ce65-4de8-a03f-97879468d66a",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-sas#shared-access-authorization-policies",
-            "service": "Service Bus",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "4b1d944a-3598-437e-b79d-6c6d3a364a5b",
+            "link": "https://www.databricks.com/blog/2021/04/20/attack-of-the-delta-clones-against-disaster-recovery-availability-complexity.html",
+            "service": "Data Factory",
             "severity": "Medium",
-            "text": "Avoid using root account when it is not necessary",
-            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-identities-governance/",
-            "waf": "Security"
+            "text": "Backup your data with deep and shallow clones",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "Microsoft Entra ID provides superior security and ease of use over shared access signatures (SAS). With Microsoft Entra ID, there’s no need to store the tokens in your code and risk potential security vulnerabilities. We recommend that you use Microsoft Entra ID with your Azure Service Bus applications when possible.",
-            "graph": "Resources | where type =~ 'microsoft.servicebus/namespaces' | extend compliant = iif(properties.disableLocalAuth == 'false', 'No', 'Yes') | project id, compliant",
-            "guid": "786d60f9-6c96-4ad8-a55d-04c2b39c986b",
-            "link": "https://learn.microsoft.com/en-us/azure/service-bus-messaging/disable-local-authentication",
-            "service": "Service Bus",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "description": "Download the blob using the secondary endpoint in RAGRS storage account",
+            "guid": "7abae48a-bd54-4cd7-ae2e-86768357c559",
+            "link": "https://techcommunity.microsoft.com/t5/azure-paas-blog/download-the-blob-using-secondary-endpoint-in-ragrs-storage/ba-p/2403750",
+            "service": "Data Factory",
             "severity": "Medium",
-            "text": "When possible, disable SAS key authentication (or local authentication) and use only Microsoft Entra ID for authentication",
-            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
-            "waf": "Security"
+            "text": "Backup your data to Azure Storage RA-GRS",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "When creating permissions, provide fine-grained control over a client's access to Azure Service Bus. Permissions in Azure Service Bus can and should be scoped to the individual resource level e.g. queue, topic or subscription. ",
-            "guid": "f615658d-e558-4f93-9249-b831112dbd7e",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/authenticate-application#azure-built-in-roles-for-azure-service-bus",
-            "service": "Service Bus",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "675c5ee8-5b85-49c7-944c-e3b1a28b875a",
+            "link": "https://learn.microsoft.com/azure/databricks/dev-tools/index-ci-cd",
+            "service": "Data Factory",
             "severity": "High",
-            "text": "Use least privilege data plane RBAC",
-            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "Azure Service Bus resource logs include operational logs,  virtual network and IP filtering logs. Runtime audit logs capture aggregated diagnostic information for various data plane access operations (such as send or receive messages) in Service Bus.",
-            "guid": "af12e7f9-43f6-4304-922d-929c2b1cd622",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/monitor-service-bus-reference",
-            "service": "Service Bus",
-            "severity": "Medium",
-            "text": "Enable logging for security investigation. Use Azure Monitor to trace resource logs and runtime audit logs (currently available only in the premium tier)",
-            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
-            "waf": "Security"
+            "text": "Backup your code with DevOps",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "Azure Service Bus by default has a public IP address and is Internet-reachable. Private endpoints allow traffic between your virtual network and Azure Service Bus traverses over the Microsoft backbone network. In addition to that, you should disable public endpoints if those are not used. ",
-            "guid": "9ae669ca-48e4-4a85-b222-3ece8bb12307",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/private-link-service",
-            "service": "Service Bus",
-            "severity": "Medium",
-            "text": "Consider using private endpoints to access Azure Service Bus and disable public network access when applicable.",
-            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
-            "waf": "Security"
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "guid": "a1bf1038-9f03-4a4d-8ce4-63dbbbc8682a",
+            "link": "https://learn.microsoft.com/azure/databricks/administration-guide/disaster-recovery",
+            "service": "Data Factory",
+            "severity": "High",
+            "text": "Plan for Disaster recovery using Active/Active or Active/Passive Configuration",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.ServiceBus/namespaces",
-            "checklist": "Service Bus Review Checklist",
-            "description": "With IP firewall, you can restrict the public endpoint further to only a set of IPv4 addresses or IPv4 address ranges in CIDR (Classless Inter-Domain Routing) notation. ",
-            "guid": "ca5f06f1-58e3-4ea3-a92c-2de7e2165c3a",
-            "link": "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-ip-filtering",
-            "service": "Service Bus",
+            "arm-service": "Microsoft.DataFactory/datafactories",
+            "checklist": "DataBricks Review Checklist",
+            "description": "Migration package to log all Databricks resources for backup and/or migrating to another Databricks workspace",
+            "guid": "5abc92a4-eda1-4dae-8cc8-5c47c6b781cc",
+            "link": "https://github.com/databrickslabs/migrate",
+            "service": "Data Factory",
             "severity": "Medium",
-            "text": "Consider only allowing access to Azure Service Bus namespace from specific IP addresses or ranges",
-            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
-            "waf": "Security"
+            "text": "Use Databricks Migration tools",
+            "waf": "Reliability"
         },
         {
             "arm-service": "Microsoft.Synapse/workspaces",
@@ -8911,500 +8958,389 @@
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DBforMySQL/servers",
-            "checklist": "MySQL Review Checklist",
-            "guid": "388c3e25-e800-4ad2-9df3-f3d6ae1050b7",
-            "link": "https://learn.microsoft.com/azure/mysql/flexible-server/overview",
-            "service": "Azure MySQL",
-            "severity": "Medium",
-            "text": "Leverage Flexible Server",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.DBforMySQL/servers",
-            "checklist": "MySQL Review Checklist",
-            "guid": "de3aad1e-8c38-4ec9-9666-7313c005674b",
-            "link": "https://learn.microsoft.com/azure/mysql/flexible-server/overview#high-availability-within-and-across-availability-zones",
-            "service": "Azure MySQL",
+            "arm-service": "Microsoft.Devices/provisioningServices",
+            "checklist": "Device Provisioning Service Review",
+            "guid": "cb26b2ba-a9db-45d1-8260-d9c6ec1447d9",
+            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/single-tenant-overview-compare",
+            "service": "IoT Hub DPS",
             "severity": "High",
-            "text": "Leverage Availability Zones where regionally applicable",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.DBforMySQL/servers",
-            "checklist": "MySQL Review Checklist",
-            "guid": "1e944a45-9c37-43e7-bd61-623b365a917e",
-            "link": "https://learn.microsoft.com/azure/mysql/flexible-server/overview#setup-hybrid-or-multi-cloud-data-synchronization-with-data-in-replication",
-            "service": "Azure MySQL",
-            "severity": "Medium",
-            "text": "Leverage Data-in replication for cross-region DR scenarios",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type == 'microsoft.network/applicationgateways' | project id, compliant = properties.sku.name in ('Standard_v2', 'WAF_v2') | project id,compliant",
-            "guid": "553585a6-abe0-11ed-afa1-0242ac120002",
-            "link": "https://learn.microsoft.com/azure/application-gateway/overview-v2",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Ensure you are using Application Gateway v2 SKU",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "Microsoft.Network/loadBalancers",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type == 'microsoft.network/loadbalancers' | project id, compliant=(tolower(sku.name) == 'standard')",
-            "guid": "4e35fbf5-0ae2-48b2-97ce-753353edbd1a",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
-            "service": "Load Balancer",
-            "severity": "Medium",
-            "text": "Ensure you are using the Standard SKU for your Azure Load Balancers",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "Microsoft.Network/loadBalancers",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "9432621a-8397-4654-a882-5bc856b7ef83",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-standard-availability-zones",
-            "service": "Load Balancer",
-            "severity": "Medium",
-            "text": "Ensure your Load Balancers frontend IP addresses are zone-redundant (unless you require zonal frontends).",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type=='microsoft.network/applicationgateways' | extend subnetId = tostring(properties.gatewayIPConfigurations[0].properties.subnet.id) | project id, subnetId | join (resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | mv-expand subnets.properties.addressPrefixes | project id, subnetId = tostring(subnets.id), prefix1 = subnets.properties.addressPrefix, prefix2 = subnets.properties.addressPrefixes | mv-expand prefix2 | extend prefix = iff(isnotnull(prefix1), prefix1, prefix2) | extend subnetPrefixLength = split(prefix, '/')[1])on subnetId | extend compliant = (subnetPrefixLength <= 24 or subnetPrefixLength == 64) | distinct id,compliant",
-            "guid": "dfc50f87-3800-424c-937b-ed5f186e7c15",
-            "link": "https://learn.microsoft.com/azure/application-gateway/configuration-infrastructure#size-of-the-subnet",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Your Application Gateways v2 should be deployed in subnets with IP prefixes equal or larger than /24",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "description": "Administration of reverse proxies in general and WAF in particular is closer to the application than to networking, so they belong in the same subscription as the app. Centralizing the Application Gateway and WAF in the connectivity subscription might be OK if it is managed by one single team.",
-            "guid": "48b662d6-d15f-4512-a654-98f6dfe237de",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Deploy Azure Application Gateway v2 or partner NVAs used for proxying inbound HTTP(S) connections within the landing-zone virtual network and with the apps that they're securing.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "f109e1f3-c79b-4f14-82de-6b5c22314d08",
-            "link": "https://learn.microsoft.com/azure/application-gateway/tutorial-protect-application-gateway-ddos",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Use a DDoS Network or IP protection plans for all Public IP addresses in application landing zones.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.network/applicationGateways' | extend compliant = (isnotnull(properties.autoscaleConfiguration) and properties.autoscaleConfiguration.minCapacity >= 2) | distinct id,compliant",
-            "guid": "135bf4ac-f9db-461f-b76b-2ee9e30b12c0",
-            "link": "https://learn.microsoft.com/azure/application-gateway/application-gateway-autoscaling-zone-redundant",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Configure autoscaling with a minimum amount of instances of two.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.network/applicationGateways' | extend compliant = (isnotnull(zones) and array_length(zones) > 1) | distinct id,compliant",
-            "guid": "060c6964-52b5-48db-af8b-83e4b2d85349",
-            "link": "https://learn.microsoft.com/azure/reliability/migrate-app-gateway-v2",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Deploy Application Gateway across Availability Zones",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "text": "Select the right Logic App hosting plan based on your business & SLO requirements",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoors",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "3f29812b-2363-4cef-b179-b599de0d5973",
-            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-overview",
-            "service": "Front Door",
-            "severity": "Medium",
-            "text": "When using Front Door and Application Gateway to help protect HTTP/S apps, use WAF policies in Front Door. Lock down Application Gateway to receive traffic only from Front Door.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Devices/provisioningServices",
+            "checklist": "Device Provisioning Service Review",
+            "guid": "f6dd7977-1123-4f39-b488-f91415a8430a",
+            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/set-up-zone-redundancy-availability-zones?tabs=standard#next-steps",
+            "service": "IoT Hub DPS",
+            "severity": "High",
+            "text": "Protect logic apps from region failures with zone redundancy and availability zones",
+            "waf": "Reliability"
         },
         {
-            "ammp": true,
-            "arm-service": "microsoft.network/trafficManagerProfiles",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "cd4cd21b-0881-437f-9e6c-4cfd3e504547",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "Traffic Manager",
+            "arm-service": "Microsoft.Devices/provisioningServices",
+            "checklist": "Device Provisioning Service Review",
+            "guid": "8aed4fbf-0830-4883-899d-222a154af478",
+            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/business-continuity-disaster-recovery-guidance?toc=%2Fazure%2Freliability%2Ftoc.json&bc=%2Fazure%2Freliability%2Fbreadcrumb%2Ftoc.json",
+            "service": "IoT Hub DPS",
             "severity": "High",
-            "text": "Use Traffic Manager to deliver global apps that span protocols other than HTTP/S.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "text": "Consider a Cross-Region DR strategy for critical workloads",
             "waf": "Reliability"
         },
         {
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "3b4b3e88-a459-4ed5-a22f-644dfbc58204",
-            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
-            "service": "Entra",
-            "severity": "Low",
-            "text": "If users only need access to internal applications, has Microsoft Entra ID Application Proxy been considered as an alternative to Azure Virtual Desktop (AVD)?",
-            "training": "https://learn.microsoft.com/learn/modules/configure-azure-ad-application-proxy/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Devices/provisioningServices",
+            "checklist": "Device Provisioning Service Review",
+            "guid": "da0f033e-d180-4f36-9aa4-c468dba14203",
+            "link": "https://learn.microsoft.com/en-us/azure/app-service/environment/intro",
+            "service": "IoT Hub DPS",
+            "severity": "High",
+            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
+            "waf": "Reliability"
         },
         {
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "01ca7cf1-5754-442d-babb-8ba6772e5c30",
-            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
-            "service": "Entra",
+            "arm-service": "Microsoft.Devices/provisioningServices",
+            "checklist": "Device Provisioning Service Review",
+            "guid": "62711604-c9d1-4b0a-bdb7-5fda54a4f6c1",
+            "link": "https://learn.microsoft.com/en-us/training/modules/deploy-azure-functions/",
+            "service": "IoT Hub DPS",
             "severity": "Medium",
-            "text": "To reduce the number of firewall ports open for incoming connections in your network, consider using Microsoft Entra ID Application Proxy to give remote users secure and authenticated access to internal applications.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-applications-external-access-azure-ad/",
-            "waf": "Security"
+            "text": "Leverage Azure DevOps or GitHub to streamline CI/CD and safeguard your Logic App code",
+            "waf": "Operations"
         },
         {
-            "ammp": true,
-            "arm-service": "Microsoft.Network/loadBalancers",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type=='microsoft.network/loadbalancers' | extend countOutRules=array_length(properties.outboundRules) | extend compliant = (countOutRules == 0) | distinct id,compliant",
-            "guid": "97a2fd46-64b0-1dfa-b72d-9c8869496d75",
-            "link": "https://learn.microsoft.com/azure/nat-gateway/nat-overview#outbound-connectivity",
-            "service": "Load Balancer",
+            "arm-service": "Microsoft.Devices/deviceUpdateServices",
+            "checklist": "Device Update Review",
+            "guid": "0e03f5ee-4648-423c-bb86-7239480f9171",
+            "link": "https://learn.microsoft.com/en-us/azure/iot-dps/iot-dps-ha-dr#high-availability",
+            "service": "Device Update for IoT Hub",
             "severity": "High",
-            "text": "Use Azure NAT Gateway instead of Load Balancer outbound rules for better SNAT scalability",
+            "text": "Leverage Availability Zones if regionally applicable (this is automatically enabled).",
             "waf": "Reliability"
         },
         {
-            "ammp": true,
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type == 'microsoft.network/applicationgatewaywebapplicationfirewallpolicies' | mv-expand properties.managedRules.managedRuleSets | project id, rulesettype = properties_managedRules_managedRuleSets.ruleSetType | extend compliant1 = (rulesettype == 'Microsoft_BotManagerRuleSet') | project id, compliant1 | summarize compliant = max(compliant1) by id",
-            "guid": "2f8e81eb-8e68-4026-8b1f-70f9b05f7cf9",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/bot-protection",
-            "service": "App Gateway",
+            "arm-service": "Microsoft.Devices/deviceUpdateServices",
+            "checklist": "Device Update Review",
+            "guid": "c0c273bd-00ad-419a-9f2f-fc72fb181e55",
+            "link": "https://learn.microsoft.com/en-us/azure/iot-dps/iot-dps-ha-dr#high-availability",
+            "service": "Device Update for IoT Hub",
             "severity": "High",
-            "text": "Enable the Azure Application Gateway WAF bot protection rule set. The bot rules detect good and bad bots.",
-            "waf": "Security"
+            "text": "Be aware of Microsoft-initiated failovers. These are exercised by Microsoft in rare situations to fail over all the DPS instances from an affected region to the corresponding geo-paired region.",
+            "waf": "Reliability"
         },
         {
-            "ammp": true,
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.network/applicationgatewaywebapplicationfirewallpolicies' | extend compliant = (properties['policySettings']['requestBodyCheck'] == 'true' and properties['policySettings']['state'] =~ 'Enabled') | distinct id, name, compliant",
-            "guid": "8ea8e0d4-84e8-4b33-aeab-493f6391b4d6",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/application-gateway-waf-request-size-limits#request-body-inspection",
-            "service": "App Gateway",
+            "arm-service": "Microsoft.Devices/deviceUpdateServices",
+            "checklist": "Device Update Review",
+            "guid": "3af8abe6-07eb-4287-b393-6c4abe3702eb",
+            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/business-continuity-disaster-recovery-guidance?toc=%2Fazure%2Freliability%2Ftoc.json&bc=%2Fazure%2Freliability%2Fbreadcrumb%2Ftoc.json",
+            "service": "Device Update for IoT Hub",
             "severity": "High",
-            "text": "Ensure if request body inspection feature is enabled in Azure Application Gateway WAF policy.",
-            "waf": "Security"
+            "text": "Consider a Cross-Region DR strategy for critical workloads",
+            "waf": "Reliability"
         },
         {
-            "ammp": true,
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "a4dd86d3-5ffa-408c-b660-cce073d085b8",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#tune-your-waf",
-            "service": "App Gateway",
+            "arm-service": "Microsoft.Devices/deviceUpdateServices",
+            "checklist": "Device Update Review",
+            "guid": "bd91245c-fe32-4e98-a085-794a40f4bfe1",
+            "link": "https://learn.microsoft.com/en-us/azure/app-service/environment/intro",
+            "service": "Device Update for IoT Hub",
             "severity": "High",
-            "text": "Tune the Azure Application Gateway WAF in detection mode for your workload. Reduce false positive detections.",
-            "waf": "Security"
+            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
+            "waf": "Reliability"
         },
         {
-            "ammp": true,
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type =~ 'microsoft.network/applicationgatewaywebapplicationfirewallpolicies' | extend compliant = (properties['policySettings']['mode'] =~ 'Prevention')| where properties['policySettings']['mode'] =~ 'Prevention' | distinct id, name, compliant",
-            "guid": "baf8e317-2397-4d49-b3d1-0dcc16d8778d",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/policy-overview?source=recommendations",
-            "service": "App Gateway",
-            "severity": "High",
-            "text": "Deploy your WAF policy for Application Gateway in 'Prevention' mode.",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "Azure Event Hub provides encryption of data at rest. If you use your own key, the data is still encrypted using the Microsoft-managed key, but in addition the Microsoft-managed key will be encrypted using the customer-managed key. ",
+            "guid": "7aaf12e7-b94e-4f6e-847d-2d92981b1cd6",
+            "link": "https://learn.microsoft.com/azure/event-hubs/configure-customer-managed-key",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend SkuName = tostring(sku.name) | extend EncryptionEnabled = iif(isnotempty(properties.encryption.keySource), 'Enabled', 'Disabled') | extend compliant = iif(EncryptionEnabled == 'Enabled', true, false) | project name, resourceGroup, location, SkuName, EncryptionEnabled, compliant | where SkuName == 'Premium'",
+            "service": "Event Hubs",
+            "severity": "Low",
+            "text": "Use customer-managed key option in data at rest encryption when required",
+            "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "43fae595-8a32-4299-a69e-0f32c454dcc9",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/rate-limiting-overview",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "Azure Event Hubs namespaces permit clients to send and receive data with TLS 1.0 and above. To enforce stricter security measures, you can configure your Event Hubs namespace to require that clients send and receive data with a newer version of TLS. If an Event Hubs namespace requires a minimum version of TLS, then any requests made with an older version will fail. ",
+            "guid": "d2f54b29-769e-43a6-a0e7-828ac936657e",
+            "link": "https://learn.microsoft.com/azure/event-hubs/transport-layer-security-configure-minimum-version",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend MinimumTlsVersion = tostring(properties.minimumTlsVersion) | extend compliant = iif(MinimumTlsVersion == '1.2' or MinimumTlsVersion == '1.3', true, false) | project name, resourceGroup, location, MinimumTlsVersion, compliant",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Add rate limiting to the Azure Application Gateway WAF. Rate limiting blocks clients accidentally or intentionally sending large amounts of traffic in a short period of time.",
+            "text": "Enforce a minimum required version of Transport Layer Security (TLS) for requests ",
+            "training": "https://learn.microsoft.com/learn/modules/secure-aad-users-with-mfa/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "041e0ad8-7b12-4694-a0b7-a0e25ee2470f",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/rate-limiting-overview#rate-limiting-details",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "When you create an Event Hubs namespace, a policy rule named RootManageSharedAccessKey is automatically created for the namespace. This policy has manage permissions for the entire namespace. It�s recommended that you treat this rule like an administrative root account and don�t use it in your application. Using AAD as an authentication provider with RBAC is recommended. ",
+            "guid": "13b0f566-4b1e-4944-a459-837ee79d6c6d",
+            "link": "https://learn.microsoft.com/azure/event-hubs/authorize-access-shared-access-signature#shared-access-authorization-policies",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Use a high threshold for Azure Application Gateway WAF rate limits. High rate limit thresholds avoid blocking legitimate traffic, while still providing protection against extremely high numbers of requests that might overwhelm your infrastructure. ",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "99937189-ff78-492a-b9ca-18d828d82b37",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#geo-filtering-best-practices",
-            "service": "App Gateway",
-            "severity": "Low",
-            "text": "If you are not expecting traffic from all geographical regions, use geo-filters to block traffic from non-expected countries.",
+            "text": "Avoid using root account when it is not necessary",
+            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-identities-governance/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "349a15c1-52f4-4319-9078-3895d95ecafd",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/geomatch-custom-rules",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "Managed identities for Azure resources can authorize access to Event Hubs resources using Azure AD credentials from applications running in Azure Virtual Machines (VMs), Function apps, Virtual Machine Scale Sets, and other services. By using managed identities for Azure resources together with Azure AD authentication, you can avoid storing credentials with your applications that run in the cloud. ",
+            "guid": "3a365a5c-7acb-4e48-abd5-4cd79f2e8776",
+            "link": "https://learn.microsoft.com/azure/event-hubs/authenticate-managed-identity?tabs=latest",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Specify the unknown (ZZ) location when geo-filtering traffic with the Azure Application Gateway WAF. Avoid accidentally blocking legitimate requests when IP addresses can't be geo-matched.",
+            "text": "When possible, your application should be using a managed identity to authenticate to Azure Event Hub. If not, consider having the storage credential (SAS, service principal credential) in Azure Key Vault or an equivalent service",
+            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "6c19dfd5-a61c-436c-9001-491b9b3d0228",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#use-the-latest-ruleset-versions",
-            "service": "App Gateway",
-            "severity": "Medium",
-            "text": "Use the latest Azure Application Gateway WAF rule set version. Rule set updates are regularly updated to take account of the current threat landscape.",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "When creating permissions, provide fine-grained control over a client's access to Azure Event Hub. Permissions in Azure Event Hub can and should be scoped to the individual resource level e.g. consumer group, event hub entity, event hub namespaces, etc.",
+            "guid": "8357c559-675c-45ee-a5b8-6ad8844ce3b2",
+            "link": "https://learn.microsoft.com/azure/event-hubs/authorize-access-azure-active-directory#azure-built-in-roles-for-azure-event-hubs",
+            "service": "Event Hubs",
+            "severity": "High",
+            "text": "Use least privilege data plane RBAC",
+            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "f84106a2-2e9e-42ac-add6-d3416ecfed53",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#add-diagnostic-settings-to-save-your-wafs-logs",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "Azure Event Hub resource logs include operational logs, virtual network and Kafka logs. Runtime audit logs capture aggregated diagnostic information for all data plane access operations (such as send or receive events) in Event Hubs.",
+            "guid": "b38b875b-a1cf-4104-a900-3a4d3ce474db",
+            "link": "https://learn.microsoft.com/azure/event-hubs/monitor-event-hubs-reference",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Add diagnostic settings to save your Azure Application Gateway WAF logs.",
-            "waf": "Operations"
+            "text": "Enable logging for security investigation. Use Azure Monitor to captured metrics and logs such as resource logs, runtime audit logs and Kafka logs",
+            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "92664c60-47e3-4591-8b1b-8d557656e686",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#send-logs-to-microsoft-sentinel",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "Azure Event Hub by default has a public IP address and is Internet-reachable. Private endpoints allow traffic between your virtual network and Azure Event Hub traverses over the Microsoft backbone network. In addition to that, you should disable public endpoints if those are not used. ",
+            "guid": "5abca2a4-eda1-4dae-8cc9-5d48c6b791dc",
+            "link": "https://learn.microsoft.com/azure/event-hubs/private-link-service",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Send Azure Application Gateway WAF logs to Microsoft Sentinel.",
-            "waf": "Operations"
+            "text": "Consider using private endpoints to access Azure Event Hub and disable public network access when applicable.",
+            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "ba0e9b26-6e0d-4ec8-8541-023c00afd5b7",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#define-your-waf-configuration-as-code",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "With IP firewall, you can restrict public endpoint further to only a set of IPv4 addresses or IPv4 address ranges in CIDR (Classless Inter-Domain Routing) notation. ",
+            "guid": "a0e6c465-89e5-458b-a37d-3974d1112dbd",
+            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-ip-filtering",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Define your Azure Application Gateway WAF configuration as code. By using code, you can more easily adopt new rule set version and gain additional protection.",
-            "waf": "Operations"
+            "text": "Consider only allowing access to Azure Event Hub namespace from specific IP addresses or ranges",
+            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "f17ec301-8470-4afd-aabc-c1fdfe47dcc0",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/policy-overview",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "guid": "31d41e36-11c8-417b-8afb-c410d4391898",
+            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/paas-foundations-playbooks-AEH_v1.docx",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Use WAF Policies instead of the legacy WAF configuration.",
-            "waf": "Operations"
+            "text": "Leverage FTA Resillency HandBook",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "d4eb8667-f8cb-4cdd-94e6-2f967ba98f88",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/scenario-secured-hub-app-gateway",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": " This will be turned on automatically for a new EH namespace created from the portal with Premium, Dedicated, or Standard SKUs in a zone-enabled region. Both the EH metadata and the event data itself are replicated across zones",
+            "guid": "f15bce21-9e4a-40eb-9787-9424d226786d",
+            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-premium-overview#high-availability-with-availability-zones",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend zoneRedundant = tobool(properties.zoneRedundant) | extend compliant = iff(zoneRedundant == true, true, false) | project name, resourceGroup, zoneRedundant, compliant",
+            "service": "Event Hubs",
+            "severity": "High",
+            "text": "Leverage Availability Zones if regionally applicable",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "guid": "20b56c56-ad58-4519-8f82-735c586bb281",
+            "link": "https://learn.microsoft.com/azure/event-hubs/compare-tiers",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend sku = tostring(sku.name) | extend compliant = iff(sku == 'Premium', true, false) | project name, resourceGroup, location, sku, compliant",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Filter inbound traffic in the backends so that they only accept connections from the Application Gateway subnet, for example with NSGs.",
-            "waf": "Security"
+            "text": "Use the Premium or Dedicated SKUs   for predicable performance",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "graph": "resources | where type == 'microsoft.network/applicationgateways'| extend compliant = (properties['backendHttpSettingsCollection'][0]['properties']['port'] =~ '443') |where properties['backendHttpSettingsCollection'][0]['properties']['port'] =~ '443'|distinct id,name,compliant",
-            "guid": "a66f0fd8-2ca4-422e-8df3-235148127ca2",
-            "link": "https://learn.microsoft.com/azure/application-gateway/ssl-overview",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "The built-in geo-disaster recovery feature, when enabled, ensures that the entire configuration of anamespace (Event Hubs, Consumer Groups and settings) is continuously replicated from a primary namespace to a secondary namespace, and it allows a once-only failover move from the primary to the secondary at any time. Active/Passive feature is designed to make it easier to recover from and abandon a failed Azure region without having to change application configurations",
+            "guid": "dc15a1c0-75ee-49f1-90ac-ccd579376bcd",
+            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-geo-dr?tabs=portal",
+            "service": "Event Hubs",
             "severity": "High",
-            "text": "You should encrypt traffic to the backend servers.",
-            "waf": "Security"
+            "text": "Plan for Geo Disaster Recovery using Active Passive configuration",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "3dba65cb-834d-44d8-a3ca-a6aa2f1587be",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/overview",
-            "service": "App Gateway",
-            "severity": "High",
-            "text": "You should use a Web Application Firewall.",
-            "waf": "Security"
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "description": "Should be used for DR configurations where an outage or loss of event data in the downed region cannot be tolerated. For these cases, follow the replication guidance and do not use the built-in geo-disaster recovery capability (active/passive). With Active/Active, Maintain multiple Event Hubs in different regions and namespaces, and events will be replicated between the hubs",
+            "guid": "6e31b67d-67ba-4591-89c0-9e805d597c7e",
+            "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-federation-overview",
+            "service": "Event Hubs",
+            "severity": "Medium",
+            "text": "For Business Critical Applications, use Active Active configuration",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "0158fcb6-0bc1-4687-832f-cc7c359c22d2",
-            "link": "https://learn.microsoft.com/azure/application-gateway/redirect-overview",
-            "service": "App Gateway",
+            "arm-service": "microsoft.eventhub/namespaces",
+            "checklist": "Azure Event Hub Review",
+            "guid": "9ced16ad-d186-4f0a-a241-a999a68af77c",
+            "link": "https://learn.microsoft.com/azure/architecture/serverless/event-hubs-functions/resilient-design",
+            "service": "Event Hubs",
             "severity": "Medium",
-            "text": "Redirect HTTP to HTTPS",
-            "waf": "Security"
+            "text": "Design Resilient Event Hubs",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "bb697864-1b4c-43af-8667-90cc69aaed5f",
-            "link": "https://learn.microsoft.com/azure/application-gateway/how-application-gateway-works#modifications-to-the-request",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "bb235c70-5e17-496f-bedf-a8a4c8cdec4c",
+            "link": "https://learn.microsoft.com/entra/identity-platform/msal-acquire-cache-tokens",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Use gateway-managed cookies to direct traffic from a user session to the same server for processing",
-            "waf": "Operations"
+            "text": "Use long-live revocable token, cache your token and acquire your silently using Microsoft Identity Library",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "ff353ad8-15fb-4ae8-9fc5-a85a36d36a35",
-            "link": "https://learn.microsoft.com/azure/application-gateway/configuration-http-settings",
-            "service": "App Gateway",
-            "severity": "High",
-            "text": "Enable connection draining during planned service updates to prevent connection loss to existing members of the backend pool",
-            "waf": "Security"
+            "checklist": "Identity Review Checklist",
+            "guid": "503547c1-447e-4c66-828a-71f0f1ce16dd",
+            "link": "https://learn.microsoft.com/azure/active-directory-b2c/deploy-custom-policies-devops",
+            "service": "AAD B2C",
+            "severity": "Medium",
+            "text": "Make sure that your sign-in user flows are backed up and resilient. Make sure that the code that you use to sign-in your users are backed up and recoverable. Resilient interfaces with external processes",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "c8741f03-45a4-4183-a6b8-139e0773b8b5",
-            "link": "https://learn.microsoft.com/azure/application-gateway/custom-error",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "3e3553a4-c873-4964-ab66-2d6c15f51296",
+            "link": "https://learn.microsoft.com/entra/architecture/resilient-end-user-experience#use-a-content-delivery-network",
+            "service": "AAD B2C",
+            "severity": "Medium",
+            "text": "Custom brand assets should be hosted on a CDN",
+            "waf": "Performance"
+        },
+        {
+            "checklist": "Identity Review Checklist",
+            "guid": "5398e6df-d237-4de1-93b1-6c21d79a9b64",
+            "link": "https://learn.microsoft.com/entra/identity/monitoring-health/reference-sla-performance",
+            "service": "AAD B2C",
             "severity": "Low",
-            "text": "Create custom error pages to display a personalized user experience",
-            "waf": "Operations"
+            "text": "Have multiple identiy providers (i.e., login with your microsoft, google, facebook accounts)",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "f850d46f-f5d7-4b17-b48c-a780741402e1",
-            "link": "https://learn.microsoft.com/azure/application-gateway/rewrite-http-headers-url",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "604489a8-f42d-478e-98c0-7a73b22a4a57",
+            "link": "https://azure.microsoft.com/blog/setting-up-active-directory-for-a-disaster-recovery-environment-2/",
+            "service": "Windows AD",
             "severity": "Medium",
-            "text": "Edit HTTP requests and response headers for easier routing and information exchange between the client and server",
-            "waf": "Security"
+            "text": "Follow VM rules for high availability on the VM level (premium disks, two or more in a region, in different availability zones)",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "eadc3164-4a0f-461c-85f1-1a372c04dfd1",
-            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-overview",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "e7a8dd4a-30e3-47c3-b297-11b2362ceee0",
+            "link": "https://azure.microsoft.com/blog/setting-up-active-directory-for-a-disaster-recovery-environment-2/",
+            "service": "Windows AD",
             "severity": "Medium",
-            "text": "Configure Front Door to optimize global web traffic routing and top-tier end-user performance, and reliability through quick global failover",
-            "waf": "Performance"
+            "text": "Don't replicate! Replication can create issues with directory synchronization",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "29dcc19f-a8fa-4c35-8281-290577538793",
-            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "79b598de-fc59-472c-b4cd-21b078036f5e",
+            "link": "https://azure.microsoft.com/blog/setting-up-active-directory-for-a-disaster-recovery-environment-2/",
+            "service": "Windows AD",
             "severity": "Medium",
-            "text": "Use transport layer load balancing",
-            "waf": "Performance"
+            "text": "Have active-active for multi-regions",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "276898c1-af5e-4819-9e8e-049c7801ab9d",
-            "link": "https://learn.microsoft.com/azure/application-gateway/multiple-site-overview",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "6b4bfd3d-5035-447c-8447-ec66128a71f0",
+            "link": "https://learn.microsoft.com/entra/identity/domain-services/tutorial-perform-disaster-recovery-drill",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Configure routing based on host or domain name for multiple web applications on a single gateway",
-            "waf": "Security"
+            "text": "Add Azure AD Domain service stamps to additional regions and locations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "5fe365b6-58e8-47ed-a8cf-5163850380a2",
-            "link": "https://learn.microsoft.com/azure/application-gateway/create-ssl-portal",
-            "service": "App Gateway",
+            "checklist": "Identity Review Checklist",
+            "guid": "f1ce16dd-3f1d-45e8-92e4-2e3611cc58b4",
+            "link": "https://learn.microsoft.com/entra/identity/domain-services/tutorial-perform-disaster-recovery-drill",
+            "service": "Entra",
             "severity": "Medium",
-            "text": "Centralize SSL certificate management to reduce encryption and decryption overhead from a backend server farm",
-            "waf": "Security"
+            "text": "Use Replica Sets for DR",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Application Delivery Networking",
-            "guid": "fa64b4dd-35c2-4047-ac5c-45dfbf8b0db9",
-            "link": "https://learn.microsoft.com/azure/application-gateway/application-gateway-websocket",
-            "service": "App Gateway",
-            "severity": "Low",
-            "text": "Use Application Gateway for native support for WebSocket and HTTP/2 protocols",
-            "waf": "Security"
+            "arm-service": "Microsoft.Devices/IotHubs",
+            "checklist": "IoT Hub Review",
+            "guid": "ac1d6380-f866-4bbd-a9b4-b1ee5d7908b8",
+            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#availability-zones",
+            "service": "IoT",
+            "severity": "High",
+            "text": "Leverage  Availability Zones if regionally applicable (this is automatically enabled)",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Devices/provisioningServices",
-            "checklist": "Device Provisioning Service Review",
-            "guid": "cb26b2ba-a9db-45d1-8260-d9c6ec1447d9",
-            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/single-tenant-overview-compare",
-            "service": "IoT Hub DPS",
-            "severity": "High",
-            "text": "Select the right Logic App hosting plan based on your business & SLO requirements",
+            "arm-service": "Microsoft.Devices/IotHubs",
+            "checklist": "IoT Hub Review",
+            "guid": "35f651e8-0124-4ef7-8c57-658e38609e6e",
+            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#microsoft-initiated-failover",
+            "service": "IoT",
+            "severity": "Medium",
+            "text": "Be aware of Microsoft-initiated failovers. These are exercised by Microsoft in rare situations to fail over all the IoT hubs from an affected region to the corresponding geo-paired region.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Devices/provisioningServices",
-            "checklist": "Device Provisioning Service Review",
-            "guid": "f6dd7977-1123-4f39-b488-f91415a8430a",
-            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/set-up-zone-redundancy-availability-zones?tabs=standard#next-steps",
-            "service": "IoT Hub DPS",
+            "arm-service": "Microsoft.Devices/IotHubs",
+            "checklist": "IoT Hub Review",
+            "guid": "4ed3e490-dc06-4a1e-b467-5d0239d85540",
+            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#cross-region-dr",
+            "service": "IoT",
             "severity": "High",
-            "text": "Protect logic apps from region failures with zone redundancy and availability zones",
+            "text": "Consider a Cross-Region DR strategy for critical workloads",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Devices/provisioningServices",
-            "checklist": "Device Provisioning Service Review",
-            "guid": "8aed4fbf-0830-4883-899d-222a154af478",
-            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/business-continuity-disaster-recovery-guidance?toc=%2Fazure%2Freliability%2Ftoc.json&bc=%2Fazure%2Freliability%2Fbreadcrumb%2Ftoc.json",
-            "service": "IoT Hub DPS",
+            "arm-service": "Microsoft.Devices/IotHubs",
+            "checklist": "IoT Hub Review",
+            "guid": "a11ecab0-db47-46f7-9aa7-17764e7e45a1",
+            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#microsoft-initiated-failover",
+            "service": "IoT",
             "severity": "High",
-            "text": "Consider a Cross-Region DR strategy for critical workloads",
+            "text": "Learn how to trigger a manual failover.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Devices/provisioningServices",
-            "checklist": "Device Provisioning Service Review",
-            "guid": "da0f033e-d180-4f36-9aa4-c468dba14203",
-            "link": "https://learn.microsoft.com/en-us/azure/app-service/environment/intro",
-            "service": "IoT Hub DPS",
+            "arm-service": "Microsoft.Devices/IotHubs",
+            "checklist": "IoT Hub Review",
+            "guid": "f9db8dfb-1194-460b-aedd-34dd6a69db22",
+            "link": "https://learn.microsoft.com/azure/iot-hub/iot-hub-ha-dr#failback",
+            "service": "IoT",
             "severity": "High",
-            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
+            "text": "Learn how to fail back after a failover.",
             "waf": "Reliability"
         },
-        {
-            "arm-service": "Microsoft.Devices/provisioningServices",
-            "checklist": "Device Provisioning Service Review",
-            "guid": "62711604-c9d1-4b0a-bdb7-5fda54a4f6c1",
-            "link": "https://learn.microsoft.com/en-us/training/modules/deploy-azure-functions/",
-            "service": "IoT Hub DPS",
-            "severity": "Medium",
-            "text": "Leverage Azure DevOps or GitHub to streamline CI/CD and safeguard your Logic App code",
-            "waf": "Operations"
-        },
         {
             "arm-service": "Microsoft.KeyVault/vaults",
             "checklist": "Azure Key Vault",
@@ -9517,2739 +9453,2803 @@
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "70c15989-c726-42c7-b0d3-24b7375b9201",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/considerations-recommendations",
-            "service": "Entra",
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Logic Apps checklist",
+            "guid": "3b7a56de-5020-4642-b3cb-c976e80b6d6d",
+            "link": "https://learn.microsoft.com/azure/logic-apps/single-tenant-overview-compare",
+            "service": "Logic Apps",
+            "severity": "High",
+            "text": "Select the right Logic App hosting plan based on your business & SLO requirements",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Logic Apps checklist",
+            "guid": "3d7008bd-6bc1-4b03-8aa8-ec2a3b55786a",
+            "link": "https://learn.microsoft.com/azure/logic-apps/set-up-zone-redundancy-availability-zones?tabs=standard#next-steps",
+            "service": "Logic Apps",
+            "severity": "High",
+            "text": "Protect logic apps from region failures with zone redundancy and availability zones",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Logic Apps checklist",
+            "guid": "1cda768f-a206-445d-8234-56f6a6e7286e",
+            "link": "https://learn.microsoft.com/azure/logic-apps/business-continuity-disaster-recovery-guidance?toc=%2Fazure%2Freliability%2Ftoc.json&bc=%2Fazure%2Freliability%2Fbreadcrumb%2Ftoc.json",
+            "service": "Logic Apps",
+            "severity": "High",
+            "text": "Consider a Cross-Region DR strategy for critical workloads",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Logic Apps checklist",
+            "guid": "82118ec5-ed6f-4c68-9471-eb0da98a1b34",
+            "link": "https://learn.microsoft.com/azure/app-service/environment/intro",
+            "service": "Logic Apps",
+            "severity": "High",
+            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Web/sites",
+            "checklist": "Logic Apps checklist",
+            "guid": "74275fa5-9e08-4c7e-b096-13b538fe1501",
+            "link": "https://learn.microsoft.com/training/modules/deploy-azure-functions/",
+            "service": "Logic Apps",
             "severity": "Medium",
-            "text": "Use one Entra tenant for managing your Azure resources, unless you have a clear regulatory or business requirement for multi-tenants.",
-            "training": "https://learn.microsoft.com/training/modules/deploy-resources-scopes-bicep/2-understand-deployment-scopes",
+            "text": "Leverage Azure DevOps or GitHub to streamline CI/CD and safeguard your Logic App code",
             "waf": "Operations"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "6309957b-821a-43d1-b9d9-7fcf1802b747",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/automation",
+            "arm-service": "Microsoft.DBforMySQL/servers",
+            "checklist": "MySQL Review Checklist",
+            "guid": "388c3e25-e800-4ad2-9df3-f3d6ae1050b7",
+            "link": "https://learn.microsoft.com/azure/mysql/flexible-server/overview",
+            "service": "Azure MySQL",
+            "severity": "Medium",
+            "text": "Leverage Flexible Server",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.DBforMySQL/servers",
+            "checklist": "MySQL Review Checklist",
+            "guid": "de3aad1e-8c38-4ec9-9666-7313c005674b",
+            "link": "https://learn.microsoft.com/azure/mysql/flexible-server/overview#high-availability-within-and-across-availability-zones",
+            "service": "Azure MySQL",
+            "severity": "High",
+            "text": "Leverage Availability Zones where regionally applicable",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.DBforMySQL/servers",
+            "checklist": "MySQL Review Checklist",
+            "guid": "1e944a45-9c37-43e7-bd61-623b365a917e",
+            "link": "https://learn.microsoft.com/azure/mysql/flexible-server/overview#setup-hybrid-or-multi-cloud-data-synchronization-with-data-in-replication",
+            "service": "Azure MySQL",
+            "severity": "Medium",
+            "text": "Leverage Data-in replication for cross-region DR scenarios",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type == 'microsoft.network/applicationgateways' | project id, compliant = properties.sku.name in ('Standard_v2', 'WAF_v2') | project id,compliant",
+            "guid": "553585a6-abe0-11ed-afa1-0242ac120002",
+            "link": "https://learn.microsoft.com/azure/application-gateway/overview-v2",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Ensure you are using Application Gateway v2 SKU",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.Network/loadBalancers",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type == 'microsoft.network/loadbalancers' | project id, compliant=(tolower(sku.name) == 'standard')",
+            "guid": "4e35fbf5-0ae2-48b2-97ce-753353edbd1a",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
+            "service": "Load Balancer",
+            "severity": "Medium",
+            "text": "Ensure you are using the Standard SKU for your Azure Load Balancers",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "Microsoft.Network/loadBalancers",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "9432621a-8397-4654-a882-5bc856b7ef83",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-standard-availability-zones",
+            "service": "Load Balancer",
+            "severity": "Medium",
+            "text": "Ensure your Load Balancers frontend IP addresses are zone-redundant (unless you require zonal frontends).",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type=='microsoft.network/applicationgateways' | extend subnetId = tostring(properties.gatewayIPConfigurations[0].properties.subnet.id) | project id, subnetId | join (resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | mv-expand subnets.properties.addressPrefixes | project id, subnetId = tostring(subnets.id), prefix1 = subnets.properties.addressPrefix, prefix2 = subnets.properties.addressPrefixes | mv-expand prefix2 | extend prefix = iff(isnotnull(prefix1), prefix1, prefix2) | extend subnetPrefixLength = split(prefix, '/')[1])on subnetId | extend compliant = (subnetPrefixLength <= 24 or subnetPrefixLength == 64) | distinct id,compliant",
+            "guid": "dfc50f87-3800-424c-937b-ed5f186e7c15",
+            "link": "https://learn.microsoft.com/azure/application-gateway/configuration-infrastructure#size-of-the-subnet",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Your Application Gateways v2 should be deployed in subnets with IP prefixes equal or larger than /24",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "description": "Administration of reverse proxies in general and WAF in particular is closer to the application than to networking, so they belong in the same subscription as the app. Centralizing the Application Gateway and WAF in the connectivity subscription might be OK if it is managed by one single team.",
+            "guid": "48b662d6-d15f-4512-a654-98f6dfe237de",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Deploy Azure Application Gateway v2 or partner NVAs used for proxying inbound HTTP(S) connections within the landing-zone virtual network and with the apps that they're securing.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "f109e1f3-c79b-4f14-82de-6b5c22314d08",
+            "link": "https://learn.microsoft.com/azure/application-gateway/tutorial-protect-application-gateway-ddos",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Use a DDoS Network or IP protection plans for all Public IP addresses in application landing zones.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.network/applicationGateways' | extend compliant = (isnotnull(properties.autoscaleConfiguration) and properties.autoscaleConfiguration.minCapacity >= 2) | distinct id,compliant",
+            "guid": "135bf4ac-f9db-461f-b76b-2ee9e30b12c0",
+            "link": "https://learn.microsoft.com/azure/application-gateway/application-gateway-autoscaling-zone-redundant",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Configure autoscaling with a minimum amount of instances of two.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.network/applicationGateways' | extend compliant = (isnotnull(zones) and array_length(zones) > 1) | distinct id,compliant",
+            "guid": "060c6964-52b5-48db-af8b-83e4b2d85349",
+            "link": "https://learn.microsoft.com/azure/reliability/migrate-app-gateway-v2",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Deploy Application Gateway across Availability Zones",
+            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.network/frontdoors",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "3f29812b-2363-4cef-b179-b599de0d5973",
+            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-overview",
+            "service": "Front Door",
+            "severity": "Medium",
+            "text": "When using Front Door and Application Gateway to help protect HTTP/S apps, use WAF policies in Front Door. Lock down Application Gateway to receive traffic only from Front Door.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Security"
+        },
+        {
+            "ammp": true,
+            "arm-service": "microsoft.network/trafficManagerProfiles",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "cd4cd21b-0881-437f-9e6c-4cfd3e504547",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "Traffic Manager",
+            "severity": "High",
+            "text": "Use Traffic Manager to deliver global apps that span protocols other than HTTP/S.",
+            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
+            "waf": "Reliability"
+        },
+        {
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "3b4b3e88-a459-4ed5-a22f-644dfbc58204",
+            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
             "service": "Entra",
             "severity": "Low",
-            "text": "Use Multi-Tenant Automation approach to managing your Microsoft Entra ID Tenants.",
-            "training": "https://learn.microsoft.com/entra/architecture/multi-tenant-user-management-introduction/",
-            "waf": "Operations"
+            "text": "If users only need access to internal applications, has Microsoft Entra ID Application Proxy been considered as an alternative to Azure Virtual Desktop (AVD)?",
+            "training": "https://learn.microsoft.com/learn/modules/configure-azure-ad-application-proxy/",
+            "waf": "Security"
+        },
+        {
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "01ca7cf1-5754-442d-babb-8ba6772e5c30",
+            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy#how-application-proxy-works",
+            "service": "Entra",
+            "severity": "Medium",
+            "text": "To reduce the number of firewall ports open for incoming connections in your network, consider using Microsoft Entra ID Application Proxy to give remote users secure and authenticated access to internal applications.",
+            "training": "https://learn.microsoft.com/learn/paths/implement-applications-external-access-azure-ad/",
+            "waf": "Security"
+        },
+        {
+            "ammp": true,
+            "arm-service": "Microsoft.Network/loadBalancers",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type=='microsoft.network/loadbalancers' | extend countOutRules=array_length(properties.outboundRules) | extend compliant = (countOutRules == 0) | distinct id,compliant",
+            "guid": "97a2fd46-64b0-1dfa-b72d-9c8869496d75",
+            "link": "https://learn.microsoft.com/azure/nat-gateway/nat-overview#outbound-connectivity",
+            "service": "Load Balancer",
+            "severity": "High",
+            "text": "Use Azure NAT Gateway instead of Load Balancer outbound rules for better SNAT scalability",
+            "waf": "Reliability"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "78e11934-499a-45ed-8ef7-aae5578f0ecf",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/multi-tenant/lighthouse",
-            "service": "Entra",
+            "ammp": true,
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type == 'microsoft.network/applicationgatewaywebapplicationfirewallpolicies' | mv-expand properties.managedRules.managedRuleSets | project id, rulesettype = properties_managedRules_managedRuleSets.ruleSetType | extend compliant1 = (rulesettype == 'Microsoft_BotManagerRuleSet') | project id, compliant1 | summarize compliant = max(compliant1) by id",
+            "guid": "2f8e81eb-8e68-4026-8b1f-70f9b05f7cf9",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/bot-protection",
+            "service": "App Gateway",
             "severity": "High",
-            "text": "Use Azure Lighthouse for Multi-Tenant Management with the same IDs.",
-            "training": "https://learn.microsoft.com/azure/lighthouse/concepts/cross-tenant-management-experience",
-            "waf": "Operations"
+            "text": "Enable the Azure Application Gateway WAF bot protection rule set. The bot rules detect good and bad bots.",
+            "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5d82e6df-6f61-42f2-82e2-3132d293be3d",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/azure-billing-microsoft-customer-agreement#design-recommendations",
-            "service": "Entra",
+            "ammp": true,
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.network/applicationgatewaywebapplicationfirewallpolicies' | extend compliant = (properties['policySettings']['requestBodyCheck'] == 'true' and properties['policySettings']['state'] =~ 'Enabled') | distinct id, name, compliant",
+            "guid": "8ea8e0d4-84e8-4b33-aeab-493f6391b4d6",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/application-gateway-waf-request-size-limits#request-body-inspection",
+            "service": "App Gateway",
             "severity": "High",
-            "text": "If you give a partner access to administer your tenant, use Azure Lighthouse.",
-            "training": "https://learn.microsoft.com/azure/lighthouse/how-to/onboard-customer",
-            "waf": "Cost"
+            "text": "Ensure if request body inspection feature is enabled in Azure Application Gateway WAF policy.",
+            "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "348ef254-c27d-442e-abba-c7571559ab91",
-            "link": "https://learn.microsoft.com/azure/role-based-access-control/overview",
-            "service": "Entra",
+            "ammp": true,
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "a4dd86d3-5ffa-408c-b660-cce073d085b8",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#tune-your-waf",
+            "service": "App Gateway",
             "severity": "High",
-            "text": "Enforce a RBAC model that aligns to your cloud operating model. Scope and Assign across Management Groups and Subscriptions.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "text": "Tune the Azure Application Gateway WAF in detection mode for your workload. Reduce false positive detections.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "12e7f983-f630-4472-8dd6-9c5b5c2622f5",
-            "link": "https://learn.microsoft.com/azure/active-directory/roles/security-planning#identify-microsoft-accounts-in-administrative-roles-that-need-to-be-switched-to-work-or-school-accounts",
-            "service": "Entra",
-            "severity": "Medium",
-            "text": "Only use the authentication type Work or school account for all account types. Avoid using the Microsoft account",
-            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
+            "ammp": true,
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type =~ 'microsoft.network/applicationgatewaywebapplicationfirewallpolicies' | extend compliant = (properties['policySettings']['mode'] =~ 'Prevention')| where properties['policySettings']['mode'] =~ 'Prevention' | distinct id, name, compliant",
+            "guid": "baf8e317-2397-4d49-b3d1-0dcc16d8778d",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/policy-overview?source=recommendations",
+            "service": "App Gateway",
+            "severity": "High",
+            "text": "Deploy your WAF policy for Application Gateway in 'Prevention' mode.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "4b69bad3-3aad-45e8-a68e-1d76667313b4",
-            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/active-directory-groups-create-azure-portal",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "43fae595-8a32-4299-a69e-0f32c454dcc9",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/rate-limiting-overview",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "Only use groups to assign permissions. Add on-premises groups to the Entra ID only group if a group management system is already in place.",
-            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
+            "text": "Add rate limiting to the Azure Application Gateway WAF. Rate limiting blocks clients accidentally or intentionally sending large amounts of traffic in a short period of time.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "53e8908a-e28c-484c-93b6-b7808b9fe5c4",
-            "link": "https://learn.microsoft.com/azure/active-directory/conditional-access/overview",
-            "service": "Entra",
-            "severity": "High",
-            "text": "Enforce Microsoft Entra ID Conditional Access policies for any user with rights to Azure environments.",
-            "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "041e0ad8-7b12-4694-a0b7-a0e25ee2470f",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/rate-limiting-overview#rate-limiting-details",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Use a high threshold for Azure Application Gateway WAF rate limits. High rate limit thresholds avoid blocking legitimate traffic, while still providing protection against extremely high numbers of requests that might overwhelm your infrastructure. ",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "1049d403-a923-4c34-94d0-0018ac6a9e01",
-            "link": "https://learn.microsoft.com/azure/active-directory/authentication/concept-mfa-howitworks",
-            "service": "Entra",
-            "severity": "High",
-            "text": "Enforce multi-factor authentication for any user with rights to the Azure environments.",
-            "training": "https://learn.microsoft.com/entra/identity/authentication/concept-mandatory-multifactor-authentication",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "99937189-ff78-492a-b9ca-18d828d82b37",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#geo-filtering-best-practices",
+            "service": "App Gateway",
+            "severity": "Low",
+            "text": "If you are not expecting traffic from all geographical regions, use geo-filters to block traffic from non-expected countries.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "14658d35-58fd-4772-99b8-21112df27ee4",
-            "link": "https://learn.microsoft.com/azure/active-directory/privileged-identity-management/pim-configure",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "349a15c1-52f4-4319-9078-3895d95ecafd",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/geomatch-custom-rules",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "Enforce Microsoft Entra ID Privileged Identity Management (PIM) to establish zero standing access and least privilege.",
-            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
+            "text": "Specify the unknown (ZZ) location when geo-filtering traffic with the Azure Application Gateway WAF. Avoid accidentally blocking legitimate requests when IP addresses can't be geo-matched.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "8b9fe5c4-1049-4d40-9a92-3c3474d00018",
-            "link": "https://learn.microsoft.com/entra/identity/domain-services/overview",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "6c19dfd5-a61c-436c-9001-491b9b3d0228",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#use-the-latest-ruleset-versions",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "If planning to switch from Active Directory Domain Services to Entra domain services, evaluate the compatibility of all workloads.",
-            "training": "https://learn.microsoft.com/learn/modules/implement-hybrid-identity-windows-server/",
+            "text": "Use the latest Azure Application Gateway WAF rule set version. Rule set updates are regularly updated to take account of the current threat landscape.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.aad/domainservices' | extend replicaSets = properties.replicaSets | where array_length(replicaSets) < 2 | project name=name, id=id, tags=tags, param1=strcat('replicaSetLocation:', replicaSets[0].location)",
-            "guid": "0dd4e625-9c4b-4a56-b54a-4357bac12761",
-            "link": "https://learn.microsoft.com/entra/identity/domain-services/overview",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "f84106a2-2e9e-42ac-add6-d3416ecfed53",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#add-diagnostic-settings-to-save-your-wafs-logs",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "When using Microsoft Entra Domain Services use replica sets. Replica sets will improve the resiliency of your managed domain and allow you to deploy to additional regions. ",
-            "training": "https://learn.microsoft.com/training/modules/understand-azure-active-directory/6-examine-azure-domain-services",
-            "waf": "Reliability"
+            "text": "Add diagnostic settings to save your Azure Application Gateway WAF logs.",
+            "waf": "Operations"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "1cf0b8da-70bd-44d0-94af-8d99cfc89ae1",
-            "link": "https://learn.microsoft.com/azure/active-directory/reports-monitoring/concept-activity-logs-azure-monitor",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "92664c60-47e3-4591-8b1b-8d557656e686",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#send-logs-to-microsoft-sentinel",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "Integrate Microsoft Entra ID logs with the platform-central Azure Monitor. Azure Monitor allows for a single source of truth around log and monitoring data in Azure, giving organizations a cloud native options to meet requirements around log collection and retention.",
-            "training": "https://learn.microsoft.com/entra/identity/monitoring-health/howto-integrate-activity-logs-with-azure-monitor-logs",
+            "text": "Send Azure Application Gateway WAF logs to Microsoft Sentinel.",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "ba0e9b26-6e0d-4ec8-8541-023c00afd5b7",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/best-practices#define-your-waf-configuration-as-code",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Define your Azure Application Gateway WAF configuration as code. By using code, you can more easily adopt new rule set version and gain additional protection.",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "f17ec301-8470-4afd-aabc-c1fdfe47dcc0",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/policy-overview",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Use WAF Policies instead of the legacy WAF configuration.",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "d4eb8667-f8cb-4cdd-94e6-2f967ba98f88",
+            "link": "https://learn.microsoft.com/azure/virtual-wan/scenario-secured-hub-app-gateway",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Filter inbound traffic in the backends so that they only accept connections from the Application Gateway subnet, for example with NSGs.",
             "waf": "Security"
         },
         {
-            "ammp": true,
-            "checklist": "Azure Landing Zone Review",
-            "guid": "984a859c-773e-47d2-9162-3a765a917e1f",
-            "link": "https://learn.microsoft.com/azure/active-directory/roles/security-emergency-access",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "graph": "resources | where type == 'microsoft.network/applicationgateways'| extend compliant = (properties['backendHttpSettingsCollection'][0]['properties']['port'] =~ '443') |where properties['backendHttpSettingsCollection'][0]['properties']['port'] =~ '443'|distinct id,name,compliant",
+            "guid": "a66f0fd8-2ca4-422e-8df3-235148127ca2",
+            "link": "https://learn.microsoft.com/azure/application-gateway/ssl-overview",
+            "service": "App Gateway",
             "severity": "High",
-            "text": "Implement an emergency access or break-glass accounts to prevent tenant-wide account lockout. MFA will be turned on by default for all users in Oct 2024. We recommend updating these accounts to use passkey (FIDO2) or configure certificate-based authentication for MFA. ",
-            "training": "https://learn.microsoft.com/entra/identity/role-based-access-control/security-emergency-access#exclude-at-least-one-account-from-conditional-access-policies",
+            "text": "You should encrypt traffic to the backend servers.",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "35037e68-9349-4c15-b371-228514f4cdff",
-            "link": "https://learn.microsoft.com/azure/active-directory/roles/best-practices",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "3dba65cb-834d-44d8-a3ca-a6aa2f1587be",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/overview",
+            "service": "App Gateway",
+            "severity": "High",
+            "text": "You should use a Web Application Firewall.",
+            "waf": "Security"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "0158fcb6-0bc1-4687-832f-cc7c359c22d2",
+            "link": "https://learn.microsoft.com/azure/application-gateway/redirect-overview",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "Do not use on-premises synced accounts for Microsoft Entra ID role assignments, unless you have a scenario that specifically requires it.",
-            "training": "https://learn.microsoft.com/learn/modules/design-identity-security-strategy/",
+            "text": "Redirect HTTP to HTTPS",
             "waf": "Security"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "d5d1e4e6-1465-48d3-958f-d77249b82111",
-            "link": "https://learn.microsoft.com/azure/active-directory/app-proxy/application-proxy",
-            "service": "Entra",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "bb697864-1b4c-43af-8667-90cc69aaed5f",
+            "link": "https://learn.microsoft.com/azure/application-gateway/how-application-gateway-works#modifications-to-the-request",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "When using Microsoft Entra ID Application Proxy to give remote users access to applications, manage it as a Platform resource as you can only have one instance per tenant.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-applications-external-access-azure-ad/",
+            "text": "Use gateway-managed cookies to direct traffic from a user session to the same server for processing",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "ff353ad8-15fb-4ae8-9fc5-a85a36d36a35",
+            "link": "https://learn.microsoft.com/azure/application-gateway/configuration-http-settings",
+            "service": "App Gateway",
+            "severity": "High",
+            "text": "Enable connection draining during planned service updates to prevent connection loss to existing members of the backend pool",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "e8bbac75-7155-49ab-a153-e8908ae28c84",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/enterprise-scale/network-topology-and-connectivity",
-            "service": "VNet",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "c8741f03-45a4-4183-a6b8-139e0773b8b5",
+            "link": "https://learn.microsoft.com/azure/application-gateway/custom-error",
+            "service": "App Gateway",
+            "severity": "Low",
+            "text": "Create custom error pages to display a personalized user experience",
+            "waf": "Operations"
+        },
+        {
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "f850d46f-f5d7-4b17-b48c-a780741402e1",
+            "link": "https://learn.microsoft.com/azure/application-gateway/rewrite-http-headers-url",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "Use a hub-and-spoke network topology for network scenarios that require maximum flexibility.",
-            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
+            "text": "Edit HTTP requests and response headers for easier routing and information exchange between the client and server",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "7bc1c396-2461-4698-b57f-30ca69525252",
-            "link": "https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/considerations/regions",
-            "service": "VNet",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "eadc3164-4a0f-461c-85f1-1a372c04dfd1",
+            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-overview",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "Deploy your Azure landing zone connectivity resources in multiple regions, so that you can quickly support multi-region application landing zones and disaster recovery scenarios.",
-            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
-            "waf": "Reliability"
+            "text": "Configure Front Door to optimize global web traffic routing and top-tier end-user performance, and reliability through quick global failover",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "7dd61623-a364-4a90-9eca-e48ebd54cd7d",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/traditional-azure-networking-topology",
-            "service": "VNet",
-            "severity": "High",
-            "text": "Deploy shared networking services, including ExpressRoute gateways, VPN gateways, and Azure Firewall or partner NVAs in the central-hub virtual network. If necessary, also deploy DNS services.",
-            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
-            "waf": "Cost"
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "29dcc19f-a8fa-4c35-8281-290577538793",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-overview",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Use transport layer load balancing",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "e2e8abac-3571-4559-ab91-53e89f89dc7b",
-            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/dmz/nva-ha",
-            "service": "NVA",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "276898c1-af5e-4819-9e8e-049c7801ab9d",
+            "link": "https://learn.microsoft.com/azure/application-gateway/multiple-site-overview",
+            "service": "App Gateway",
             "severity": "Medium",
-            "text": "When deploying partner networking technologies or NVAs, follow the partner vendor's guidance.",
-            "waf": "Reliability"
+            "text": "Configure routing based on host or domain name for multiple web applications on a single gateway",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "ce463dbb-bc8a-4c2a-aebc-92a43da1dae2",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-coexist-resource-manager#to-enable-transit-routing-between-expressroute-and-azure-vpn",
-            "service": "ExpressRoute",
-            "severity": "Low",
-            "text": "If you need transit between ExpressRoute and VPN gateways in hub and spoke scenarios, use Azure Route Server.",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-route-server/",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "5fe365b6-58e8-47ed-a8cf-5163850380a2",
+            "link": "https://learn.microsoft.com/azure/application-gateway/create-ssl-portal",
+            "service": "App Gateway",
+            "severity": "Medium",
+            "text": "Centralize SSL certificate management to reduce encryption and decryption overhead from a backend server farm",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Network/virtualHubs",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'RouteServerSubnet' | extend compliant = (subnetPrefixLength <= 27) | distinct id, compliant",
-            "guid": "91b9d7d5-91e1-4dcb-8f1f-fa7e465646cc",
-            "link": "https://learn.microsoft.com/azure/route-server/quickstart-configure-route-server-portal#create-a-route-server-1",
-            "service": "ARS",
+            "arm-service": "microsoft.network/applicationGateways",
+            "checklist": "Azure Application Delivery Networking",
+            "guid": "fa64b4dd-35c2-4047-ac5c-45dfbf8b0db9",
+            "link": "https://learn.microsoft.com/azure/application-gateway/application-gateway-websocket",
+            "service": "App Gateway",
             "severity": "Low",
-            "text": "If using Route Server, use a /27 prefix for the Route Server subnet.",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-route-server/",
+            "text": "Use Application Gateway for native support for WebSocket and HTTP/2 protocols",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "cc881471-607c-41cc-a0e6-14658dd558f9",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-networks-faq#can-i-create-a-peering-connection-to-a-vnet-in-a-different-region",
-            "service": "VNet",
+            "arm-service": "Microsoft.DBforPostgreSQL/servers",
+            "checklist": "PostgreSQL Review Checklist",
+            "guid": "65285269-441c-44bf-9d3e-0844276d4bdc",
+            "link": "https://learn.microsoft.com/azure/postgresql/flexible-server/overview",
+            "service": "PostgreSQL",
             "severity": "Medium",
-            "text": "For network architectures with multiple hub-and-spoke topologies across Azure regions, use global virtual network peerings between the hub VNets to connect the regions to each other.",
-            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-virtual-networks/",
-            "waf": "Performance"
+            "text": "Leverage Flexible Server",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "4722d929-c1b1-4cd6-81f5-4b29bade39ad",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/insights/network-insights-overview",
-            "service": "VNet",
-            "severity": "Medium",
-            "text": "Use Azure Monitor for Networks to monitor the end-to-end state of the networks on Azure.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-network-monitoring/",
-            "waf": "Operations"
+            "arm-service": "Microsoft.DBforPostgreSQL/servers",
+            "checklist": "PostgreSQL Review Checklist",
+            "guid": "016ccf31-ae5a-41eb-9888-9535e227896d",
+            "link": "https://learn.microsoft.com/azure/postgresql/flexible-server/overview#architecture-and-high-availability",
+            "service": "PostgreSQL",
+            "severity": "High",
+            "text": "Leverage Availability Zones where regionally applicable",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | summarize peeringcount = count() by id | extend compliant = (peeringcount < 450) | distinct id,compliant",
-            "guid": "0e7c28ec-9366-4572-83b0-f4664b1d944a",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/virtual-network/toc.json#azure-resource-manager-virtual-networking-limits",
-            "service": "VNet",
+            "arm-service": "Microsoft.DBforPostgreSQL/servers",
+            "checklist": "PostgreSQL Review Checklist",
+            "guid": "31b67c67-be59-4519-8083-845d587cb391",
+            "link": "https://learn.microsoft.com/azure/postgresql/single-server/concepts-business-continuity#cross-region-read-replicas",
+            "service": "PostgreSQL",
             "severity": "Medium",
-            "text": "If you have more than 400 spoke networks in a region, deploy an additional hub to bypass VNet peering limits (500) and the maximum number of prefixes that can be advertised via ExpressRoute (1000).",
-            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "text": "Leverage cross-region read replicas for BCDR",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/routetables' | mvexpand properties.routes | summarize routeCount = count() by id | extend compliant = (routeCount < 360) | distinct id,compliant",
-            "guid": "3d457936-e9b7-41eb-bdff-314b26450b12",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/virtual-network/toc.json#azure-resource-manager-virtual-networking-limits",
-            "service": "VNet",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "1fc2fc14-eea6-4e69-b8d9-a3edc218e687",
+            "link": "https://polite-sea-0995b240f.2.azurestaticapps.net/technical-delivery-playbook/azure-services/analytics/purview/",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Limit the number of routes per route table to 400.",
-            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "text": "Leverage FTA Resillency Handbook",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | project id, peeringName=properties_virtualNetworkPeerings.name, compliant = (properties_virtualNetworkPeerings.properties.allowVirtualNetworkAccess == True)",
-            "guid": "c76cb5a2-abe2-11ed-afa1-0242ac120002",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-peering",
-            "service": "VNet",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "ab067acb-49e5-4b96-8332-4ecf8cc13318",
+            "link": "https://learn.microsoft.com/purview/disaster-recovery",
+            "service": "Purview",
             "severity": "High",
-            "text": "Use the setting 'Allow traffic to remote virtual network' when configuring VNet peerings.",
-            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/",
+            "text": "Plan for Data Center level outage",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/loadBalancers",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/loadbalancers' | where tolower(sku.name) != 'basic' | mv-expand feIPconfigs = properties.frontendIPConfigurations | extend feConfigName = (feIPconfigs.name), PrivateSubnetId = toupper(feIPconfigs.properties.subnet.id), PrivateIPZones = feIPconfigs.zones, PIPid = toupper(feIPconfigs.properties.publicIPAddress.id), JoinID = toupper(id) | where isnotempty(PrivateSubnetId) | where isnull(PrivateIPZones) or array_length(PrivateIPZones) < 2 | project name, feConfigName, id | union (resources | where type == 'microsoft.network/loadbalancers' | where tolower(sku.name) != 'basic' | mv-expand feIPconfigs = properties.frontendIPConfigurations | extend feConfigName = (feIPconfigs.name), PIPid = toupper(feIPconfigs.properties.publicIPAddress.id), JoinID = toupper(id) | where isnotempty(PIPid) | join kind=innerunique ( resources | where type == 'microsoft.network/publicipaddresses' | where isnull(zones) or array_length(zones) < 2 | extend LBid = toupper(substring(properties.ipConfiguration.id, 0, indexof(properties.ipConfiguration.id, '/frontendIPConfigurations'))), InnerID = toupper(id) ) on $left.PIPid == $right.InnerID) | project name, id, tags, param1='Zones: No Zone or Zonal', param2=strcat('Frontend IP Configuration:', ' ', feConfigName)",
-            "guid": "9dcd6250-9c4a-4382-aa9b-5b84c64fc1fe",
-            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-load-balancer?tabs=graph#zone-redundant",
-            "service": "Load Balancer",
-            "severity": "High",
-            "text": "Use Standard Load Balancer SKU with a zone-redundant deployment, Selecting Standard SKU Load Balancer enhances reliability through availability zones and zone resiliency, ensuring deployments withstand zone and region failures. Unlike Basic, it supports global load balancing and offers an SLA.",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "description": "1. Create the new account 2. Migrate configuration items 3. Run scans 4. Migrate custom typedefs and custom assets 5. Migrate relationships 6. Migrate glossary terms 7. Assign classifications to assets 8. Assign contacts to assets",
+            "guid": "da611702-69f4-4fb4-aa3d-3ef7f3176c4b",
+            "link": "https://learn.microsoft.com/purview/disaster-recovery",
+            "service": "Purview",
+            "severity": "Medium",
+            "text": "Practice Failover for BCDR",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/loadBalancers",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'Microsoft.Network/loadBalancers' | extend bep = properties.backendAddressPools | extend BackEndPools = array_length(bep) | where BackEndPools == 0 | project name, id, Param1='backendPools', Param2=toint(0), tags | union (resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name == 'Standard' | extend bep = properties.backendAddressPools | extend BackEndPools = toint(array_length(bep)) | mv-expand bip = properties.backendAddressPools | extend BackendAddresses = array_length(bip.properties.loadBalancerBackendAddresses) | where toint(BackendAddresses) <= 1 | project name, id, tags, Param1='backendAddresses', Param2=toint(BackendAddresses)) | union ( resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name == 'Basic' | mv-expand properties.backendAddressPools | extend backendPoolId = properties_backendAddressPools.id | project id, name, tags, tostring(backendPoolId), Param1='BackEndPools' | join kind = leftouter ( resources | where type =~ 'Microsoft.Network/networkInterfaces' | mv-expand properties.ipConfigurations | mv-expand properties_ipConfigurations.properties.loadBalancerBackendAddressPools | extend backendPoolId = tostring(properties_ipConfigurations_properties_loadBalancerBackendAddressPools.id) | summarize poolMembers = count() by backendPoolId | project tostring(backendPoolId), poolMembers ) on backendPoolId | where toint(poolMembers) <= 1 | extend BackendAddresses = poolMembers | project id, name, tags, Param1='backendAddresses', Param2=toint(BackendAddresses))",
-            "guid": "48682fb1-1e86-4458-a686-518ebd47393d",
-            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-load-balancer?tabs=graph#zone-redundant",
-            "service": "Load Balancer",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "97b15b8a-219a-44ab-bb57-879024d22678",
+            "link": "https://learn.microsoft.com/purview/disaster-recovery",
+            "service": "Purview",
             "severity": "High",
-            "text": "Ensure load balancer backend pool(s) contains at least two instances, Deploying Azure Load Balancers with at least two instances in the backend prevents a single point of failure and supports scalability.",
+            "text": "Plan a backup strategy and take regular backups",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "de0d5973-cd4c-4d21-a088-137f5e6c4cfd",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-macsec",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "When you're using ExpressRoute Direct, configure MACsec in order to encrypt traffic at the layer-two level between the organization's routers and MSEE. The diagram shows this encryption in flow.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "6d20b56c-56a9-4581-89bf-8d8e5c586b7d",
+            "link": "https://learn.microsoft.com/purview/manage-kafka-dotnet",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Use Microsoft Purview's Event Hubs to subscribe and create entities to another account",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "ed301d6e-872e-452e-9611-cc58b5a4b151",
-            "link": "https://learn.microsoft.com/azure/vpn-gateway/site-to-site-vpn-private-peering",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "8cdc15ac-c075-4ee9-a130-a8889579e76b",
+            "link": "https://learn.microsoft.com/purview/deployment-best-practices",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "For scenarios where MACsec isn't an option (for example, not using ExpressRoute Direct), use a VPN gateway to establish IPsec tunnels over ExpressRoute private peering.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "558fd772-49b8-4211-82df-27ee412e7f98",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
-            "service": "ExpressRoute",
-            "severity": "High",
-            "text": "Ensure no overlapping IP address spaces across Azure regions and on-premises locations are used.",
-            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
-            "waf": "Security"
+            "text": "Follow Purview accounts architectures and deployment best practices",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | extend addressSpace = todynamic(properties.addressSpace) | extend addressPrefix = todynamic(properties.addressSpace.addressPrefixes) | mvexpand addressSpace | mvexpand addressPrefix | project name, id, location, resourceGroup, subscriptionId, cidr = addressPrefix | extend compliant = (cidr matches regex @'^(10\\\\.|172\\\\.(1[6-9]|2[0-9]|3[01])\\\\.|192\\\\.168\\\\.)')  | project id, compliant, cidr",
-            "guid": "3f630472-2dd6-49c5-a5c2-622f54b69bad",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
-            "service": "VNet",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "896e710a-7da7-4be9-a56d-14d3c49d997c",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-collections",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Use IP addresses from the address allocation ranges for private internets (RFC 1918).",
-            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | extend addressSpace = todynamic(properties.addressSpace) | extend addressPrefix = todynamic(properties.addressSpace.addressPrefixes) | mvexpand addressSpace | mvexpand addressPrefix | extend addressMask = split(addressPrefix,'/')[1] | extend compliant = addressMask > 16 | project name, id, subscriptionId, resourceGroup, addressPrefix, compliant",
-            "guid": "33aad5e8-c68e-41d7-9667-313b4f5664b5",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
-            "service": "VNet",
-            "severity": "High",
-            "text": "Ensure that IP address space isn't wasted, don't create unnecessarily large virtual networks (for example /16).",
-            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
-            "waf": "Performance"
+            "text": "Follow Collection Architectures and best practices",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "f348ef25-4c27-4d42-b8bb-ac7571559ab9",
-            "link": "https://learn.microsoft.com/azure/site-recovery/concepts-on-premises-to-azure-networking#retain-ip-addresses",
-            "service": "VNet",
-            "severity": "High",
-            "text": "Do not use overlapping IP address ranges for production and disaster recovery sites.",
-            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "b3d1325a-a225-4c6f-9e06-85edddea8a4b",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-asset-lifecycle",
+            "service": "Purview",
+            "severity": "Medium",
+            "text": "Follow Assest lifecycle best practices",
             "waf": "Reliability"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "graph": "Resources | where type =~ 'Microsoft.Network/publicIPAddresses' and sku.tier =~ 'Regional' | where isempty(zones) or array_length(zones) <= 1 | extend az = case(isempty(zones), 'Non-zonal', array_length(zones) <= 1, strcat('Zonal (', strcat_array(zones, ','), ')'), zones) | project name, id, tags, param1 = strcat('sku: ', sku.name), param2 = strcat('availabilityZone: ', az)",
-            "guid": "0c47f486-656d-4699-8c30-edef5b8a93c4",
-            "link": "https://learn.microsoft.com/azure/virtual-network/ip-services/public-ip-addresses#availability-zone",
-            "service": "Public IP Addresses",
-            "severity": "High",
-            "text": "Use Standard SKU and Zone-Redundant IPs when applicable, Public IP addresses in Azure can be of standard SKU, available as non-zonal, zonal, or zone-redundant. Zone-redundant IPs are accessible across all zones, resisting any single zone failure, thereby providing higher resilience. ",
-            "training": "https://learn.microsoft.com/en-gb/training/modules/configure-virtual-networks/6-create-public-ip-addressing",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "7cdeb3c6-1fc2-4fc1-9eea-6e69d8d9a3ed",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-automation",
+            "service": "Purview",
+            "severity": "Medium",
+            "text": "Follow automation best practices",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/dnsZones",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "153e8908-ae28-4c84-a33b-6b7808b9fe5c",
-            "link": "https://learn.microsoft.com/azure/dns/private-dns-getstarted-portal",
-            "service": "DNS",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "c218e687-ab06-47ac-a49e-5b9603324ecf",
+            "link": "https://learn.microsoft.com/purview/disaster-recovery",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "For environments where name resolution in Azure is all that's required, use Azure Private DNS for resolution with a delegated zone for name resolution (such as 'azure.contoso.com').",
-            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
-            "waf": "Operations"
+            "text": "Follow Backup and Migration Best practices",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/dnsZones",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "41049d40-3a92-43c3-974d-00018ac6a9e0",
-            "link": "https://learn.microsoft.com/azure/dns/dns-private-resolver-overview",
-            "service": "DNS",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "8cc13318-da61-4170-869f-4fb4aa3d3ef7",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-glossary",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "For environments where name resolution across Azure and on-premises is required and there is no existing enterprise DNS service like Active Directory, use Azure DNS Private Resolver to route DNS requests to Azure or to on-premises DNS servers.",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-dns-private-resolver/",
-            "waf": "Security"
+            "text": "Follow Purview Glossary Best Practices",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/dnsZones",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "1e6a83de-5de3-42c1-a924-81607d5d1e4e",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances",
-            "service": "DNS",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "f3176c4b-97b1-45b8-a219-a4abeb578790",
+            "link": "https://learn.microsoft.com/purview/concept-workflow",
+            "service": "Purview",
             "severity": "Low",
-            "text": "Special workloads that require and deploy their own DNS (such as Red Hat OpenShift) should use their preferred DNS solution.",
-            "training": "https://learn.microsoft.com/training/courses/az-700t00",
-            "waf": "Operations"
+            "text": "Leverage Workflows ",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/dnsZones",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "614658d3-558f-4d77-849b-821112df27ee",
-            "link": "https://learn.microsoft.com/azure/dns/private-dns-autoregistration",
-            "service": "DNS",
-            "severity": "High",
-            "text": "Enable auto-registration for Azure DNS to automatically manage the lifecycle of the DNS records for the virtual machines deployed within a virtual network.",
-            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "24d22678-6d20-4b56-a56a-958119bf8d8e",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-security",
+            "service": "Purview",
+            "severity": "Medium",
+            "text": "Follow Purview Security Best Practices",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/dnsZones",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "18c80eb0-582a-4198-bf5c-d8800b2d263b",
-            "link": "https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/azure-best-practices/private-link-and-dns-integration-at-scale#private-link-and-dns-integration-in-hub-and-spoke-network-architectures",
-            "service": "DNS",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "5c586b7d-8cdc-415a-ac07-5ee9b130a888",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-lineage-azure-data-factory",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Implement a plan for managing DNS resolution between multiple Azure regions and when services fail over to another region",
-            "training": "https://learn.microsoft.com/learn/paths/az-104-manage-virtual-networks/",
+            "text": "Follow Purview Data Lineage Best Practices",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/bastionHosts",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "ee1ac551-c4d5-46cf-b035-d0a3c50d87ad",
-            "link": "https://learn.microsoft.com/azure/bastion/bastion-overview",
-            "service": "Bastion",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "9579e76b-896e-4710-a7da-7be9956d14d3",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-scanning",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Use Azure Bastion to securely connect to your network.",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-bastion/",
-            "waf": "Security"
+            "text": "Follow Best Practices for Scanning Registered Sources",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/bastionHosts",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'AzureBastionSubnet' | extend compliant = (subnetPrefixLength <= 26) | distinct id, compliant",
-            "guid": "6eab9eb6-762b-485e-8ea8-15aa5dba0bd0",
-            "link": "https://learn.microsoft.com/azure/bastion/bastion-faq#subnet",
-            "service": "Bastion",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "c49d997c-b3d1-4325-aa22-5c6f4e0685ed",
+            "link": "https://learn.microsoft.com/purview/concept-best-practices-classification",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Use Azure Bastion in a subnet /26 or larger.",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-bastion/",
-            "waf": "Security"
+            "text": "Follow Classification Best Practices in Governance Portal",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "1d7aa9b6-4704-4489-a804-2d88e79d17b7",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/afds-overview",
-            "service": "WAF",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "ddea8a4b-7cde-4b3c-91fc-2fc14eea6e69",
+            "link": "https://learn.microsoft.com/purview/sensitivity-labels-frequently-asked-questions",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Use Azure Front Door and WAF policies to provide global protection across Azure regions for inbound HTTP/S connections to a landing zone.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Security"
+            "text": "Perform Sensitivity Labelling in the Purview Data Map",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "3b22a5a6-7e7a-48ed-9b30-e38c3f29812b",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "WAF",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "d8d9a3ed-c218-4e68-9ab0-67acb49e5b96",
+            "link": "https://learn.microsoft.com/purview/concept-data-share",
+            "service": "Purview",
             "severity": "Low",
-            "text": "When using Azure Front Door and Azure Application Gateway to help protect HTTP/S apps, use WAF policies in Azure Front Door. Lock down Azure Application Gateway to receive traffic only from Azure Front Door.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-application-delivery/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "2363cefe-179b-4599-be0d-5973cd4cd21b",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
-            "service": "WAF",
-            "severity": "High",
-            "text": "When WAFs and other reverse proxies are required for inbound HTTP/S connections, deploy them within a landing-zone virtual network and together with the apps that they're protecting and exposing to the internet.",
-            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
-            "waf": "Security"
+            "text": "Leverage Azure Storage in-place data sharing with Microsoft Purview",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "088137f5-e6c4-4cfd-9e50-4547c2447ec6",
-            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-reference-architectures",
-            "service": "VNet",
-            "severity": "High",
-            "text": "Use Azure DDoS Network or IP Protection plans to help protect Public IP Addresses endpoints within the virtual networks including application landing zones.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "03324ecf-8cc1-4331-ada6-1170269f4fb4",
+            "link": "https://learn.microsoft.com/purview/concept-insights",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Leverage Data Estate Insights",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b034c01e-110b-463a-b36e-e3346e57f225",
-            "link": "https://learn.microsoft.com/azure/virtual-network/ip-services/default-outbound-access",
-            "service": "VNet",
-            "severity": "High",
-            "text": "Plan for how to manage your network outbound traffic configuration and strategy before the upcoming breaking change. On September 30, 2025, default outbound access for new deployments will be retired and only explicit access configurations will be allowed.",
-            "training": "https://learn.microsoft.com/training/modules/configure-virtual-networks/",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "aa3d3ef7-f317-46c4-a97b-15b8a219a4ab",
+            "link": "https://learn.microsoft.com/purview/catalog-adoption-insights",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Use Data stewardship and Catalog adoption",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b1c82a3f-2320-4dfa-8972-7ae4823c8930",
-            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-reference-architectures",
-            "service": "VNet",
-            "severity": "High",
-            "text": "Add diagnostic settings to save DDoS related logs for all the protected public IP addresses (DDoS IP or Network Protection).",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "eb578790-24d2-4267-a6d2-0b56c56a9581",
+            "link": "https://learn.microsoft.com/purview/concept-insights",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Use Inventory and Ownership",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "3c5a808d-c695-4c14-a63c-c7ab7a510e41",
-            "link": "https://github.com/Azure/Enterprise-Scale/wiki/ALZ-Policies#corp",
-            "service": "Policy",
-            "severity": "High",
-            "text": "Ensure there is a policy assignment to deny Public IP addresses directly tied to Virtual Machines.  Use exclusions if public IPs are needed on specific VMs.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "19bf8d8e-5c58-46b7-b8cd-c15acc075ee9",
+            "link": "https://learn.microsoft.com/purview/glossary-insights",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Leverage Insights for Glossary, Classifications, Sensitivity Labels",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "359c373e-7dd6-4162-9a36-4a907ecae48e",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/connectivity-to-azure",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "b130a888-9579-4e76-a896-e710a7da7be9",
+            "link": "https://learn.microsoft.com/purview/compliance-manager",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "Use ExpressRoute as the primary connection to Azure.  Use VPNs as a source of backup connectivity.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Performance"
+            "text": "Generate assessment scores",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "description": "You can use AS-path prepending and connection weights to influence traffic from Azure to on-premises, and the full range of BGP attributes in your own routers to influence traffic from on-premises to Azure.",
-            "guid": "f29812b2-363c-4efe-879b-599de0d5973c",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-routing",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "956d14d3-c49d-4997-ab3d-1325aa225c6f",
+            "link": "https://learn.microsoft.com/purview/compliance-manager-scoring",
+            "service": "Purview",
             "severity": "Medium",
-            "text": "When you use multiple ExpressRoute circuits or multiple on-prem locations, use BGP attributes to optimize routing.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "text": "Profiling- get summaries of data content",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources| where type == 'microsoft.network/virtualnetworkgateways'| where properties.gatewayType =~ 'vpn' or properties.gatewayType == 'ExpressRoute'| extend SKUName = properties.sku.name, SKUTier = properties.sku.tier, Type = properties.gatewayType| extend compliant = SKUTier !in ('Basic', 'Standard')| project name, id, subscriptionId, resourceGroup, compliant",
-            "guid": "d4cd21b0-8813-47f5-b6c4-cfd3e504547c",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-about-virtual-network-gateways?source=recommendations#gwsku",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "Select the right SKU for the ExpressRoute/VPN gateways based on bandwidth and performance requirements.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Performance"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "4e0685ed-ddea-48a4-a7cd-eb3c61fc2fc1",
+            "link": "https://learn.microsoft.com/purview/concept-policies-data-owner#microsoft-purview-policy-concepts",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Follow Microsoft Purview Data Owner access policies",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/expressroutecircuits' | extend compliant = (tolower(sku.family) == 'metereddata' or tolower(sku.tier) == 'local') | distinct id,compliant",
-            "guid": "7025b442-f6e9-4af6-b11f-c9574916016f",
-            "link": "https://learn.microsoft.com/azure/expressroute/plan-manage-cost",
-            "service": "ExpressRoute",
-            "severity": "High",
-            "text": "Ensure that you're using unlimited-data ExpressRoute circuits only if you reach the bandwidth that justifies their cost.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
-            "waf": "Cost"
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "4eea6e69-d8d9-4a3e-bc21-8e687ab067ac",
+            "link": "https://learn.microsoft.com/purview/concept-self-service-data-access-policy",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Follow Self-service access policies",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/connections' | where properties.connectionType == 'ExpressRoute' | project id, gwid=tostring(properties.virtualNetworkGateway1.id), circuitid=tostring(properties.peer.id) | join (resources | where type=='microsoft.network/expressroutecircuits' | project circuitid=tostring(id), circuitsku=sku.tier) on circuitid | project id=gwid, compliant = (circuitsku == 'Local') | summarize compliant=max(compliant) by id",
-            "guid": "f4e7926a-ec35-476e-a412-5dd17136bd62",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-faqs#expressroute-local",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Purview/accounts",
+            "checklist": "Microsoft Purview Review Checklist",
+            "guid": "b49e5b96-0332-44ec-b8cc-13318da61170",
+            "link": "https://learn.microsoft.com/purview/concept-policies-devops",
+            "service": "Purview",
+            "severity": "Low",
+            "text": "Follow DevOps policies",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "microsoft.cache/redis",
+            "checklist": "Redis Resiliency checklist",
+            "guid": "65285269-440b-44be-9d3e-0844276d4bdc",
+            "link": "https://learn.microsoft.com/azure/azure-cache-for-redis/cache-how-to-zone-redundancy",
+            "service": "Redis",
             "severity": "High",
-            "text": "Leverage the Local SKU of ExpressRoute to reduce the cost of your circuits, if your circuit peering location supports your Azure regions for the Local SKU.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
-            "waf": "Cost"
+            "text": "Enable zone redundancy for Azure Cache for Redis. Azure Cache for Redis supports zone redundant configurations in the Premium and Enterprise tiers. A zone redundant cache can place its nodes across different Azure Availability Zones in the same region. It eliminates data center or AZ outage as a single point of failure and increases the overall availability of your cache.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources| where type == 'microsoft.network/virtualnetworkgateways'| where properties.gatewayType =~ 'vpn' or properties.gatewayType == 'ExpressRoute'| extend SKUName = properties.sku.name, SKUTier = properties.sku.tier, Type = properties.gatewayType| extend compliant = SKUTier contains 'AZ'| project name, id, subscriptionId, resourceGroup, Type, compliant",
-            "guid": "2447ec66-138a-4720-8f1c-e16ed301d6e8",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-about-virtual-network-gateways",
-            "service": "ExpressRoute",
+            "arm-service": "microsoft.cache/redis",
+            "checklist": "Redis Resiliency checklist",
+            "guid": "bc178bdc-5a06-4ca7-8443-51e19dd34429",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-cache-for-redis/cache-high-availability#persistence",
+            "service": "Redis",
             "severity": "Medium",
-            "text": "Deploy a zone-redundant ExpressRoute gateway in the supported Azure regions.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "text": "Configure data persistence for an Azure Cache for Redis instance. Because your cache data is stored in memory, a rare and unplanned failure of multiple nodes can cause all the data to be dropped. To avoid losing data completely, Redis persistence allows you to take periodic snapshots of in-memory data, and store it to your storage account.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "72e52e36-11cc-458b-9a4b-1511e43a58a9",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/connectivity-to-azure",
-            "service": "ExpressRoute",
+            "arm-service": "microsoft.cache/redis",
+            "checklist": "Redis Resiliency checklist",
+            "guid": "eb722823-7a15-41c5-ab4e-4f1814387e5c",
+            "link": "https://learn.microsoft.com/en-us/azure/azure-cache-for-redis/cache-high-availability#storage-account-for-persistence",
+            "service": "Redis",
             "severity": "Medium",
-            "text": "For scenarios that require bandwidth higher than 10 Gbps or dedicated 10/100-Gbps ports, use ExpressRoute Direct.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Performance"
+            "text": "Use Geo-redundant storage account to persist Azure Cache for Redis data, or zonally redundant where geo-redundancy is not available",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "c2299c4d-7b57-4d0c-9555-62f2b3e4563a",
-            "link": "https://learn.microsoft.com/azure/expressroute/about-fastpath",
-            "service": "ExpressRoute",
+            "arm-service": "microsoft.cache/redis",
+            "checklist": "Redis Resiliency checklist",
+            "guid": "a8c26c9b-32ab-45bd-bc69-98a135e33789",
+            "link": "https://learn.microsoft.com/azure/azure-cache-for-redis/cache-how-to-geo-replication",
+            "service": "Redis",
             "severity": "Medium",
-            "text": "When low latency is required, or throughput from on-premises to Azure must be greater than 10 Gbps, enable FastPath to bypass the ExpressRoute gateway from the data path.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Performance"
+            "text": "Configure passive geo-replication for Premium Azure Cache for Redis instances. Geo-replication is a mechanism for linking two or more Azure Cache for Redis instances, typically spanning two Azure regions. Geo-replication is designed mainly for cross-region disaster recovery. Two Premium tier cache instances are connected through geo-replication in a way that provides reads and writes to your primary cache, and that data is replicated to the secondary cache.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualNetworkGateways",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworkgateways' | where properties.gatewayType == 'Vpn' | extend compliant = (tolower(properties.sku.name) contains 'az') | distinct id, compliant",
-            "guid": "4d873974-8b66-42d6-b15f-512a65498f6d",
-            "link": "https://learn.microsoft.com/azure/vpn-gateway/create-zone-redundant-vnet-gateway",
-            "service": "VPN",
-            "severity": "Medium",
-            "text": "Use zone-redundant VPN gateways to connect branches or remote locations to Azure (where available).",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-vpn-gateway/",
+            "arm-service": "Microsoft.Compute/virtualMachineScaleSets",
+            "checklist": "Resiliency Review",
+            "description": "Automatic instance repairs ensure that unhealthy instances are promptly identified and replaced, maintaining a set of healthy instances within your scale set.",
+            "guid": "7e13c105-675c-41e9-95b4-59837ff7ae7c",
+            "link": "https://learn.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-automatic-instance-repairs",
+            "service": "VMSS",
+            "severity": "Low",
+            "text": "Enable automatic instance repairs for enhanced VM Scale Sets resiliency",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualNetworkGateways",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "45866df8-cf85-4ca9-bbe2-65ec1478919e",
-            "link": "https://learn.microsoft.com/azure/vpn-gateway/vpn-gateway-highlyavailable",
-            "service": "VPN",
-            "severity": "Medium",
-            "text": "Use redundant VPN appliances on-premises (active/active or active/passive).",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-vpn-gateway/",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Ensure that Azure Backup is utilized appropriately to meet your organization's resiliency requirements for Azure virtual machines (VMs).",
+            "guid": "4d874a74-8b66-42d6-b150-512a66498f6d",
+            "link": "https://learn.microsoft.com/azure/backup/backup-azure-vms-introduction",
+            "service": "VM",
+            "severity": "High",
+            "text": "Consider Azure Backup to meet your resiliency requirements for Azure VMs",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "718cb437-b060-2589-8856-2e93a5c6633b",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-erdirect-about",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Single Instance VMs using Premium SSD or Ultra Disk for all Operating System Disks and Data Disks are guaranteed to have Virtual Machine Connectivity of at least 99.9%",
+            "guid": "8052d88e-79d1-47b7-9b22-a5a67e7a8ed4",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/disks-types",
+            "service": "VM",
             "severity": "High",
-            "text": "If using ExpressRoute Direct, consider using ExpressRoute Local circuits to the local Azure regions to save costs.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Cost"
+            "text": "Use Premium or Ultra disks for production VMs",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "8042d88e-79d1-47b7-9b22-a5a67e7a8ed4",
-            "link": "https://learn.microsoft.com/azure/architecture/framework/services/networking/expressroute/reliability",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "When traffic isolation or dedicated bandwidth is required, such as for separating production and nonproduction environments, use different ExpressRoute circuits. It will help you ensure isolated routing domains and alleviate noisy-neighbor risks.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Azure automatically replicates managed disks within a region to ensure data durability and protect against single-point failures.",
+            "guid": "b31e38c3-f298-412b-8363-cffe179b599d",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview",
+            "service": "VM",
+            "severity": "High",
+            "text": "Ensure Managed Disks are used for all VMs",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b30e38c3-f298-412b-8363-cefe179b599d",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-monitoring-metrics-alerts",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Temporary disks are intended for short-term storage of non-persistent data such as page files, swap files, or SQL Server tempdb. Storing persistent data on temporary disks can lead to data loss during maintenance events or VM redeployment.",
+            "guid": "e0d5973c-d4ce-432c-8881-37f6f7c4c0d4",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview#temporary-disk",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Monitor ExpressRoute availability and utilization using built-in Express Route Insights.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Operations"
+            "text": "Do not use the Temp disk for anything that is not acceptable to be lost",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5bf68dc9-325e-4873-bf88-f8214ef2e5d2",
-            "link": "https://learn.microsoft.com/azure/expressroute/how-to-configure-connection-monitor",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Co-locate your compute, storage, networking, and data resources across an availability zone, and replicate this arrangement in other availability zones.",
+            "guid": "e514548d-2447-4ec6-9138-b8200f1ce16e",
+            "link": "https://learn.microsoft.com/azure/reliability/availability-zones-overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Use Connection Monitor for connectivity monitoring across the network, especially between on-premises and Azure.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Operations"
+            "text": "Leverage Availability Zones for your VMs in regions where they are supported",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/connections' | where properties.connectionType == 'ExpressRoute' | project cxId=id, gwId=tostring(properties.virtualNetworkGateway1.id), circuitId=tostring(properties.peer.id) | join (resources | where type=='microsoft.network/expressroutecircuits' | project circuitId=tostring(id), circuitLocation=tostring(properties.serviceProviderProperties.peeringLocation)) on circuitId | distinct gwId, circuitLocation | summarize countErLocations=count() by id=gwId | extend compliant = (countErLocations >= 2)",
-            "guid": "e0d5973c-d4cd-421b-8881-37f5e6c4cfd3",
-            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering#need-for-redundant-connectivity-solution",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Use at least two VMs in Availability Sets to isolate VMs on different fault and update domains.",
+            "guid": "5a785d6f-e96c-496a-b884-4cf3b2b38c88",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/availability-set-overview",
+            "service": "VM",
             "severity": "Medium",
-            "text": "Use ExpressRoute circuits from different peering locations for redundancy.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "text": "For regions that do not support Availability Zones deploy VMs into Availability Sets",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Azure provides multiple options for VM redundancy to meet different requirements (Availability Zones, Virtual Machine Scale Sets, Availability Sets, Azure Site Recovery)",
+            "guid": "6ba2c021-4991-414a-9d3c-e574dccbd979",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/availability",
+            "service": "VM",
+            "severity": "High",
+            "text": "Avoid running a production workload on a single VM",
+            "waf": "Reliability"
+        },
+        {
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Azure Site Recovery enables you to achieve low RTO (Recovery Time Objective) for your Azure and hybrid VMs by providing continuous replication and failover capabilities.",
+            "guid": "2a6bcca2-b5fe-4a1e-af3d-d95d48c7c891",
+            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-overview",
+            "service": "VM",
+            "severity": "High",
+            "text": "For Azure and on-premises VMs (Hyper-V/Phyiscal/VMware) with low RTO requirements use Azure Site Recovery",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "cf3fe65c-fec0-495a-8edc-9675200f2add",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-coexist-resource-manager",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "Use site-to-site VPN as failover of ExpressRoute, if only using a single ExpressRoute circuit.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "By using Capacity Reservations, you can effectively manage capacity for critical workloads, ensuring resource availability in specified regions.",
+            "guid": "bd7bb012-f7b9-45e0-9e15-8e3ea3992c2d",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/capacity-reservation-overview",
+            "service": "VM",
+            "severity": "Low",
+            "text": "Use Capacity Reservations for critical workloads that require guaranteed capacity",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,subnets=properties.subnets | mv-expand subnets | project id,resourceGroup,name,subnetName=tostring(subnets.name),routeTableId=tostring(subnets.properties.routeTable.id) | where subnetName == 'GatewaySubnet' | join kind=leftouter (Resources | where type == 'microsoft.network/routetables' | project routeTableName=name,routeTableId=id, disableBgpRoutePropagation=properties.disableBgpRoutePropagation) on routeTableId | project id,compliant = (disableBgpRoutePropagation == False or isnull(disableBgpRoutePropagation))",
-            "guid": "72105cc8-aaea-4ee1-8c7a-ad25977afcaf",
-            "link": "https://learn.microsoft.com/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings#gwsub",
-            "service": "ExpressRoute",
-            "severity": "High",
-            "text": "If you are using a route table in the GatewaySubnet, make sure that gateway routes are propagated.",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "By ensuring that the necessary quotas are increased in your DR region before testing failover with ASR, you can avoid any potential resource constraints during the recovery process for failed over VMs.",
+            "guid": "e6e2065b-3a76-4af4-a691-e8939ada4666",
+            "link": "https://learn.microsoft.com/azure/quotas/per-vm-quota-requests",
+            "service": "VM",
+            "severity": "Medium",
+            "text": "Increase quotas in DR region before testing failover with ASR",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "d581a947-69a2-4783-942e-9df3664324c8",
-            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-high-availability-with-expressroute#active-active-connections",
-            "service": "ExpressRoute",
-            "severity": "High",
-            "text": "If using ExpressRoute, your on-premises routing should be dynamic: in the event of a connection failure it should converge to the remaining connection of the circuit. Load should be shared across both connections ideally as active/active, although active/passive is supported too.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-azure-expressroute/",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "Scheduled Events is an Azure Metadata Service that provides information about upcoming maintenance events for virtual machines (VMs). By leveraging Scheduled Events, you can proactively prepare your applications for VM maintenance, minimizing disruption and improving the availability of your VMs.",
+            "guid": "6d3b475a-5c7a-4cbe-99bb-e64dd8902e87",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/windows/scheduled-events",
+            "service": "VM",
+            "severity": "Low",
+            "text": "Utilize Scheduled Events to prepare for VM maintenance",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b258f058-b9f6-46cd-b28d-990106f0c3f8",
-            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-high-availability-with-expressroute",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Resiliency Review",
+            "description": "Use Zone-redundant Storage (ZRS) in the primary region for scenarios that require high availability and for restricting replication to a particular country or region. For protection against regional disasters, use Geo-zone-redundant Storage (GZRS), which combines ZRS in the primary region with geo-replication to a secondary region?.",
+            "guid": "48c7c891-dcb1-4f7d-9769-ae568ba38d4a",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-redundancy",
+            "service": "Storage",
             "severity": "Medium",
-            "text": "Ensure the two physical links of your ExpressRoute circuit are connected to two distinct edge devices in your network.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "text": "Choose the most appropriate data redundancy option for Azure Storage based on your requirements",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "fe2a1b53-6fbd-4c67-b58a-85d7c7a0afcb",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-bfd",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "Ensure Bidirectional Forwarding Detection (BFD) is enabled and configured on customer or provider edge routing devices.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Resiliency Review",
+            "description": "Assigning a Delete lock to your storage account helps protect the availability of your data, minimizing the risk of disruptions to your business operations.",
+            "guid": "85e2213d-bd7b-4b01-8f7b-95e06e158e3e",
+            "link": "https://learn.microsoft.com/azure/storage/common/lock-account-resource",
+            "service": "Storage",
+            "severity": "Low",
+            "text": "Apply a Delete lock to prevent accidental or malicious deletion of storage accounts",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "669b215a-ce43-4371-8f6f-11047f6490f1",
-            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering",
-            "service": "ExpressRoute",
-            "severity": "High",
-            "text": "Connect the ExpressRoute Gateway to two or more circuits from different peering locations for higher resiliency.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Resiliency Review",
+            "description": "Container soft delete protects your data from being accidentally deleted by maintaining the deleted data in the system for a specified period of time.",
+            "guid": "a3992c2d-e6e2-4065-a3a7-6af4a691e893",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-container-enable",
+            "service": "Storage",
+            "severity": "Low",
+            "text": "Enable soft delete for Storage Account Containers",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "3f79ed00-203b-4c95-9efd-691505f5a1f9",
-            "link": "https://learn.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-setup-alerts-virtual-network-gateway-log",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "Configure diagnostic logs and alerts for ExpressRoute virtual network gateway.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Operations"
+            "arm-service": "Microsoft.Storage/storageAccounts",
+            "checklist": "Resiliency Review",
+            "description": "Blob soft delete protects an individual blob and its versions, snapshots, and metadata from accidental deletes or overwrites by maintaining the deleted data in the system for a specified period of time.",
+            "guid": "9ada4666-7e13-4c10-96b9-153d89f89dc7",
+            "link": "https://learn.microsoft.com/azure/storage/blobs/soft-delete-blob-enable",
+            "service": "Storage",
+            "severity": "Low",
+            "text": "Enable soft delete for blobs",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5234c93f-b651-41dd-80c1-234177b91ced",
-            "link": "https://learn.microsoft.com/azure/expressroute/virtual-network-connectivity-guidance",
-            "service": "ExpressRoute",
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Resiliency Review",
+            "description": "Azure Backup enhanced soft delete provides critical protection against ransomware attacks by retaining deleted backups, enabling recovery from potential ransomware encryption or deletion.",
+            "guid": "b44be3b1-a27f-48b9-b91b-e1038df03a82",
+            "link": "https://learn.microsoft.com/azure/backup/backup-azure-enhanced-soft-delete-about",
+            "service": "Backup",
             "severity": "Medium",
-            "text": "Do not use ExpressRoute circuits for VNet-to-VNet communication.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Performance"
+            "text": "Enable Azure Backup enhanced soft delete for improved data protection and recovery",
+            "waf": "Reliability"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "8ac6a9e0-1e6a-483d-b5de-32c199248160",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-about",
-            "service": "N/A",
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Resiliency Review",
+            "description": "Azure Backup's multi-user authorization enables fine-grained control over user access to backup resources, allowing you to restrict privileges and ensure proper authentication and authorization for backup operations.",
+            "guid": "2cd463cb-bbc8-4ac2-a9eb-c92a43da1dae",
+            "link": "https://learn.microsoft.com/azure/backup/multi-user-authorization-concept",
+            "service": "Backup",
             "severity": "Low",
-            "text": "Do not send Azure traffic to hybrid locations for inspection.  Instead, follow the principle 'traffic in Azure stays in Azure' so that communication across resources in Azure occurs via the Microsoft backbone network.",
-            "waf": "Performance"
+            "text": "Implement multi-user authorization for Azure Backup to ensure secure and controlled access to backup resources",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "e6c4cfd3-e504-4547-a244-7ec66138a720",
-            "link": "https://learn.microsoft.com/azure/firewall/overview",
-            "service": "Firewall",
-            "severity": "High",
-            "text": "Use Azure Firewall to govern Azure outbound traffic to the internet, non-HTTP/S inbound connections, and East/West traffic filtering (if the organization requires it).",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.RecoveryServices/vaults",
+            "checklist": "Resiliency Review",
+            "description": "Azure Immutable Storage provides an additional layer of security by ensuring that backup data stored in the vault cannot be modified or deleted for a specified retention period. This helps safeguard your backups from ransomware attacks that may attempt to compromise or manipulate your backup data.",
+            "guid": "2cc88147-0607-4c1c-aa0e-614658dd458e",
+            "link": "https://learn.microsoft.com/azure/backup/backup-azure-immutable-vault-concept?source=recommendations&tabs=recovery-services-vault",
+            "service": "Backup",
+            "severity": "Low",
+            "text": "Implement Immutable Storage for your vaults to protect against ransomware and prevent unauthorized modifications to backups",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5a4b1511-e43a-458a-ac22-99c4d7b57d0c",
-            "link": "https://learn.microsoft.com/azure/firewall-manager/policy-overview",
-            "service": "Firewall",
-            "severity": "Medium",
-            "text": "Create a global Azure Firewall policy to govern security posture across the global network environment and assign it to all Azure Firewall instances. Allow for granular policies to meet requirements of specific regions by delegating incremental firewall policies to local security teams via Azure role-based access control.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.Network/dnsZones",
+            "checklist": "Resiliency Review",
+            "description": "To eliminate a single point of failure in your on-premises DNS services and ensure reliable DNS resolution during business continuity and disaster recovery scenarios, it is recommended to utilize Azure DNS Private Resolvers in multiple regions. By deploying two or more Azure DNS private resolvers across different regions, you can enable DNS failover and achieve resiliency in your DNS infrastructure.",
+            "guid": "43da1dae-2cc8-4814-9060-7c1cca0e6146",
+            "link": "https://learn.microsoft.com/azure/dns/tutorial-dns-private-resolver-failover",
+            "service": "DNS",
+            "severity": "Low",
+            "text": "Implement DNS Failover using Azure DNS Private Resolvers",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "655562f2-b3e4-4563-a4d8-739748b662d6",
-            "link": "https://learn.microsoft.com/azure/firewall-manager/deploy-trusted-security-partner",
-            "service": "Firewall",
-            "severity": "Low",
-            "text": "Configure supported partner SaaS security providers within Firewall Manager if the organization wants to use such solutions to help protect outbound connections.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "arm-service": "Microsoft.PowerBI/gateways",
+            "checklist": "Resiliency Review",
+            "description": "Use an on-premises data gateway cluster to avoid single points of failure and to load balance traffic across gateways.",
+            "guid": "89f89dc7-b44b-4e3b-8a27-f8b9e91be103",
+            "link": "https://learn.microsoft.com/data-integration/gateway/service-gateway-high-availability-clusters",
+            "service": "Data Gateways",
+            "severity": "Medium",
+            "text": "Use on-premises data gateway clusters to ensure high availability for business-critical data",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.dnsSettings.enableProxy == true) | distinct id,compliant",
-            "guid": "14d99880-2f88-47e8-a134-62a7d85c94af",
-            "link": "https://learn.microsoft.com/azure/firewall/fqdn-filtering-network-rules",
-            "service": "Firewall",
+            "arm-service": "Microsoft.Compute/virtualMachines",
+            "checklist": "Resiliency Review",
+            "description": "When choosing the best option for deploying NVAs in Azure, it is crucial to consider the vendor's recommendations and validate that the specific design has been vetted and validated by the NVA vendor. The vendor should also provide the necessary NVA configuration for seamless integration in Azure.",
+            "guid": "8b1188b3-c6a4-46ce-a544-451e192d3442",
+            "link": "https://learn.microsoft.com/azure/architecture/reference-architectures/dmz/nva-ha",
+            "service": "NVA",
             "severity": "High",
-            "text": "Use application rules to filter outbound traffic on destination host name for supported protocols.  Use FQDN-based network rules and Azure Firewall with DNS proxy to filter egress traffic to the Internet over other protocols.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "text": "Deploy Network Virtual Appliances (NVAs) in a vendor supported configuration for High Availability",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.sku.tier == 'Premium') | distinct id,compliant",
-            "guid": "c10d51ef-f999-455d-bba0-5c90ece07447",
-            "link": "https://learn.microsoft.com/azure/firewall/premium-features",
-            "service": "Firewall",
-            "severity": "High",
-            "text": "Use Azure Firewall Premium to enable additional security features.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-firewall/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "4620dc87-e948-4ce8-8426-f3e6e5d7bd85",
+            "link": "https://learn.microsoft.com/azure/sap/center-sap-solutions/overview",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Azure Center for SAP solutions (ACSS) is an Azure offering that makes SAP a top-level workload on Azure. ACSS is an end-to-end solution that enables you to create and run SAP systems as a unified workload on Azure and provides a more seamless foundation for innovation. You can take advantage of the management capabilities for both new and existing Azure-based SAP systems.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-center-sap-solutions/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.threatIntelMode == 'Deny') | distinct id,compliant",
-            "guid": "e9c8f584-6d5e-473b-8dc5-acc9fbaab4e3",
-            "link": "https://learn.microsoft.com/azure/firewall/premium-features#idps-signature-rules",
-            "service": "Firewall",
-            "severity": "High",
-            "text": "Configure Azure Firewall Threat Intelligence mode to Alert and Deny for additional protection.",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "5d75e99d-624d-4afe-91d9-e17adc580790",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-platform-automation-and-devops",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Azure supports automating SAP deployments in Linux and Windows. SAP Deployment Automation Framework is an open-source orchestration tool that can deploy, install, and maintain SAP environments.",
+            "training": "https://github.com/Azure/sap-automation",
+            "waf": "Operations"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "guid": "d17f6f39-a377-48a2-931f-5ead3ebe33a8",
+            "link": "https://learn.microsoft.com/azure/well-architected/sap/design-areas/data-platform",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Perform a point-in-time recovery for your production databases at any point and in a time frame that meets your RTO; point-in-time recovery typically includes operator errors deleting data either on the DBMS layer or through SAP, incidentally",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/firewallpolicies' | extend compliant = (properties.intrusionDetection.mode == 'Deny') | project id, compliant",
-            "guid": "b9d0dff5-bdd4-4cd8-88ed-5811610b2b2c",
-            "link": "https://learn.microsoft.com/azure/firewall/premium-features#idps",
-            "service": "Firewall",
-            "severity": "High",
-            "text": "Configure Azure Firewall IDPS mode to Deny for additional protection.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-firewall/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "c4b8e117-930b-4dbd-ae50-7bc5faf6f91a",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Test the backup and recovery times to verify that they meet your RTO requirements for restoring all systems simultaneously after a disaster.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,resourceGroup,name,subnets=properties.subnets | mv-expand subnets | project id,name,subnetId=tostring(subnets.id), subnetName=tostring(subnets.name),subnetRT=subnets.properties.routeTable.id | where not (subnetName in ('GatewaySubnet', 'AzureFirewallSubnet', 'RouteServerSubnet', 'AzureBastionSubnet')) | extend hasRT = isnotnull(subnetRT) | distinct id, hasRT, subnetId | join kind=fullouter (resources | where type == 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | extend isVWAN=(tolower(split(properties_virtualNetworkPeerings.name, '_')[0]) == 'remotevnettohubpeering') | mv-expand properties.subnets | project id, isVWAN, name, subnetId=tostring(properties_subnets.id), subnetName=tostring(properties_subnets.name) | summarize PeeredToVWAN=max(isVWAN) by id, subnetId | project id, subnetId, isVWANpeer = (PeeredToVWAN == true)) on subnetId | project id=iff(isnotempty(id), id, id1), subnetId=iff(isnotempty(subnetId), subnetId, subnetId1), hasRT, isVWANpeer | extend compliant = (hasRT==true or isVWANpeer==true) | distinct id, subnetId, compliant",
-            "guid": "a3784907-9836-4271-aafc-93535f8ec08b",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-networks-udr-overview",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "b651423c-8552-42db-a545-5cb50c05527a",
+            "link": "https://learn.microsoft.com/azure/reliability/cross-region-replication-azure",
+            "service": "SAP",
             "severity": "High",
-            "text": "For subnets in VNets not connected to Virtual WAN, attach a route table so that Internet traffic is redirected to Azure Firewall or a Network Virtual Appliance.",
-            "waf": "Security"
+            "text": "You can replicate standard storage between paired regions, but you can't use standard storage to store your databases or virtual hard disks. You can replicate backups only between paired regions that you use. For all your other data, run your replication by using native DBMS features like SQL Server Always On or SAP HANA System Replication. Use a combination of Site Recovery, rsync or robocopy, and other third-party software for the SAP application layer.",
+            "training": "https://learn.microsoft.com/training/paths/ensure-business-continuity-implement-disaster-recovery/",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "715d833d-4708-4527-90ac-1b142c7045ba",
-            "link": "https://learn.microsoft.com/azure/firewall/firewall-structured-logs",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "aa208dca-784f-46c6-9014-cc919c542dc9",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-zones",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Add diagnostic settings to save logs, using the Resource Specific destination table, for all Azure Firewall deployments.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Operations"
+            "text": "When using Azure Availability Zones to achieve high availability, you must consider latency between SAP application servers and database servers. For zones with high latencies, operational procedures need to be in place to ensure that SAP application servers and database servers are running in the same zone at all times.",
+            "training": "https://learn.microsoft.com/training/modules/implement-high-availability-for-sap-workloads-azure/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "e960fc6b-4ab2-4db6-9609-3745135f9ffa",
-            "link": "https://learn.microsoft.com/azure/firewall-manager/migrate-to-policy",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "graph": "resources| where type =~ 'microsoft.network/virtualnetworkgateways'| where properties.gatewayType =~ 'vpn' or properties.gatewayType =~ 'ExpressRoute'| extend SKUName = properties.sku.name, SKUTier = properties.sku.tier, Type = properties.gatewayType| extend compliant = SKUTier contains 'AZ'| project name, id, subscriptionId, resourceGroup, Type, compliant",
+            "guid": "ba07c007-1f90-43e9-aa4f-601346b80352",
+            "link": "https://learn.microsoft.com/azure/expressroute/designing-for-disaster-recovery-with-expressroute-privatepeering",
+            "service": "SAP",
             "severity": "High",
-            "text": "Migrate from Azure Firewall Classic rules (if exist) to Firewall Policy.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Operations"
+            "text": "Set up ExpressRoute connections from on-premises to the primary and secondary Azure disaster recovery regions. Also, as an alternative to using ExpressRoute, consider setting up VPN connections from on-premises to the primary and secondary Azure disaster recovery regions.",
+            "training": "https://learn.microsoft.com/azure/expressroute/use-s2s-vpn-as-backup-for-expressroute-privatepeering",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'AzureFirewallSubnet' | extend compliant = (subnetPrefixLength == 26) | distinct id, compliant",
-            "guid": "22d6419e-b627-4d95-9e7d-019fa759387f",
-            "link": "https://learn.microsoft.com/azure/firewall/firewall-faq#why-does-azure-firewall-need-a--26-subnet-size",
-            "service": "Firewall",
-            "severity": "High",
-            "text": "Use a /26 prefix for your Azure Firewall subnets.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-firewall/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "d2b30195-b11d-4a8f-a672-28b2b4169a7c",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/disaster-recovery-guidance",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "Replicate key vault contents like certificates, secrets, or keys across regions so you can decrypt data in the DR region.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "828cec2e-af6c-40c2-8fa2-1b681ee63eb7",
-            "link": "https://learn.microsoft.com/azure/firewall-manager/rule-hierarchy",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "05f1101d-250f-40e7-b2a1-b674ab50edbd",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-s4hana",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Arrange rules within the firewall policy into Rule Collection Groups and Rule Collections and based on their frequency of use.",
-            "training": "https://learn.microsoft.com/training/modules/intro-to-azure-firewall-manager/",
-            "waf": "Performance"
+            "text": "Peer the primary and disaster recovery virtual networks. For example, for HANA System Replication, an SAP HANA DB virtual network needs to be peered to the disaster recovery site's SAP HANA DB virtual network.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "0da83bb1-2f39-49af-b5c9-835fc455e3d1",
-            "link": "https://learn.microsoft.com/azure/firewall/ip-groups",
-            "service": "Firewall",
-            "severity": "Medium",
-            "text": "Use IP Groups or IP prefixes to reduce number of IP table rules.",
-            "waf": "Performance"
+            "checklist": "SAP Checklist",
+            "guid": "d3351bf7-628a-46de-917d-dfc11d3b6b40",
+            "link": "https://learn.microsoft.com/azure/azure-netapp-files/azure-netapp-files-service-levels",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "If you use Azure NetApp Files storage for your SAP deployments, at a minimum, create two Azure NetApp Files accounts in the Premium tier, in two regions.",
+            "training": "https://learn.microsoft.com/training/modules/choose-service-level-azure-netapp-files-hpc-applications/2-identify-decision-criteria",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "c44c6f0e-1642-4a61-a17b-0922f835c93a",
-            "link": "https://learn.microsoft.com/azure/firewall/tutorial-firewall-dnat",
-            "service": "Firewall",
-            "severity": "Medium",
-            "text": "Do not use wildcards as a source IP for DNATS, such as * or any, you should specify source IPs for incoming DNATs.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-to-azure-virtual-networks/",
-            "waf": "Performance"
+            "checklist": "SAP Checklist",
+            "guid": "726a1d3e-5508-4a06-9d54-93f4b50040c1",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/disaster-recovery-sap-guide?tabs=windows",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Native database replication technology should be used to synchronize the database in a HA pair.",
+            "training": "https://learn.microsoft.com/training/modules/implement-disaster-recovery-for-sap-workloads-azure/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "7371dc21-251a-47a3-af14-6e01b9da4757",
-            "link": "https://learn.microsoft.com/azure/firewall/integrate-with-nat-gateway",
-            "service": "Firewall",
-            "severity": "Medium",
-            "text": "Prevent SNAT Port exhaustion by monitoring SNAT port usage, evaluating NAT Gateway settings, and ensuring seamless failover. If the port count approaches the limit, it’s a sign that SNAT exhaustion might be imminent.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-to-azure-virtual-networks/",
-            "waf": "Performance"
+            "checklist": "SAP Checklist",
+            "graph": "resources | where type =~ 'microsoft.network/virtualnetworks' | extend addressSpace = todynamic(properties.addressSpace) | extend addressPrefix = todynamic(properties.addressSpace.addressPrefixes) | mvexpand addressSpace | mvexpand addressPrefix | project name, id, location, resourceGroup, subscriptionId, cidr = addressPrefix | extend compliant = (cidr matches regex @'^(10\\.|172\\.(1[6-9]|2[0-9]|3[01])\\.|192\\.168\\.)')  | project id, compliant, cidr",
+            "guid": "6561f847-3db5-4ff8-9200-5ad3c3b436ad",
+            "link": "https://learn.microsoft.com/ja-jp/azure/virtual-network/virtual-networks-faq",
+            "service": "SAP",
+            "severity": "High",
+            "text": "The CIDR for the primary virtual network (VNet) shouldn't conflict or overlap with the CIDR of the DR site's VNet",
+            "training": "https://learn.microsoft.com/training/paths/azure-fundamentals-describe-azure-architecture-services/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "346840b8-1064-496e-8396-4b1340172d52",
-            "link": "https://learn.microsoft.com/azure/firewall/premium-features#tls-inspection",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "0258ed30-fe42-434f-87b9-58f91f908e0a",
+            "service": "SAP",
             "severity": "High",
-            "text": "If you are using Azure Firewall Premium, enable TLS Inspection.",
-            "waf": "Performance"
+            "text": "Use Site Recovery to replicate an application server to a DR site. Site Recovery can also help with replicating central-services cluster VMs to the DR site. When you invoke DR, you'll need to reconfigure the Linux Pacemaker cluster on the DR site (for example, replace the VIP or SBD, run corosync.conf, and more).",
+            "training": "https://learn.microsoft.com/training/paths/ensure-business-continuity-implement-disaster-recovery/",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "39990a13-915c-45f9-a2d3-562d7d6c4b7c",
-            "link": "https://learn.microsoft.com/azure/firewall/premium-features#web-categories",
-            "service": "Firewall",
-            "severity": "Low",
-            "text": "Use web categories to allow or deny outbound access to specific topics.",
-            "waf": "Performance"
+            "checklist": "SAP Checklist",
+            "guid": "8300cb30-766b-4084-b126-0dd8fb1269a1",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Consider the availability of SAP software against single points of failure. This includes single points of failure within applications such as DBMSs utilized in SAP NetWeaver and SAP S/4HANA architectures, SAP ABAP and ASCS + SCS. Also, other tools such as SAP Web Dispatcher.",
+            "training": "https://learn.microsoft.com/training/modules/implement-high-availability-for-sap-workloads-azure/2-explore-high-availability-disaster-recovery-support-azure-for-sap-workloads?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "6eff7e6c-6c4a-43d7-be3f-6641c2cb3d4a",
-            "link": "https://learn.microsoft.com/azure/architecture/example-scenario/gateway/application-gateway-before-azure-firewall",
-            "service": "Firewall",
-            "severity": "Medium",
-            "text": "As part of your TLS inspection, plan for receiving traffic from Azure App Gateways for inspection.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-application-gateway/",
-            "waf": "Performance"
+            "checklist": "SAP Checklist",
+            "guid": "56402f11-ccbe-42c3-a2f6-c6f6f38ab579",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-supported-configurations",
+            "service": "SAP",
+            "severity": "High",
+            "text": "For SAP and SAP databases, consider implementing automatic failover clusters. In Windows, Windows Server Failover Clustering supports failover. In Linux, Linux Pacemaker or third-party tools like SIOS Protection Suite and Veritas InfoScale support failover.",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'Microsoft.Network/firewallPolicies' | where array_length(properties.firewalls) > 0 | extend compliant = (properties.dnsSettings.enableProxy =~ 'true') | distinct id, compliant",
-            "guid": "94f3eede-9aa3-4088-92a3-bb9a56509fad",
-            "link": "https://learn.microsoft.com/azure/firewall/dns-details",
-            "service": "Firewall",
-            "severity": "Medium",
-            "text": "Enable Azure Firewall DNS proxy configuration.",
-            "training": "https://learn.microsoft.com/training/courses/az-700t00/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "afae6bec-2671-49ae-bc69-140b8ec8d320",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/disaster-recovery-sap-guide?tabs=windows",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Azure doesn't support architectures in which the primary and secondary VMs share storage for DBMS data. For the DBMS layer, the common architecture pattern is to replicate databases at the same time and with different storage stacks than the ones that the primary and secondary VMs use.",
+            "training": "https://learn.microsoft.com/training/paths/ensure-business-continuity-implement-disaster-recovery/?source=recommendationshttps%3A%2F%2Flearn.microsoft.com%2Fja-jp%2Ftraining%2Fpaths%2Fensure-business-continuity-implement-disaster-recovery%2F%3Fsource%3Drecommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "1dc04554-dece-4ffb-a49e-5c683e09f8da",
-            "link": "https://learn.microsoft.com/azure/firewall/firewall-diagnostics",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "ac614e95-6767-4bc3-b8a4-9953533da6ba",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/dbms-guide-general",
+            "service": "SAP",
             "severity": "High",
-            "text": "Integrate Azure Firewall with Azure Monitor and enable diagnostic logging to store and analyze firewall logs and metrics.",
-            "training": "https://learn.microsoft.com/training/courses/az-700t00/",
-            "waf": "Operations"
+            "text": "The DBMS data and transaction/redo log files are stored in Azure supported block storage or Azure NetApp Files. Azure Files or Azure Premium Files isn't supported as storage for DBMS data and/or redo log files with SAP workload.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-databases/2-explore-database-support-azure-for-sap-workloads",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "64e7000e-3c06-485e-b455-ced7f454cba3",
-            "link": "https://learn.microsoft.com/azure/well-architected/service-guides/azure-firewall",
-            "service": "Firewall",
-            "severity": "Low",
-            "text": "Implement backups for your firewall rules",
-            "training": "https://learn.microsoft.com/training/courses/az-104t00/",
-            "waf": "Operations"
+            "checklist": "SAP Checklist",
+            "guid": "1f737179-8e7f-4e1a-a30c-e5a649a3092b",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/sap-high-availability-guide-wsfc-shared-disk",
+            "service": "SAP",
+            "severity": "High",
+            "text": "You can use Azure shared disks in Windows for ASCS + SCS components and specific high-availability scenarios. Set up your failover clusters separately for SAP application layer components and the DBMS layer. Azure doesn't currently support high-availability architectures that combine SAP application layer components and the DBMS layer into one failover cluster.",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/azurefirewalls' | where array_length(zones) <= 1 or isnull(zones) | where isempty(properties.virtualHub.id) or isnull(properties.virtualHub.id) | project name, id, tags, param1='multipleZones:false'",
-            "guid": "d38ad60c-bc9e-4d49-b699-97e5d4dcf707",
-            "link": "https://learn.microsoft.com/azure/firewall/deploy-availability-zone-powershell",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "graph": "resources | where type =~ 'Microsoft.Network/loadBalancers' | extend bep = properties.backendAddressPools | extend BackEndPools = array_length(bep) | where BackEndPools =~ 0 | project name, id, Param1='backendPools', Param2=toint(0), tags | union (resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name =~ 'Standard' | extend bep = properties.backendAddressPools | extend BackEndPools = toint(array_length(bep)) | mv-expand bip = properties.backendAddressPools | extend BackendAddresses = array_length(bip.properties.loadBalancerBackendAddresses) | where toint(BackendAddresses) <= 1 | project name, id, tags, Param1='backendAddresses', Param2=toint(BackendAddresses)) | union ( resources | where type =~ 'Microsoft.Network/loadBalancers' | where sku.name =~ 'Basic' | mv-expand properties.backendAddressPools | extend backendPoolId = properties_backendAddressPools.id | project id, name, tags, tostring(backendPoolId), Param1='BackEndPools' | join kind = leftouter ( resources | where type =~ 'Microsoft.Network/networkInterfaces' | mv-expand properties.ipConfigurations | mv-expand properties_ipConfigurations.properties.loadBalancerBackendAddressPools | extend backendPoolId = tostring(properties_ipConfigurations_properties_loadBalancerBackendAddressPools.id) | summarize poolMembers = count() by backendPoolId | project tostring(backendPoolId), poolMembers ) on backendPoolId | where toint(poolMembers) <= 1 | extend BackendAddresses = poolMembers | project id, name, tags, Param1='backendAddresses', Param2=toint(BackendAddresses))",
+            "guid": "a78b3d31-3170-44f2-b5d7-651a29f4ccf5",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-standard-load-balancer-outbound-connections",
+            "service": "SAP",
             "severity": "High",
-            "text": "Deploy Azure Firewall across multiple availability zones. Azure Firewall offers different SLAs depending on its deployment; in a single availability zone or across multiple, potentially improving reliability and performance.",
-            "training": "https://learn.microsoft.com/training/courses/az-104t00/",
+            "text": "Most failover clusters for SAP application layer components (ASCS) and the DBMS layer require a virtual IP address for a failover cluster.  Azure Load Balancer should handle the virtual IP address for all other cases. One design principle is to use one load balancer per cluster configuration. We recommend that you use the standard version of the load balancer (Standard Load Balancer SKU).",
+            "training": "https://learn.microsoft.com/training/modules/implement-high-availability-for-sap-workloads-azure/?source=recommendations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'Microsoft.Network/azureFirewalls' | where isempty(properties.virtualHub.id) or isnull(properties.virtualHub.id) | mv-expand ipConfig = properties.ipConfigurations | project name, firewallId = id, tags, vNetName = split(ipConfig.properties.subnet.id, '/', 8)[0], vNetId = tolower(substring(ipConfig.properties.subnet.id, 0, indexof(ipConfig.properties.subnet.id, '/subnet'))) | join kind=fullouter ( resources | where type =~ 'Microsoft.Network/ddosProtectionPlans' | mv-expand vNet = properties.virtualNetworks | project ddosProtectionPlanId = id, vNetId = tolower(vNet.id) ) on vNetId | extend compliant = iif(isempty(ddosProtectionPlanId), false, true) | project name, compliant, id = firewallId, tags, network = strcat('vNet: ', vNetName)",
-            "guid": "e8143efa-0301-4d62-be54-ca7b5ce566dc",
-            "link": "https://learn.microsoft.com/en-gb/azure/ddos-protection/ddos-protection-overview",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "1a541741-5833-4fb4-ae3c-2df743165c3a",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-ha-ports-overview?source=recommendations",
+            "service": "SAP",
             "severity": "High",
-            "text": "Configure DDoS Protection on the Azure Firewall VNet, Associate a DDoS protection plan with the virtual network hosting Azure Firewall to provide enhanced mitigation against DDoS attacks. Azure Firewall Manager integrates the creation of firewall infrastructure and DDoS protection plans. ",
+            "text": "Make sure the Floating IP is enabled on the Load balancer",
+            "training": "https://learn.microsoft.com/training/modules/load-balancing-non-https-traffic-azure/?source=recommendations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/applicationGateways",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "d301d6e8-72e5-42e3-911c-c58b5a4b1511",
-            "link": "https://learn.microsoft.com/azure/virtual-network/vnet-integration-for-azure-services",
-            "service": "App Gateway",
+            "checklist": "SAP Checklist",
+            "guid": "c47cc4f3-f105-452c-845e-9b307b3856c1",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/availability",
+            "service": "SAP",
             "severity": "High",
-            "text": "Do not disrupt control-plane communication for Azure PaaS services injected into a virtual networks, such as with a 0.0.0.0/0 route or an NSG rule that blocks control plane traffic.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/?source=learn",
-            "waf": "Security"
+            "text": "Before you deploy your high-availability infrastructure, and depending on the region you choose, determine whether to deploy with an Azure availability set or an availability zone.",
+            "training": "https://learn.microsoft.com/training/modules/configure-virtual-machine-availability/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b3e4563a-4d87-4397-98b6-62d6d15f512a",
-            "link": "https://learn.microsoft.com/azure/private-link/private-endpoint-overview",
-            "service": "ExpressRoute",
-            "severity": "Medium",
-            "text": "Access Azure PaaS services from on-premises via private endpoints and ExpressRoute private peering. This method avoids transiting over the public internet.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-azure-expressroute/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "844f69c3-07e5-4ec1-bff7-4be27bcf5fea",
+            "link": "https://www.microsoft.com/licensing/docs/view/Service-Level-Agreements-SLA-for-Online-Services?lang=1",
+            "service": "SAP",
+            "severity": "High",
+            "text": "If you want to meet the infrastructure SLAs for your applications for SAP components (central services, application servers, and databases), you must choose the same high availability options (VMs, availability sets, availability zones) for all components.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/virtualNetworks",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'microsoft.network/virtualnetworks' | project id,resourceGroup,name,subnets = properties.subnets | mv-expand subnets | project id = subnets.id, resourceGroup, VNet = name, serviceEndpoints = subnets.properties.serviceEndpoints, compliant = (isnull(subnets.properties.serviceEndpoints) or array_length(subnets.properties.serviceEndpoints) == 0) | order by compliant asc",
-            "guid": "4704489a-8042-4d88-b79d-17b73b22a5a6",
-            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-overview",
-            "service": "VNet",
+            "checklist": "SAP Checklist",
+            "guid": "cbe05bbe-209d-4490-ba47-778424d11678",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/availability-set-overview",
+            "service": "SAP",
             "severity": "High",
-            "text": "Don't enable virtual network service endpoints by default on all subnets.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/?source=learn",
-            "waf": "Security"
+            "text": "Do not mix servers of different roles in the same availability set. Keep central services VMs, database VMs, application VMs in their own availability sets",
+            "training": "https://learn.microsoft.com/training/modules/configure-virtual-machine-availability/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/azureFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "7e7a8ed4-b30e-438c-9f29-812b2363cefe",
-            "link": "azure/private-link/inspect-traffic-with-azure-firewall",
-            "service": "Firewall",
+            "checklist": "SAP Checklist",
+            "guid": "f2201000-d045-40a6-a79a-d7cdc01b4d86",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/co-location",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Filter egress traffic to Azure PaaS services using FQDNs instead of IP addresses in Azure Firewall or an NVA to prevent data exfiltration. If using Private Link you can block all FQDNs, otherwise allow only the required PaaS services.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/?source=learn",
-            "waf": "Security"
+            "text": "You can't deploy Azure availability sets within an Azure availability zone unless you use proximity placement groups.",
+            "training": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/expressRouteCircuits",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualnetworks' | project id,subnets=properties.subnets | mv-expand subnets | project id, subnetName = subnets.name, subnetPrefix = subnets.properties.addressPrefix | extend subnetPrefixLength = split(subnetPrefix, '/')[1] | where subnetName == 'GatewaySubnet' | extend compliant = (subnetPrefixLength <= 27) | distinct id, compliant",
-            "guid": "f2aad7e3-bb03-4adc-8606-4123d342a917",
-            "link": "https://learn.microsoft.com/azure/expressroute/expressroute-howto-add-gateway-resource-manager#add-a-gateway",
-            "service": "ExpressRoute",
+            "checklist": "SAP Checklist",
+            "guid": "9674e7c7-7796-4181-8920-09f4429543ba",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/availability-set-overview",
+            "service": "SAP",
             "severity": "High",
-            "text": "Use at least a /27 prefix for your Gateway subnets.",
-            "waf": "Security"
+            "text": "When you create availability sets, use the maximum number of fault domains and update domains available. For example, if you deploy more than two VMs in one availability set, use the maximum number of fault domains (three) and enough update domains to limit the effect of potential physical hardware failures, network outages, or power interruptions, in addition to Azure planned maintenance. The default number of fault domains is two, and you can't change it online later.",
+            "training": "https://learn.microsoft.com/training/modules/configure-virtual-machine-availability/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/networkSecurityGroups",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/networksecuritygroups' | mvexpand properties.securityRules | project id,name,ruleAction=properties_securityRules.properties.access,rulePriority=properties_securityRules.properties.priority,ruleDst=properties_securityRules.properties.destinationAddressPrefix,ruleSrc=properties_securityRules.properties.sourceAddressPrefix,ruleProt=properties_securityRules.properties.protocol,ruleDirection=properties_securityRules.properties.direction,rulePort=properties_securityRules.properties.destinationPortRange | summarize StarDenies=countif(ruleAction=='Deny' and ruleDst=='*' and ruleSrc=='*' and ruleProt=='*' and rulePort=='*') by id,tostring(ruleDirection) | where ruleDirection == 'Inbound' | project id,compliant=(StarDenies>0) | union (resources | where type=='microsoft.network/networksecuritygroups' | where array_length(properties.securityRules)==0 | extend compliant=false | project id,compliant)",
-            "guid": "11deb39d-8299-4e47-bbe0-0fb5a36318a8",
-            "link": "https://learn.microsoft.com/azure/virtual-network/service-tags-overview#available-service-tags",
-            "service": "NSG",
+            "checklist": "SAP Checklist",
+            "guid": "ae4ecb95-b70f-428f-8b9a-4c5b7e3478a2",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
+            "service": "SAP",
             "severity": "High",
-            "text": "Don't rely on the NSG inbound default rules using the VirtualNetwork service tag to limit connectivity.",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "Microsoft.Network/networkSecurityGroups",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/virtualnetworks' | mv-expand subnet = properties.subnets | where subnet.name !in~ ('GatewaySubnet', 'AzureFirewallSubnet', 'AzureFirewallManagementSubnet', 'RouteServerSubnet') | extend compliant = iff(isnotnull(subnet.properties.networkSecurityGroup.id), true, false) | project id, subnetName = subnet.name, vnetName = name, NSG = subnet.properties.networkSecurityGroup.id, compliant",
-            "guid": "872e52e3-611c-4c58-a5a4-b1511e43a58a",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-landing-zone-network-segmentation",
-            "service": "NSG",
-            "severity": "Medium",
-            "text": "Use NSGs to help protect traffic across subnets, as well as east/west traffic across the platform (traffic between landing zones).",
-            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/",
-            "waf": "Security"
-        },
-        {
-            "arm-service": "Microsoft.Network/networkSecurityGroups",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "a4d87397-48b6-462d-9d15-f512a65498f6",
-            "link": "https://learn.microsoft.com/azure/virtual-network/network-security-group-how-it-works",
-            "service": "NSG",
-            "severity": "Medium",
-            "text": "Use NSGs and application security groups to micro-segment traffic within the landing zone and avoid using a central NVA to filter traffic flows.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-network-security/",
-            "waf": "Security"
+            "text": "When you use Azure proximity placement groups in an availability set deployment, all three SAP components (central services, application server, and database) should be in the same proximity placement group.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/networkSecurityGroups",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'Microsoft.Network/virtualnetworks' | project subscriptionId, lowerCaseVNetId = tolower(id) | join kind = leftouter (    resources    | where type =~ 'microsoft.network/networkwatchers/flowlogs' and properties.enabled == true and properties.provisioningState =~ 'succeeded'    | where properties.targetResourceId contains '/Microsoft.Network/virtualNetworks/'    | project flowlogId = id, trafficAnalyticsEnabled = properties.flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration.enabled, lowerCaseTargetVNetId = tolower(properties.targetResourceId)    )    on $left.lowerCaseVNetId == $right.lowerCaseTargetVNetId | extend compliant = iff(isnotempty(lowerCaseTargetVNetId), true, false) | project id = lowerCaseVNetId, flowlogId, trafficAnalyticsEnabled, compliant",
-            "guid": "dfe237de-143b-416c-91d7-aa9b64704489",
-            "link": "https://learn.microsoft.com/azure/network-watcher/vnet-flow-logs-overview",
-            "service": "NSG",
-            "severity": "Medium",
-            "text": "Enable VNet Flow Logs and feed them into Traffic Analytics to gain insights into internal and external traffic flows.",
-            "training": "https://learn.microsoft.com/learn/modules/design-implement-network-monitoring/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "5d2fa56c-56ad-4484-88fe-72734c486ba2",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Use one proximity placement group per SAP SID. Groups don't span across Availability Zones or Azure regions",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Network/networkSecurityGroups",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type == 'microsoft.network/networksecuritygroups' | project id, rules = array_length(properties.securityRules) | project id, compliant = (rules < 900)",
-            "guid": "0390417d-53dc-44d9-b3f4-c8832f359b41",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits",
-            "service": "NSG",
-            "severity": "Medium",
-            "text": "Do not implement more than 900 NSG rules per NSG, due to the limit of 1000 rules.",
-            "training": "https://learn.microsoft.com/azure/virtual-network/network-security-group-how-it-works",
+            "checklist": "SAP Checklist",
+            "guid": "bca3b10e-0ff5-4aec-ac16-4c4bd1a1c13f",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Use one of the following services to run SAP central services clusters, depending on the operating system.",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "412e7f98-3f63-4047-82dd-69c5b5c2622f",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/scenario-any-to-any",
-            "service": "VWAN",
+            "checklist": "SAP Checklist",
+            "guid": "ed46b937-913e-4018-9c62-8393ab037e53",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-suse-multi-sid",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Virtual WAN if your scenario is explicitly described in the list of Virtual WAN routing designs.",
-            "training": "https://learn.microsoft.com/learn/modules/introduction-azure-virtual-wan/",
-            "waf": "Operations"
+            "text": "Azure doesn't currently support combining ASCS and DB HA in the same Linux Pacemaker cluster; separate them into individual clusters. However, you can combine up to five multiple central-services clusters into a pair of VMs.",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "54b69bad-33aa-4d5e-ac68-e1d76667313b",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/virtual-wan-network-topology#virtual-wan-network-design-recommendationst",
-            "service": "VWAN",
+            "checklist": "SAP Checklist",
+            "graph": "Resources | where type =~ 'Microsoft.Storage/storageAccounts' | where sku.name in~ ('Standard_LRS', 'Premium_LRS') | project name, id, tags, param1 = strcat('sku: ', sku.name)",
+            "guid": "f656e745-0cfb-453e-8008-0528fa21c933",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use a Virtual WAN hub per Azure region to connect multiple landing zones together across Azure regions via a common global Azure Virtual WAN.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
-            "waf": "Performance"
+            "text": "Deploy both VMs in the high-availability pair in an availability set or in availability zones. These VMs should be the same size and have the same storage configuration.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type=='microsoft.network/virtualhubs' | extend compliant = isnotnull(properties.azureFirewall.id) | project id, compliant",
-            "guid": "7d5d1e4e-6146-458d-9558-fd77249b8211",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/howto-firewall",
-            "service": "VWAN",
+            "checklist": "SAP Checklist",
+            "guid": "7f684ebc-95da-425e-b329-e782dbed050f",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-rhel-with-hana-ascs-ers-dialog-instance",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For outbound Internet traffic protection and filtering, deploy Azure Firewall in secured hubs.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-networking-infrastructure/",
-            "waf": "Security"
+            "text": "Azure supports installing and configuring SAP HANA and ASCS/SCS and ERS instances on the same high availability cluster running on Red Hat Enterprise Linux (RHEL).",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "6667313b-4f56-464b-9e98-4a859c773e7d",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/migrate-from-hub-spoke-topology",
-            "service": "VWAN",
-            "severity": "Medium",
-            "text": "Ensure that your virtual WAN network architecture aligns to an identified architecture scenario.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
+            "checklist": "SAP Checklist",
+            "guid": "07991f7d-6598-4d90-9431-45c62605d3a5",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-guide-storage",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Run all production systems on Premium managed SSDs and use Azure NetApp Files or Ultra Disk Storage. At least the OS disk should be on the Premium tier so you can achieve better performance and the best SLA.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-storage/?source=recommendations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "261623a7-65a9-417e-8f34-8ef254c27d42",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/azure-monitor-insights",
-            "service": "VWAN",
-            "severity": "Medium",
-            "text": "Use Azure Monitor Insights for Virtual WAN to monitor the end-to-end topology of the Virtual WAN, status, and key metrics.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
-            "waf": "Operations"
+            "checklist": "SAP Checklist",
+            "guid": "73cdaecc-7d74-48d8-a040-88416eebc98c",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-operations-storage",
+            "service": "SAP",
+            "severity": "High",
+            "text": "You should run SAP HANA on Azure only on the types of storage that are certified by SAP. Note that certain volumes must be run on certain disk configurations, where applicable. These configurations include enabling Write Accelerator and using Premium storage. You also need to ensure that the file system that runs on storage is compatible with the DBMS that runs on the machine.",
+            "training": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-premium-ssd-v1?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources| where type =~ 'microsoft.network/virtualwans' | extend compliant= (properties.allowBranchToBranchTraffic == 'true') | distinct id,compliant",
-            "guid": "727c77e1-b9aa-4a37-a024-129d042422c1",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-faq#is-branch-to-branch-connectivity-allowed-in-virtual-wan",
-            "service": "VWAN",
-            "severity": "Medium",
-            "text": "Do not disable branch-to-branch traffic in Virtual WAN, unless these flows should be explicitly blocked.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
+            "checklist": "SAP Checklist",
+            "guid": "51904867-a70e-4fa0-b4ff-3e6292846d7c",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/disaster-recovery-overview-guide#storage",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Consider configuring high availability depending on the type of storage you use for your SAP workloads. Some storage services available in Azure are not supported by Azure Site Recovery, so your high availability configuration may differ.",
+            "training": "https://learn.microsoft.com/training/modules/implement-disaster-recovery-for-sap-workloads-azure/2-explore-disaster-recovery-sap-workloads",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'microsoft.network/virtualhubs'| extend compliant= (properties.hubRoutingPreference =~ 'ASPath') | distinct id,compliant",
-            "guid": "d49ac006-6670-4bc9-9948-d3e0a3a94f4d",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/about-virtual-hub-routing-preference",
-            "service": "VWAN",
-            "severity": "Medium",
-            "text": "Use AS-Path as hub routing preference, since it is more flexible than ExpressRoute or VPN.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
+            "checklist": "SAP Checklist",
+            "guid": "1ac2d928-c9b7-42c6-ba18-23b1aea78693",
+            "link": "https://azure.microsoft.com/ja-jp/explore/global-infrastructure/products-by-region/",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Different native Azure storage services (like Azure Files, Azure NetApp Files, Azure Shared Disk) may not be available in all regions. So to have similar SAP setup on the DR region after failover, ensure the respective storage service is offered in DR site.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "2586b854-237e-47f1-84a1-d45d4cd2310d",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/about-virtual-hub-routing#labels",
-            "service": "VWAN",
+            "checklist": "SAP Checklist",
+            "guid": "925d1f8c-01f3-4a67-948e-aabf0a1fad60",
+            "link": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/optimize-your-azure-costs-by-automating-sap-system-start-stop/ba-p/2120675",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Configure label-based propagation in Virtual WAN, otherwise connectivity between virtual hubs will be impaired.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
-            "waf": "Reliability"
+            "text": "Automate SAP System Start-Stop to manage costs.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "microsoft.network/virtualWans",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources | where type =~ 'microsoft.network/virtualhubs' | extend addressSpace = properties.addressPrefix | extend compliant= (toint(substring(addressSpace, indexof(addressSpace, '/') + 1)) < 23) | distinct name, id, compliant",
-            "guid": "9c75dfef-573c-461c-a698-68598595581a",
-            "link": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-faq#what-is-the-recommended-hub-address-space-during-hub-creation",
-            "service": "VWAN",
-            "severity": "High",
-            "text": "Assign at least a /23 prefix to virtual hubs to ensure enough IP space is available.",
-            "training": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "71dc00cd-4392-4262-8949-20c05e6c0333",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-premium-ssd-v1",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "In the case of using Azure Premium Storage with SAP HANA, Azure Standard SSD storage can be used to select a cost-conscious storage solution. However, please note that choosing Standard SSD or Standard HDD Azure storage will affect the SLA of the individual VMs. Also, for systems with lower I/O throughput and low latency, such as non-production environments, lower series VMs can be used.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5c986cb2-9131-456a-8247-6e49f541acdc",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "9877f353-2591-4e8b-8381-e9043fed1010",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/hana-vm-premium-ssd-v1",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "As a lower-cost alternative configuration (multipurpose), you can choose a low-performance SKU for your non-production HANA database server VMs. However, it is important to note that some VM types, such as E-series, are not HANA certified (SAP HANA Hardware Directory) or cannot achieve storage latency of less than 1ms.",
+            "waf": "Cost"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "graph": "resources | where type =~ 'microsoft.aad/domainservices' | extend replicaSets = properties.replicaSets | where array_length(replicaSets) < 2 | project name=name, id=id, tags=tags, param1=strcat('replicaSetLocation:', replicaSets[0].location)",
+            "guid": "fda1dbf3-dc95-4d48-a7c7-91dca0f6c565",
+            "link": "https://learn.microsoft.com/azure/well-architected/sap/design-areas/security",
+            "service": "SAP",
             "severity": "High",
-            "text": "Leverage Azure Policy strategically, define controls for your environment, using Policy Initiatives to group related policies.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "text": "Enforce a RBAC model for management groups, subscriptions, resource groups and resources",
+            "training": "https://learn.microsoft.com/training/paths/implement-resource-mgmt-security/",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "d8a2adb1-17d6-4326-af62-5ca44e5695f2",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "45911475-e39e-4530-accc-d979366bcda2",
+            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/scenario-azure-first-sap-identity-integration",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Map regulatory and compliance requirements to Azure Policy definitions and Azure role assignments.",
-            "training": "https://learn.microsoft.com/training/modules/governance-security/",
+            "text": "Enforce Principal propagation for forwarding the identity from SAP cloud application to SAP on-premises (Including IaaS) through cloud connector",
+            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/2-explore-azure-virtual-machine-auth-access-control",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "223ace8c-b123-408c-a501-7f154e3ab369",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "750ab1ab-039d-495d-94c7-c8929cb107d5",
+            "link": "https://learn.microsoft.com/azure/active-directory/fundamentals/scenario-azure-first-sap-identity-integration",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Establish Azure Policy definitions at the intermediate root management group so that they can be assigned at inherited scopes.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "text": "Implement SSO to SAP SaaS applications like SAP Analytics Cloud, SAP Cloud Platform, Business by design, SAP Qualtrics and SAP C4C with Azure AD using SAML.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "3829e7e3-1618-4368-9a04-77a209945bda",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Policy",
-            "severity": "High",
-            "text": "Manage policy assignments at the highest appropriate level with exclusions at bottom levels, if required.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "checklist": "SAP Checklist",
+            "guid": "325ae525-ba34-4d46-a5e2-213ace7bb122",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-netweaver-tutorial",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Implement SSO to SAP NetWeaver-based web applications like SAP Fiori and SAP Web GUI by using SAML.",
+            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/8-exercise-integrate-azure-active-directory-sap-netweaver",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "43334f24-9116-4341-a2ba-527526944008",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/mcsb-asset-management#am-2-use-only-approved-services",
-            "service": "Policy",
-            "severity": "Low",
-            "text": "Use Azure Policy to control which services users can provision at the subscription/management group level.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "checklist": "SAP Checklist",
+            "guid": "9eb54dad-7861-4e1c-973a-f3bb003fc9c1",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Implement SSO to SAP NetWeaver-based web applications like SAP Fiori and SAP Web GUI by using SAML.",
+            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/6-exercise-integrate-azure-active-directory-sap-fiori",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "be7d7e48-4327-46d8-adc0-55bcf619e8a1",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Policy",
-            "severity": "High",
-            "text": "Use built-in policies where possible to minimize operational overhead.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "checklist": "SAP Checklist",
+            "guid": "f29676ef-0c9c-4c4d-ab21-a55504c0c829",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-netweaver-tutorial",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "You can implement SSO to SAP GUI by using SAP NetWeaver SSO or a partner solution.",
+            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/8-exercise-integrate-azure-active-directory-sap-netweaver",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "description": "Assigning the Resource Policy Contributor role to specific scopes allows you to delegate policy management to relevant teams. For instance, a central IT team may oversee management group-level policies, while application teams handle policies for their subscriptions, enabling distributed governance with adherence to organizational standards.",
-            "guid": "3f988795-25d6-4268-a6d7-0ba6c97be995",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview#azure-rbac-permissions-in-azure-policy",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "23181aa4-1742-4694-9ff8-ae7d7d474317",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Assign the built-in Resource Policy Contributor role at a particular scope to enable application-level governance.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "text": "For SSO for SAP GUI and web browser access, implement SNC / Kerberos/SPNEGO (simple and protected GSSAPI negotiation mechanism) due to its ease of configuration and maintenance. For SSO with X.509 client certificates, consider the SAP Secure Login Server, which is a component of the SAP SSO solution.",
+            "training": "https://learn.microsoft.com/training/modules/explore-identity-services/9-exercise-integrate-active-directory-sap-single-sign-on",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "19048384-5c98-46cb-8913-156a12476e49",
-            "link": "https://learn.microsoft.com/azure/governance/policy/overview",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "6c8bcbf4-5bbe-4609-b8a0-3e97778424d6",
+            "link": "https://blogs.sap.com/2017/07/12/sap-single-sign-on-protect-your-sap-landscape-with-x.509-certificates/",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Limit the number of Azure Policy assignments made at the root management group scope to avoid managing through exclusions at inherited scopes.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-policy/",
+            "text": "For SSO for SAP GUI and web browser access, implement SNC / Kerberos/SPNEGO (simple and protected GSSAPI negotiation mechanism) due to its ease of configuration and maintenance. For SSO with X.509 client certificates, consider the SAP Secure Login Server, which is a component of the SAP SSO solution.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5a917e1f-348e-4f25-9c27-d42e8bbac757",
-            "link": "https://learn.microsoft.com/industry/release-plan/2023wave2/cloud-sovereignty/enable-data-sovereignty-policy-baseline",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "16785d6f-a96c-496a-b885-18f482734c88",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-netweaver-tutorial#configure-sap-netweaver-for-oauth",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "If any data sovereignty requirements exist, Azure Policies should be deployed to enforce them.",
-            "training": "https://learn.microsoft.com/learn/paths/secure-your-cloud-data/",
+            "text": "Implement SSO by using OAuth for SAP NetWeaver to allow third-party or custom applications to access SAP NetWeaver OData services.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "78b22132-b41c-460b-a4d3-df8f73a67dc2",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/sovereign-landing-zone",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "a747c350-8d4c-449c-93af-393dbca77c48",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/saphana-tutorial",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For Sovereign Landing Zone, deploy sovereignty policy baseline and assign at correct management group level.",
+            "text": "Implement SSO to SAP HANA",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "caeea0e9-1024-41df-a52e-d99c3f22a6f4",
-            "link": "https://learn.microsoft.com/industry/sovereignty/policy-portfolio-baseline",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "c7bae5bf-daf9-4761-9c56-f92891890aa4",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/rise-integration#connectivity-with-sap-rise",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For Sovereign Landing Zone, document Sovereign Control objectives to policy mapping.",
+            "text": "Consider Azure AD an identity provider for SAP systems hosted on RISE. For more information, see Integrating the Service with Azure AD.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Authorization/policyDefinitions",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "9b461617-db7b-4399-8ac6-d4eb7153893a",
-            "link": "https://learn.microsoft.com/industry/sovereignty/policy-portfolio-baseline#sovereignty-baseline-policy-initiatives",
-            "service": "Policy",
+            "checklist": "SAP Checklist",
+            "guid": "e4e48226-ce54-44b6-bb6b-bfa15bd8f753",
+            "link": "https://github.com/azuredevcollege/SAP/blob/master/sap-oauth-saml-flow/README.md",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For Sovereign Landing Zone, ensure process is in place for management of 'Sovereign Control objectives to policy mapping'.",
+            "text": "For applications that access SAP, you might want to use principal propagation to establish SSO.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "67e7a8ed-4b30-4e38-a3f2-9812b2363cef",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-monitor/logs/workspace-design#azure-regions",
-            "service": "Monitor",
+            "checklist": "SAP Checklist",
+            "guid": "59921095-4980-4fc1-a5b6-524a5a560c79",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-hana-cloud-platform-identity-authentication-tutorial",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use a single monitor logs workspace to manage platforms centrally except where Azure role-based access control (Azure RBAC), data sovereignty requirements, or data retention policies mandate separate workspaces.",
-            "training": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
-            "waf": "Operations"
+            "text": "If you're using SAP BTP services or SaaS solutions that require SAP Identity Authentication Service (IAS), consider implementing SSO between SAP Cloud Identity Authentication Services and Azure AD to access those SAP services. This integration lets SAP IAS act as a proxy identity provider and forwards authentication requests to Azure AD as the central user store and identity provider.",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "7418ada9-4199-4c28-8286-d15e9433e8f3",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
-            "service": "Monitor",
+            "checklist": "SAP Checklist",
+            "guid": "a709c664-317e-41e4-9e34-67d9016a86f4",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-hana-cloud-platform-tutorial",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Decide whether to use a single Azure Monitor Logs workspace for all regions or to create multiple workspaces to cover various geographical regions. Each approach has advantages and disadvantages, including potential cross-region networking charges",
-            "training": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
-            "waf": "Reliability"
+            "text": "Implement SSO to SAP BTP",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5e6c4cfd-3e50-4454-9c24-47ec66138a72",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/data-retention-archive?tabs=portal-1%2Cportal-2#how-retention-and-archiving-work",
-            "service": "Monitor",
-            "severity": "High",
-            "text": "Export logs to Azure Storage if your log retention requirements exceed twelve years. Use immutable storage with a write-once, read-many policy to make data non-erasable and non-modifiable for a user-specified interval.",
-            "training": "https://learn.microsoft.com/learn/paths/architect-infrastructure-operations/",
+            "checklist": "SAP Checklist",
+            "guid": "01f11b7f-38df-4251-9c76-4dec19abd3e8",
+            "link": "https://learn.microsoft.com/azure/active-directory/saas-apps/sap-successfactors-inbound-provisioning-cloud-only-tutorial",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "If you're using SAP SuccessFactors, consider using the Azure AD automated user provisioning. With this integration, as you add new employees to SAP SuccessFactors, you can automatically create their user accounts in Azure AD. Optionally, you can create user accounts in Microsoft 365 or other SaaS applications that are supported by Azure AD. Use write-back of the email address to SAP SuccessFactors.",
+            "waf": "Security"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "description": "Keep your management group hierarchy reasonably flat, no more than four.",
+            "graph": "resourcecontainers| where type =~ 'microsoft.resources/subscriptions'| extend ManagementGroup = tostring(tags),mgmtChain = properties.managementGroupAncestorsChain| extend compliant =( array_length(mgmtChain) <= 4 and array_length(mgmtChain) > 1)",
+            "guid": "6ba28021-4591-4147-9e39-e5309cccd979",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/resource-org-management-groups",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "enforce existing Management Group policies to SAP Subscriptions",
+            "training": "https://learn.microsoft.com/training/modules/enterprise-scale-organization/4-management-group-subscription-organization",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "e7d7e484-3276-4d8b-bc05-5bcf619e8a13",
-            "link": "https://learn.microsoft.com/azure/governance/machine-configuration/overview",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Monitor OS level virtual machine (VM) configuration drift using Azure Policy. Enabling Azure Automanage Machine Configuration audit capabilities through policy helps application team workloads to immediately consume feature capabilities with little effort.",
-            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "checklist": "SAP Checklist",
+            "graph": "Resources | summarize count()",
+            "guid": "366bcda2-750a-4b1a-a039-d95d54c7c892",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-whole-landscape",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Integrate tightly coupled applications into the same SAP subscription to avoid additional routing and management complexity",
+            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/resource-org-subscriptions",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "f9887952-5d62-4688-9d70-ba6c97be9951",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#update-management-considerations",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Use Azure Update Manager as a patching mechanism for Windows and Linux VMs in Azure.",
-            "training": "https://learn.microsoft.com/azure/update-manager/overview?tabs=azure-vms",
+            "checklist": "SAP Checklist",
+            "graph": "Resources | where type contains 'publicIPAddresses' and isnotempty(properties.ipAddress) | summarize count () by subscriptionId",
+            "guid": "9cb107d5-325a-4e52-9ba3-4d4685e2213a",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-whole-landscape",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Leverage Subscription as scale unit and scaling our resources, consider deploying subscription per environment eg. Sandbox, non-prod, prod ",
+            "training": "https://learn.microsoft.com/training/modules/configure-subscriptions/?source=recommendations",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "c806c048-26b7-4ddf-b4c2-b4f0c476925d",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#update-management-considerations ",
-            "service": "VM",
-            "severity": "Medium",
-            "text": "Use Azure Update Manager as a patching mechanism for Windows and Linux VMs outside of Azure using Azure Arc.",
-            "training": "https://learn.microsoft.com/azure/update-manager/overview?tabs=azure-vms",
+            "checklist": "SAP Checklist",
+            "graph": "QuotaResources | where type =~ 'microsoft.compute/locations/usages' | where subscriptionId in~ ('<Subscription1>','<Subscription2>') | mv-expand json = properties.value limit 400 | extend usagevCPUs = json.currentValue, QuotaLimit = json['limit'], quotaName = tostring(json['name'].localizedValue) | extend usagePercent = toint(usagevCPUs)*100 / toint(QuotaLimit) |where quotaName =~ 'Total Regional vCPUs' or quotaName =~ 'Total Regional Low-priority vCPUs' |project subscriptionId,quotaName,usagevCPUs,QuotaLimit,usagePercent,location,['json'] | order by ['usagePercent'] desc",
+            "guid": "ce7bb122-f7c9-45f0-9e15-4e3aa3592829",
+            "link": "https://learn.microsoft.com/azure/quotas/quotas-overview",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Ensure quota increase as a part of subscription provisioning (e.g. total available VM cores within a subscription)",
+            "training": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.network/networkWatchers",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "90483845-c986-4cb2-a131-56a12476e49f",
-            "link": "https://learn.microsoft.com/azure/network-watcher/network-watcher-monitoring-overview",
-            "service": "Network Watcher",
-            "severity": "Medium",
-            "text": "Use Network Watcher to proactively monitor traffic flows.",
-            "training": "https://learn.microsoft.com/learn/modules/configure-network-watcher/",
+            "checklist": "SAP Checklist",
+            "guid": "ce4fab2f-433a-4d59-a5a9-3d1032e03ebc",
+            "link": "https://learn.microsoft.com/rest/api/reserved-vm-instances/quotaapi?branch=capacity",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "The Quota API is a REST API that you can use to view and manage quotas for Azure services. Consider using it if necessary.",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "6944008b-e7d7-4e48-9327-6d8bdc055bcf",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-setup-guide/monitoring-reporting?tabs=AzureMonitor",
-            "service": "Monitor",
-            "severity": "Medium",
-            "text": "Use Azure Monitor Logs for insights and reporting.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-monitor/",
+            "checklist": "SAP Checklist",
+            "guid": "cbfad17b-f240-42bf-a1d8-f4f4cee661c8",
+            "link": "https://learn.microsoft.com/azure/quotas/quickstart-increase-quota-portal",
+            "service": "SAP",
+            "severity": "High",
+            "text": "If deploying to an availability zone, ensure that the VM's zone deployment is available once the quota has been approved. Submit a support request with the subscription, VM series, number of CPUs and availability zone required.",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "97be9951-9048-4384-9c98-6cb2913156a1",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/alerts/alerts-overview",
-            "service": "Monitor",
-            "severity": "Medium",
-            "text": "Use Azure Monitor alerts for the generation of operational alerts.",
-            "training": "https://learn.microsoft.com/training/modules/incident-response-with-alerting-on-azure/",
+            "checklist": "SAP Checklist",
+            "guid": "e6e20617-3686-4af4-9791-f8935ada4332",
+            "link": "https://azure.microsoft.com/explore/global-infrastructure/products-by-region/",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Ensure required services and features are available within the chosen deployment regions eg. ANF , Zone etc.",
+            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/migrate/azure-best-practices/multiple-regions?source=recommendations",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "fed3c55f-a67e-4875-aadd-3aba3f9fde31",
-            "link": "https://learn.microsoft.com/azure/automation/how-to/region-mappings",
-            "service": "Monitor",
+            "checklist": "SAP Checklist",
+            "graph": "resources | extend compliant = isnotnull(['tags']) | project name, id, subscriptionId, resourceGroup, tags, compliant",
+            "guid": "4e138115-2318-41aa-9174-26943ff8ae7d",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-resource-organization",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "When using Change and Inventory Tracking via Azure Automation Accounts, ensure that you have selected supported regions for linking your Log Analytics workspace and automation accounts together.",
-            "training": "https://learn.microsoft.com/training/modules/explore-azure-automation-devops/",
+            "text": "Leverage Azure resource tag for cost categorization and resource grouping (: BillTo, Department (or Business Unit), Environment (Production, Stage, Development), Tier (Web Tier, Application Tier), Application Owner, ProjectName)",
+            "training": "https://learn.microsoft.com/training/paths/implement-resource-mgmt-security/",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "eba8cf22-45c6-4dc1-9b57-2cceb3b97ce5",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-redundancy",
-            "service": "Backup",
-            "severity": "Low",
-            "text": "When using Azure Backup, use the correct backup types (GRS, ZRS & LRS) for your backup, as the default setting is GRS.",
-            "training": "https://learn.microsoft.com/training/modules/design-solution-for-backup-disaster-recovery/",
+            "checklist": "SAP Checklist",
+            "guid": "2f7c95f0-6e15-44e3-aa35-92829e6e2061",
+            "link": "https://learn.microsoft.com/azure/backup/sap-hana-database-about",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Help protect your HANA database by using the Azure Backup service.",
+            "training": "https://learn.microsoft.com/training/modules/implement-azure-backup-sap-workloads-azure-virtual-machines/?source=recommendations",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "f541acdc-e979-4377-acdb-3751ab2ab13a",
-            "link": "https://learn.microsoft.com/azure/governance/policy/concepts/guest-configuration",
-            "service": "VM",
+            "checklist": "SAP Checklist",
+            "guid": "302a2fbf-3745-4a5f-a365-c9d1a16ca22c",
+            "link": "https://learn.microsoft.com/azure/azure-netapp-files/azacsnap-introduction",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Azure guest policies to automatically deploy software configurations through VM extensions and enforce a compliant baseline VM configuration.",
-            "waf": "Security"
+            "text": "If you deploy Azure NetApp Files for your HANA, Oracle, or DB2 database, use the Azure Application Consistent Snapshot tool (AzAcSnap) to take application-consistent snapshots. AzAcSnap also supports Oracle databases. Consider using AzAcSnap on a central VM rather than on individual VMs.",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "description": "Use Azure Policy's guest configuration features  to audit and remediate machine settings (e.g., OS, application, environment) to ensure resources align with expected configurations, and Update Management can enforce patch management for VMs.",
-            "guid": "da6e55d7-d8a2-4adb-817d-6326af625ca4",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-operational-compliance#monitoring-for-configuration-drift",
-            "service": "VM",
+            "checklist": "SAP Checklist",
+            "guid": "42d37218-a3a7-45df-bff6-1173e7f249ea",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-management-and-monitoring",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Ensure time-zone matches between the operating system and the SAP system.",
+            "waf": "Operations"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "guid": "c3c7abc0-716c-4486-893c-40e181d65539",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-rhel-multi-sid",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Monitor VM security configuration drift via Azure Policy.",
-            "training": "https://learn.microsoft.com/training/paths/implement-resource-mgmt-security/",
-            "waf": "Security"
+            "text": "Don't group different application services in the same cluster. For example, don't combine DRBD and central services clusters on the same cluster. However, you can use the same Pacemaker cluster to manage approximately five different central services (multi-SID cluster).",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "2476e49f-541a-4cdc-b979-377bcdb3751a",
-            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-overview",
-            "service": "VM",
+            "checklist": "SAP Checklist",
+            "guid": "a491dfc4-9353-4213-9217-eef0949f9467",
+            "link": "https://azure.microsoft.com/pricing/offers/dev-test/",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "Consider running dev/test systems in a snooze model to save and optimize Azure run costs.",
+            "waf": "Cost"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "guid": "b7056168-6199-4732-a514-cdbb2d5c9c54",
+            "link": "https://learn.microsoft.com/azure/lighthouse/overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Azure Site Recovery for Azure-to-Azure Virtual Machines disaster recovery scenarios. This enables you to replicate workloads across regions.",
-            "training": "https://learn.microsoft.com/training/modules/protect-infrastructure-with-site-recovery/",
+            "text": "If you partner with customers by managing their SAP estates, consider Azure Lighthouse. Azure Lighthouse allows managed service providers to use Azure native identity services to authenticate to the customers' environment. It puts the control in the hands of customers, because they can revoke access at any time and audit service providers' actions.",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.RecoveryServices/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "f625ca44-e569-45f2-823a-ce8cb12308ca",
-            "link": "https://learn.microsoft.com/azure/backup/backup-center-overview",
-            "service": "Backup",
+            "checklist": "SAP Checklist",
+            "guid": "4d116785-d2fa-456c-96ad-48408fe72734",
+            "link": "https://learn.microsoft.com/azure/update-manager/scheduled-patching?tabs=schedule-updates-single-machine%2Cschedule-updates-scale-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Azure-native backup capabilities, or an Azure-compatible, 3rd-party backup solution.",
-            "training": "https://learn.microsoft.com/training/modules/design-solution-for-backup-disaster-recovery/",
+            "text": "Use Azure Update Manager to check the status of available updates for a single VM or multiple VMs and consider scheduling regular patching.",
+            "training": "https://learn.microsoft.com/training/modules/keep-your-virtual-machines-updated/?source=recommendations",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "89cc5e11-aa4d-4c3b-893d-feb99215266a",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#add-diagnostic-settings-to-save-your-wafs-logs",
-            "service": "WAF",
-            "severity": "High",
-            "text": "Add diagnostic settings to save WAF logs from application delivery services like Azure Front Door and Azure Application Gateway. Regularly review the logs to check for attacks and for false positive detections.",
-            "training": "https://learn.microsoft.com/training/modules/capture-application-logs-app-service/",
+            "checklist": "SAP Checklist",
+            "guid": "76c8bcbf-45bb-4e60-ad8a-03e97778424d",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/lama-installation",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "Optimize and manage SAP Basis operations by using SAP Landscape Management (LaMa). Use the SAP LaMa connector for Azure to relocate, copy, clone, and refresh SAP systems.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-remote-management/?source=recommendations",
             "waf": "Operations"
         },
         {
-            "arm-service": "microsoft.network/frontdoorwebApplicationFirewalls",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "7f408960-c626-44cb-a018-347c8d790cdf",
-            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/waf-front-door-best-practices#send-logs-to-microsoft-sentinel",
-            "service": "WAF",
+            "checklist": "SAP Checklist",
+            "guid": "14591147-5e39-4e53-89cc-cd979366bcda",
+            "link": "https://learn.microsoft.com/azure/sap/monitor/about-azure-monitor-sap-solutions",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Send WAF logs from your application delivery services like Azure Front Door and Azure Application Gateway to Microsoft Sentinel. Detect attacks and integrate WAF telemetry into your overall Azure environment.",
-            "training": "https://learn.microsoft.com/training/paths/sc-200-connect-logs-to-azure-sentinel/",
+            "text": "Use Azure Monitor for SAP solutions to monitor your SAP workloads(SAP HANA, high-availability SUSE clusters, and SQL systems) on Azure. Consider supplementing Azure Monitor for SAP solutions with SAP Solution Manager.",
+            "training": "https://learn.microsoft.com/training/modules/implement-azure-monitoring-sap-workloads-azure-virtual-machines/?source=recommendations",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "5017f154-e3ab-4369-9829-e7e316183687",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/overview",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "2750ab1a-b039-4d95-b54c-7c8929cb107d",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/vm-extension-for-sap",
+            "service": "SAP",
             "severity": "High",
-            "text": "Use Azure Key Vault to store your secrets and credentials.",
-            "training": "https://learn.microsoft.com/training/modules/implement-azure-key-vault/",
-            "waf": "Security"
+            "text": "Run a VM Extension for SAP check. VM Extension for SAP uses the assigned managed identity of a virtual machine (VM) to access VM monitoring and configuration data. The check ensures that all performance metrics in your SAP application come from the underlying Azure Extension for SAP.",
+            "training": "https://learn.microsoft.com/training/modules/configure-azure-enhanced-monitoring-extension-for-sap/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "graph": "ResourceContainers | where type=='microsoft.resources/subscriptions'| parse id with '/subscriptions/' SubscriptionID| project subscriptionId, SubscriptionName = name| join kind=leftouter (Resources| where type == 'microsoft.keyvault/vaults'| project id, name, subscriptionId) on subscriptionId| join kind= leftouter (Resources| where type == 'microsoft.keyvault/vaults'| summarize ResourceCount = count() by subscriptionId) on subscriptionId| extend RCount = iff(isnull(ResourceCount), 0, ResourceCount)| project-away ResourceCount| extend compliant = (RCount <> 1)",
-            "guid": "a0477a20-9945-4bda-9333-4f2491163418",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/overview-throttling",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "5325ae52-5ba3-44d4-985e-2213ace7bb12",
+            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use different Azure Key Vaults for different applications, environments and regions to avoid transaction scale limits and restrict access to secrets.",
-            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
-            "waf": "Security"
+            "text": "Use Azure Policy for access control and compliance reporting. Azure Policy provides the ability to enforce organization-wide settings to ensure consistent policy adherence and fast violation detection. ",
+            "training": "https://learn.microsoft.com/learn/paths/architect-infrastructure-operations/",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "2ba52752-6944-4008-ae7d-7e4843276d8b",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "523181aa-4174-4269-93ff-8ae7d7d47431",
+            "link": "https://learn.microsoft.com/azure/network-watcher/connection-monitor-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Provision Azure Key Vault with the soft delete and purge policies enabled to allow retention protection for deleted objects.",
-            "training": "https://learn.microsoft.com/training/modules/implement-azure-key-vault/",
-            "waf": "Security"
+            "text": "Use Connection Monitor in Azure Network Watcher to monitor latency metrics for SAP databases and application servers. Or collect and display network latency measurements by using Azure Monitor.",
+            "training": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/collecting-and-displaying-niping-network-latency-measurements/ba-p/1833979",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "dc055bcf-619e-48a1-9f98-879525d62688",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "73686af4-6791-4f89-95ad-a43324e13811",
+            "link": "https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/QualityCheck",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Follow a least privilege model by limiting authorization to permanently delete keys, secrets, and certificates to specialized custom Microsoft Entra ID roles.",
-            "training": "https://learn.microsoft.com/training/modules/implement-azure-key-vault/",
-            "waf": "Security"
+            "text": "Perform a quality check for SAP HANA on the provisioned Azure infrastructure to verify that provisioned VMs comply with SAP HANA on Azure best practices.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "6d70ba6c-97be-4995-8904-83845c986cb2",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
-            "severity": "Medium",
-            "text": "Automate the certificate management and renewal process with public certificate authorities to ease administration.",
-            "training": "https://learn.microsoft.com/en-us/training/modules/configure-and-manage-azure-key-vault/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "616785d6-fa96-4c96-ad88-518f482734c8",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-zones",
+            "service": "SAP",
+            "severity": "High",
+            "text": "For each Azure subscription, run a latency test on Azure availability zones before zonal deployment to choose low-latency zones for deployment of SAP on Azure.",
+            "training": "https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/AvZone-Latency-Test",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "913156a1-2476-4e49-b541-acdce979377b",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "410adcba-db46-424f-a6c4-05ecde75c52e",
+            "link": "https://learn.microsoft.com/azure/advisor/advisor-how-to-improve-reliability",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Establish an automated process for key and certificate rotation.",
-            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
-            "waf": "Security"
+            "text": "Run the Resiliency Report to ensure that the configuration of the entire provisioned Azure infrastructure (Compute, Database, Networking, Storage, Site Recovery) complies with the configuration defined by Cloud Adaption Framework for Azure.",
+            "training": "https://learn.microsoft.com/training/paths/azure-well-architected-framework/",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "cdb3751a-b2ab-413a-ba6e-55d7d8a2adb1",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "86ba2802-1459-4114-95e3-9e5309cccd97",
+            "link": "https://learn.microsoft.com/azure/sentinel/sap/deployment-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Enable firewall and virtual network service endpoint or private endpoint on the vault to control access to the key vault.",
-            "training": "https://learn.microsoft.com/training/modules/design-implement-private-access-to-azure-services/",
+            "text": "Implement threat protection by using the Microsoft Sentinel solution for SAP. Use this solution to monitor your SAP systems and detect sophisticated threats throughout the business logic and application layers.",
+            "training": "https://learn.microsoft.com/training/modules/plan-microsoft-sentinel-deployment-sap/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "17d6326a-f625-4ca4-9e56-95f2223ace8c",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/monitor-key-vault",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "graph": "resources | extend compliant = isnotnull(['tags']) | project name, id, subscriptionId, resourceGroup, tags, compliant",
+            "guid": "579266bc-ca27-45fa-a1ab-fe9d55d04c3c",
+            "link": "https://learn.microsoft.com/azure/cost-management-billing/costs/enable-tag-inheritance",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use the platform-central Azure Monitor Log Analytics workspace to audit key, certificate, and secret usage within each instance of Key Vault.",
-            "training": "https://learn.microsoft.com/training/modules/analyze-infrastructure-with-azure-monitor-logs/",
-            "waf": "Security"
+            "text": "Azure tagging can be leveraged to logically group and track resources, automate their deployments, and most importantly, provide visibility on the incurred costs.",
+            "training": "https://learn.microsoft.com/training/modules/analyze-costs-create-budgets-azure-cost-management/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b12308ca-5017-4f15-9e3a-b3693829e7e3",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
-            "severity": "Medium",
-            "text": "Delegate Key Vault instantiation and privileged access and use Azure Policy to enforce a consistent compliant configuration.",
-            "training": "https://learn.microsoft.com/training/modules/configure-azure-key-vault-networking-settings/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "04b8e5e5-13cb-4b22-af62-5a8ecfcf0337",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-test-latency?tabs=windows",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "Use inter-VM latency monitoring for latency-sensitive applications.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "25d62688-6d70-4ba6-a97b-e99519048384",
-            "link": "https://learn.microsoft.com/azure/key-vault/general/best-practices",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "07e5ed53-3d96-43d8-87ea-631b77da5aba",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-guide-storage",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "If you want to bring your own keys, this might not be supported across all considered services. Implement relevant mitigation so that inconsistencies don't hinder desired outcomes. Choose appropriate region pairs and disaster recovery regions that minimize latency.",
-            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
-            "waf": "Security"
+            "text": "Use Azure Site Recovery monitoring to maintain the health of the disaster recovery service for SAP application servers.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-storage/?source=recommendations",
+            "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "4ac6b67c-b3a4-4ff9-8e87-b07a7ce7bbdb",
-            "link": "https://learn.microsoft.com/industry/sovereignty/key-management",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "guid": "abb6af9c-982c-4cf1-83fb-329fafd1ee56",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-management-and-monitoring",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For Sovereign Landing Zone, use Azure Key Vault managed HSM to store your secrets and credentials.",
-            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/",
-            "waf": "Security"
+            "text": "Exclude all the database file systems and executable programs from antivirus scans. Including them could lead to performance problems. Check with the database vendors for prescriptive details on the exclusion list. For example, Oracle recommends excluding /oracle/<sid>/sapdata from antivirus scans.",
+            "waf": "Performance"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "4e5695f2-223a-4ce8-ab12-308ca5017f15",
-            "link": "https://learn.microsoft.com/azure/active-directory/reports-monitoring/overview-reports",
-            "service": "Entra",
-            "severity": "Medium",
-            "text": "Use Microsoft Entra ID reporting capabilities to generate access control audit reports.",
-            "training": "https://learn.microsoft.com/training/modules/monitor-report-aad-security-events/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "c027f893-f404-41a9-b33d-39d625a14964",
+            "link": "https://sapit-forme-prod.authentication.eu11.hana.ondemand.com/login",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "Consider collecting full database statistics for non-HANA databases after migration. For example, implement SAP note 1020260 - Delivery of Oracle statistics.",
+            "waf": "Performance"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "09945bda-4333-44f2-9911-634182ba5275",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/concept-cloud-security-posture-management",
-            "service": "Defender",
-            "severity": "High",
-            "text": "Enable Defender Cloud Security Posture Management for all subscriptions.",
-            "training": "https://learn.microsoft.com/training/modules/microsoft-defender-cloud-security-posture/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "fdafb1f5-3eee-4354-a8c9-deb8127ebc2e",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/workloads/oracle/configure-oracle-asm",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Consider using Oracle Automatic Storage Management (ASM) for all Oracle deployments that use SAP on Azure.",
+            "training": "https://learn.microsoft.com/training/paths/administer-infrastructure-resources-in-azure/?source=recommendations",
+            "waf": "Performance"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "36a72a48-fffe-4c40-9747-0ab5064355ba",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/plan-defender-for-servers-select-plan",
-            "service": "Defender",
-            "severity": "High",
-            "text": "Enable a Defender Cloud Workload Protection Plan for Servers on all subscriptions.",
-            "training": "https://learn.microsoft.com/training/modules/understand-azure-defender-cloud-workload-protection/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "33c5d5bf-daf3-4f0d-bd50-6010fdcec22e",
+            "link": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/announcement-sap-on-azure-oracle-performance-efficiency-scripts/ba-p/3725178",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "For SAP on Azure running Oracle, a collection of SQL scripts can help you diagnose performance problems.  Automatic Workload Repository (AWR) reports contain valuable information for diagnosing problems in the Oracle system. We recommend that you run an AWR report during several sessions and choose peak times for it, to ensure broad coverage for the analysis.",
+            "training": "https://learn.microsoft.com/ja-jp/azure/well-architected/oracle-iaas/performance-efficiency",
+            "waf": "Performance"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "77425f48-ecba-43a0-aeac-a3ac733ccc6a",
-            "link": "https://learn.microsoft.com/azure/defender-for-cloud/connect-azure-subscription",
-            "service": "Defender",
+            "checklist": "SAP Checklist",
+            "guid": "d89fd98d-23e4-4b40-a92e-32db9365522c",
+            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-monitor-and-troubleshoot",
+            "service": "SAP",
             "severity": "High",
-            "text": "Enable Defender Cloud Workload Protection Plans for Azure Resources on all subscriptions.",
-            "training": "https://learn.microsoft.com/training/modules/understand-azure-defender-cloud-workload-protection/",
-            "waf": "Security"
+            "text": "Use Azure Site Recovery monitoring to maintain the health of the disaster recovery service for SAP application servers.",
+            "training": "https://learn.microsoft.com/training/modules/protect-on-premises-infrastructure-with-azure-site-recovery/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "24d96b30-61ee-4436-a1cc-d6ef08bc574b",
-            "link": "https://learn.microsoft.com/mem/configmgr/protect/deploy-use/endpoint-protection",
-            "service": "VM",
-            "severity": "High",
-            "text": "Enable Endpoint Protection on IaaS Servers.",
-            "training": "https://learn.microsoft.com/training/modules/design-solutions-securing-server-client-endpoints/",
+            "checklist": "SAP Checklist",
+            "guid": "5ba34d46-85e2-4213-ace7-bb122f7c95f0",
+            "link": "https://learn.microsoft.com/azure/ddos-protection/ddos-protection-overview",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "For secure delivery of HTTP/S apps, use Application Gateway v2 and ensure that WAF protection and policies are enabled.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-web-application-firewall/",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Compute/virtualMachines",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "15833ee7-ad6c-46d3-9331-65c7acbe44ab",
-            "link": "https://learn.microsoft.com/azure/security-center/",
-            "service": "VM",
+            "checklist": "SAP Checklist",
+            "guid": "fa9d30bc-1b82-4e4b-bfdf-6b017938b9e6",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Monitor base operating system patching drift via Azure Monitor Logs and Defender for Cloud.",
-            "training": "https://learn.microsoft.com/training/modules/create-log-analytics-workspace-microsoft-defender-cloud/",
-            "waf": "Security"
+            "text": "If the virtual machine's DNS or virtual name is not changed during migration to Azure, Background DNS and virtual names connect many system interfaces in the SAP landscape, and customers are only sometimes aware of the interfaces that developers define over time. Connection challenges arise between various systems when virtual or DNS names change after migrations, and it's recommended to retain DNS aliases to prevent these types of difficulties.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/4-explore-name-resolution",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Insights/components",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "e5f8d79f-2e87-4768-924c-516775c6ea95",
-            "link": "https://learn.microsoft.com/azure/azure-monitor/logs/design-logs-deployment",
-            "service": "Monitor",
+            "checklist": "SAP Checklist",
+            "guid": "a2858f78-105b-4f52-b7a9-5b0f4439743b",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Connect default resource configurations to a centralized Azure Monitor Log Analytics workspace.",
-            "training": "https://learn.microsoft.com/training/modules/analyze-infrastructure-with-azure-monitor-logs/",
-            "waf": "Security"
+            "text": "Use different DNS zones to distinguish each environment (sandbox, development, preproduction, and production) from each other. The exception is for SAP deployments with their own VNet; here, private DNS zones might not be necessary.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/4-explore-name-resolution",
+            "waf": "Operations"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "graph": "resources| where type == 'microsoft.operationalinsights/workspaces'| extend wsid = properties.customerId| project workspaceResourceId = tolower(id), name, wsid| join (resources| where type == 'microsoft.operationsmanagement/solutions'| where name has 'SecurityInsights'| extend workspaceResourceId = tostring(tolower(properties.workspaceResourceId))| project workspaceResourceId | summarize ResourceCount = count() by workspaceResourceId) on workspaceResourceId| extend RCount = iff(isnull(ResourceCount), 0, ResourceCount)| project-away ResourceCount| extend compliant = (RCount <> 0)",
-            "guid": "a56888b2-7e83-4404-bd31-b886528502d1",
-            "link": "https://learn.microsoft.com/en-us/azure/well-architected/security/monitor-threats#centralized-threat-detection-with-correlated-logs",
-            "service": "Entra",
+            "checklist": "SAP Checklist",
+            "description": "When configuring VNet peering, use the Allow traffic to remote virtual networks setting.",
+            "graph": "resources | where type =~ 'microsoft.network/virtualnetworks' | mvexpand properties.virtualNetworkPeerings | project id, peeringName=properties_virtualNetworkPeerings.name, compliant = (properties_virtualNetworkPeerings.properties.allowVirtualNetworkAccess =~ True)",
+            "guid": "a3592829-e6e2-4061-9368-6af46791f893",
+            "link": "https://learn.microsoft.com/azure/virtual-network/virtual-network-peering-overview",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Local and global VNet peering provide connectivity and are the preferred approaches to ensure connectivity between landing zones for SAP deployments across multiple Azure regions",
+            "training": "https://learn.microsoft.com/training/modules/configure-vnet-peering/?source=recommendations",
+            "waf": "Reliability"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "guid": "41742694-3ff8-4ae7-b7d4-743176c8bcbf",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/planning-guide",
+            "service": "SAP",
             "severity": "High",
-            "text": "Centralized threat detection with correlated logs -  consolidate security data in a central location where it can be correlated across various services via SIEM (security information and event management)",
-            "waf": "Security"
+            "text": "It is not supported to deploy any NVA between SAP application and SAP Database server",
+            "training": "https://me.sap.com/notes/2731110",
+            "waf": "Performance"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "1761e147-f65e-4d09-bbc2-f464f23e2eba",
-            "link": "https://learn.microsoft.com/industry/sovereignty/transparency-logs",
-            "service": "Entra",
+            "checklist": "SAP Checklist",
+            "graph": "resources| where type =~ 'microsoft.network/virtualwans' | extend compliant= (properties.allowBranchToBranchTraffic =~ 'true') | distinct id,compliant",
+            "guid": "7d4bc7d2-c34a-452e-8f1d-6ae3c8eafcc3",
+            "link": "https://learn.microsoft.com/training/modules/introduction-azure-virtual-wan/?source=recommendations",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For Sovereign Landing Zone, enable transparancy logs on the Entra ID tenant.",
-            "waf": "Security"
+            "text": "Use Virtual WAN for Azure deployments in new, large, or global networks where you need global transit connectivity across Azure regions and on-premises locations. With this approach, you won't need to manually set up transitive routing for Azure networking, and you can follow a standard for SAP on Azure deployments.",
+            "training": "https://learn.microsoft.com/azure/virtual-wan/virtual-wan-about",
+            "waf": "Operations"
         },
         {
-            "checklist": "Azure Landing Zone Review",
-            "guid": "d21a922d-5ca7-427a-82a6-35f7b21f1bfc",
-            "link": "https://learn.microsoft.com/azure/security/fundamentals/customer-lockbox-overview",
-            "service": "Entra",
+            "checklist": "SAP Checklist",
+            "guid": "0cedb1f6-ae6c-492b-8b17-8061f50b16d3",
+            "link": "https://learn.microsoft.com/azure/well-architected/services/networking/network-virtual-appliances/reliability",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For Sovereign Landing Zone, enable customer Lockbox on the Entra ID tenant.",
-            "waf": "Security"
+            "text": "Consider deploying network virtual appliances (NVAs) between regions only if partner NVAs are used. NVAs between regions or VNets aren't required if native NVAs are present. When you're deploying partner networking technologies and NVAs, follow the vendor's guidance to verify conflicting configurations with Azure networking.",
+            "training": "https://learn.microsoft.com/training/modules/control-network-traffic-flow-with-routes/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "b03ed428-4617-4067-a787-85468b9ccf3f",
-            "link": "https://learn.microsoft.com/azure/storage/common/storage-require-secure-transfer",
-            "service": "Storage",
-            "severity": "High",
-            "text": "Enable secure transfer to storage accounts.",
-            "training": "https://learn.microsoft.com/training/modules/secure-azure-storage-account/",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "facc08c6-ea95-4641-91cd-fa09e573adbd",
+            "link": "https://learn.microsoft.com/azure/architecture/networking/hub-spoke-vwan-architecture",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Virtual WAN manages connectivity between spoke VNets for virtual-WAN-based topologies (no need to set up user-defined routing [UDR] or NVAs), and maximum network throughput for VNet-to-VNet traffic in the same virtual hub is 50 gigabits per second. If necessary, SAP landing zones can use VNet peering to connect to other landing zones and overcome this bandwidth limitation.",
+            "training": "https://learn.microsoft.com/training/modules/hub-and-spoke-network-architecture/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Storage/storageAccounts",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "159aac9f-863f-4f48-82cf-00c28fa97a0e",
-            "link": "https://learn.microsoft.com/azure/storage/blobs/data-protection-overview#recommendations-for-basic-data-protection",
-            "service": "Storage",
+            "checklist": "SAP Checklist",
+            "graph": "Resources | where type =~ 'Microsoft.Network/publicIPAddresses' and sku.tier =~ 'Regional' | where isempty(zones) or array_length(zones) <= 1 | extend az = case(isempty(zones), 'Non-zonal', array_length(zones) <= 1, strcat('Zonal (', strcat_array(zones, ','), ')'), zones) | project name, id, tags, param1 = strcat('sku: ', sku.name), param2 = strcat('availabilityZone: ', az)",
+            "guid": "82734c88-6ba2-4802-8459-11475e39e530",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
+            "service": "SAP",
             "severity": "High",
-            "text": "Enable container soft delete for the storage account to recover a deleted container and its contents.",
+            "text": "Public IP assignment to VM running SAP Workload is not recommended.",
+            "training": "https://learn.microsoft.com/training/modules/design-ip-addressing-for-azure/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.KeyVault/vaults",
-            "checklist": "Azure Landing Zone Review",
-            "guid": "108d5099-a11d-4445-bd8b-e12a5e95412e",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/considerations/development-strategy-development-lifecycle#automated-builds",
-            "service": "Key Vault",
+            "checklist": "SAP Checklist",
+            "graph": "Resources | where type contains 'publicIPAddresses' and isnotempty(properties.ipAddress) | summarize count () by subscriptionId",
+            "guid": "9cccd979-366b-4cda-8750-ab1ab039d95d",
+            "link": "https://learn.microsoft.com/training/modules/protect-on-premises-infrastructure-with-azure-site-recovery/?source=recommendations",
+            "service": "SAP",
             "severity": "High",
-            "text": "Use Key Vault secrets to avoid hard-coding sensitive information such as credentials (virtual machines user passwords), certificates or keys.",
-            "training": "https://learn.microsoft.com/en-us/training/modules/implement-azure-key-vault/",
+            "text": "Consider reserving IP address on DR side when configuring ASR",
+            "training": "https://learn.microsoft.com/learn/paths/architect-network-infrastructure/",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "4238f409-2ea0-43be-a06b-2a993c98aa7b",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-scale#overview-of-plans",
-            "service": "Azure Functions",
+            "checklist": "SAP Checklist",
+            "guid": "54c7c892-9cb1-407d-9325-ae525ba34d46",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/ready/azure-best-practices/plan-for-ip-addressing",
+            "service": "SAP",
             "severity": "High",
-            "text": "Select the right Function hosting plan based on your business & SLO requirements",
-            "waf": "Reliability"
+            "text": "Avoid using overlapping IP address ranges for production and DR sites.",
+            "training": "https://learn.microsoft.com/training/modules/design-ip-addressing-for-azure/?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "a9808100-d640-4f77-ac56-1ec0600f6752",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/functions-scale#overview-of-plans",
-            "query": "resources | where type =~ 'Microsoft.Web/sites' and kind has 'functionapp' and tolower(kind) !contains 'workflow' | extend aspResourceId = tostring(properties.serverFarmId), managedEnvId = tostring(properties.managedEnvironmentId), sku = tostring(properties.sku) | extend sku = iif(isnotempty(sku), sku, iif(isnotempty(managedEnvId), 'ContainerApps', '')) | where sku !in ('Dynamic', 'FlexConsumption', '') | extend aspName = tostring(split(aspResourceId, '/').[-1]), managedEnvName = tostring(split(managedEnvId, '/').[-1]) | extend HostingPlan = tostring(iif(isnotempty(aspName), aspName, managedEnvName)) | project functionAppName = name, functionAppId = id, HostingPlan, sku | join kind=inner ( resources | where type =~ 'Microsoft.Web/serverfarms' or type =~ 'Microsoft.App/managedEnvironments' | extend HostingPlan = tostring(name), zoneRedundant = tostring(properties.zoneRedundant), compliant = tobool(properties.zoneRedundant) | project HostingPlan, resourceId = id, zoneRedundant, compliant ) on HostingPlan | project functionAppName, functionAppId, sku, HostingPlan, resourceId, zoneRedundant, compliant",
-            "service": "Azure Functions",
-            "severity": "High",
-            "text": "Leverage Availability Zones where regionally applicable (not available for Consumption tier)",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "6e154e3a-a359-4282-ae6e-206173686af4",
+            "link": "https://learn.microsoft.com/azure/azure-netapp-files/azure-netapp-files-delegate-subnet",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "While Azure does help you to create multiple delegated subnets in a VNet, only one delegated subnet can exist in a VNet for Azure NetApp Files. Attempts to create a new volume will fail if you use more than one delegated subnet for Azure NetApp Files.",
+            "training": "https://learn.microsoft.com/azure/azure-netapp-files/azure-netapp-files-network-topologies?source=recommendations",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "5969d03e-eacf-4042-b127-73c55e3575fa",
-            "link": "https://learn.microsoft.com/en-us/azure/reliability/reliability-functions?tabs=azure-portal#cross-region-disaster-recovery-and-business-continuity",
-            "service": "Azure Functions",
+            "checklist": "SAP Checklist",
+            "graph": "resources | where type=~'microsoft.network/virtualhubs' | extend compliant = isnotnull(properties.azureFirewall.id) | project id, compliant",
+            "guid": "d8a03e97-7784-424d-9167-85d6fa96c96a",
+            "link": "https://learn.microsoft.com/azure/well-architected/services/networking/azure-firewall?toc=%2Fazure%2Ffirewall%2Ftoc.json&bc=%2Fazure%2Ffirewall%2Fbreadcrumb%2Ftoc.json",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Consider a Cross-Region DR strategy for critical workloads",
-            "waf": "Reliability"
+            "text": "Use Azure Firewall to govern Azure outbound traffic to the internet, non-HTTP/S inbound connections, and East/West traffic filtering (if the organization requires it)",
+            "training": "https://learn.microsoft.com/training/paths/secure-networking-infrastructure/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "47a0aae0-d8a0-43b1-9791-e934dee3754c",
-            "link": "https://learn.microsoft.com/en-us/azure/app-service/environment/intro",
-            "service": "Azure Functions",
-            "severity": "High",
-            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "91a65e40-be90-45b3-9f73-f3edbf8dc324",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/expose-sap-process-orchestration-on-azure",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Application Gateway and Web Application Firewall have limitations when Application Gateway serves as a reverse proxy for SAP web apps, as shown in the comparison between Application Gateway, SAP Web Dispatcher, and other third-party services.",
+            "training": "https://help.sap.com/docs/SUPPORT_CONTENT/si/3362959506.html",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "17232891-f89f-4eaa-90f1-3b34bf798ed5",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/dedicated-plan#always-on",
-            "query": "resources | where type =~ 'Microsoft.Web/sites' and kind has 'functionapp' | where tolower(kind) !contains 'workflow' | where isnotempty(properties.serverFarmId) | extend sku = tostring(properties.sku) | where isnotempty(sku) | where sku !in ('Dynamic', 'FlexConsumption', 'ElasticPremium') | extend alwaysOn = properties.siteConfig.alwaysOn | project functionAppName = name, functionAppId = id, serverFarmId = tostring(properties.serverFarmId), sku, alwaysOn, compliant = tobool(alwaysOn)",
-            "service": "Azure Functions",
-            "severity": "High",
-            "text": "Ensure 'Always On' is enabled for all Function Apps running on App Service Plan",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "5e39e530-9ccc-4d97-a366-bcda2750ab1a",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Use Azure Front Door and WAF policies to provide global protection across Azure regions for inbound HTTP/S connections to a landing zone.",
+            "training": "https://learn.microsoft.com/training/paths/secure-application-delivery/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "40a325c2-7c0e-49e6-86d8-c273b4dc21ba",
-            "link": "https://learn.microsoft.com/en-us/azure/azure-functions/storage-considerations?tabs=azure-cli#shared-storage-accounts",
-            "service": "Azure Functions",
+            "checklist": "SAP Checklist",
+            "guid": "b039d95d-54c7-4c89-89cb-107d5325ae52",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/afds/afds-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Pair a Function App to its own storage account. Try not to re-use storage accounts for Function Apps unless they are tightly coupled",
-            "waf": "Reliability"
+            "text": "Take advantage of Web Application Firewall policies in Azure Front Door when you're using Azure Front Door and Application Gateway to protect HTTP/S applications. Lock down Application Gateway to receive traffic only from Azure Front Door.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-web-application-firewall/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Web/sites",
-            "checklist": "Azure Function Review",
-            "guid": "bb42650c-257d-4cb0-822a-131138b8e6f0",
-            "link": "https://learn.microsoft.com/en-us/training/modules/deploy-azure-functions/",
-            "service": "Azure Functions",
+            "checklist": "SAP Checklist",
+            "guid": "5ada4332-4e13-4811-9231-81aa41742694",
+            "link": "https://learn.microsoft.com/azure/web-application-firewall/ag/ag-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Leverage Azure DevOps or GitHub to streamline CI/CD and safeguard your Function App code",
-            "waf": "Operations"
+            "text": "Use a web application firewall to scan your traffic when it's exposed to the internet. Another option is to use it with your load balancer or with resources that have built-in firewall capabilities like Application Gateway or third-party solutions.",
+            "training": "https://learn.microsoft.com/training/modules/introduction-azure-web-application-firewall/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "d7941d4a-7b6f-458f-8714-2f8f8c059ad4",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-error-handling-policies",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "e73de7d5-6f36-4217-a526-e1a621ecddde",
+            "link": "https://learn.microsoft.com/azure/frontdoor/front-door-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Implement an error handling policy at the global level",
-            "waf": "Operations"
+            "text": "Use Virtual WAN for Azure deployments in new, large, or global networks where you need global transit connectivity across Azure regions and on-premises locations. With this approach, you won't need to manually set up transitive routing for Azure networking, and you can follow a standard for SAP on Azure deployments.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/10-explore-azure-front-door",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "0b0c0765-ff37-4369-90bd-3eb23ce71b08",
-            "link": "https://learn.microsoft.com/azure/api-management/set-edit-policies?tabs=form#use-base-element-to-set-policy-evaluation-order",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "3c536a3e-1b6b-4e87-95ca-15edb47251c0",
+            "link": "https://learn.microsoft.com/azure/virtual-network/vnet-integration-for-azure-services",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Ensure all APIs policies include a <base/> element.",
-            "waf": "Operations"
+            "text": "To prevent data leakage, use Azure Private Link to securely access platform as a service resources like Azure Blob Storage, Azure Files, Azure Data Lake Storage Gen2, Azure Data Factory, and more. Azure Private Endpoint can also help to secure traffic between VNets and services like Azure Storage, Azure Backup, and more. Traffic between your VNet and the Private Endpoint enabled service travels across the Microsoft global network, which prevents its exposure to the public internet.",
+            "training": "https://learn.microsoft.com/training/modules/design-implement-private-access-to-azure-services/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "a5c45b03-93b6-42fe-b16b-8fccb6a79902",
-            "link": "https://learn.microsoft.com/azure/api-management/policy-fragments",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Use Policy Fragments to avoid repeating same policies definitions across multiple APIs",
-            "waf": "Operations"
+            "checklist": "SAP Checklist",
+            "graph": "Resources | where type =~ 'Microsoft.Network/NetworkInterfaces' | where properties.enableAcceleratedNetworking =~ 'false' | project name, subscriptionId, properties.enableAcceleratedNetworking",
+            "guid": "85e2213a-ce7b-4b12-8f7c-95f06e154e3a",
+            "link": "https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview?tabs=redhat",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Make sure that Azure accelerated networking is enabled on the VMs used in the SAP application and DBMS layers.",
+            "training": "https://learn.microsoft.com/training/paths/azure-fundamentals-describe-azure-architecture-services/?source=recommendations",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "c3818a95-6ff3-4474-88dc-e809b46dad6a",
-            "link": "https://learn.microsoft.com/azure/api-management/monetization-support",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "3ff8ae7d-7d47-4431-96c8-bcbf45bbe609",
+            "link": "https://learn.microsoft.com/azure/load-balancer/load-balancer-multivip-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "If you are planning to monetize your APIs, review the 'monetization support' article for best practices",
-            "waf": "Operations"
+            "text": "Make sure that internal deployments for Azure Load Balancer are set up to use Direct Server Return (DSR). This setting (Enabling Floating IP) will reduce latency when internal load balancer configurations are used for high-availability configurations on the DBMS layer.",
+            "training": "https://learn.microsoft.com/ja-jp/training/modules/load-balancing-non-https-traffic-azure/?source=recommendations",
+            "waf": "Security"
+        },
+        {
+            "checklist": "SAP Checklist",
+            "graph": "Resources | where type =~ 'microsoft.network/networksecuritygroups' and isnull(properties.networkInterfaces) and isnull(properties.subnets) | project name, resourceGroup | sort by name asc",
+            "guid": "6791f893-5ada-4433-84e1-3811523181aa",
+            "link": "https://learn.microsoft.com/azure/virtual-network/network-security-group-how-it-works",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "You can use application security group (ASG) and NSG rules to define network security access-control lists between the SAP application and DBMS layers. ASGs group virtual machines to help manage their security.",
+            "training": "https://learn.microsoft.com/training/modules/configure-network-security-groups/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "a7d0840a-c8c4-4e83-adec-5ca578eb4049",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-use-azure-monitor#resource-logs",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "45bbe609-d8a0-43e9-9778-424d616785d6",
+            "link": "https://me.sap.com/notes/2015553",
+            "service": "SAP",
             "severity": "High",
-            "text": "Enable Diagnostics Settings to export logs to Azure Monitor",
-            "waf": "Operations"
+            "text": "Placing of the SAP application layer and SAP DBMS in different Azure VNets that aren't peered isn't supported.",
+            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "8691fa38-45ed-4299-a247-fecd98d35deb",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-app-insights",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "fa96c96a-d885-418f-9827-34c886ba2802",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/proximity-placement-scenarios",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Enable Application Insights for more detailed telemetry",
-            "waf": "Operations"
+            "text": "For optimal network latency with SAP applications, consider using Azure proximity placement groups.",
+            "training": "https://learn.microsoft.com/azure/virtual-machines/co-location#planned-maintenance-and-proximity-placement-groups",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "55fd27bb-76ac-4a91-bc37-049e885be6b7",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-use-azure-monitor",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "18c8b61c-855a-4405-b6ed-266455e4f4ce",
+            "link": "https://me.sap.com/notes/2015553",
+            "service": "SAP",
             "severity": "High",
-            "text": "Configure alerts on the most critical metrics",
-            "waf": "Operations"
+            "text": "It is NOT supported at all to run an SAP Application Server layer and DBMS layer split between on-premise and Azure. Both layers need to completely reside either on-premise or in Azure.",
+            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "39460bdb-156f-4dc2-a87f-1e8c11ab0998",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#certificate-management-in-azure-key-vault",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "b65c878b-4b14-4f4e-92d8-d873936493f2",
+            "link": "https://me.sap.com/notes/2015553",
+            "service": "SAP",
             "severity": "High",
-            "text": "Ensure that custom SSL certificates are stored an Azure Key Vault so they can be securely accessed and updated",
-            "waf": "Security"
+            "text": "It isn't recommended to host the database management system (DBMS) and application layers of SAP systems in different VNets and connect them with VNet peering because of the substantial costs that excessive network traffic between the layers can produce. Recommend using subnets within the Azure virtual network to separate the SAP application layer and DBMS layer.",
+            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-network-topology-and-connectivity",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "e9217997-5f6c-479d-8576-8f2adf706ec8",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#azure-ad-authentication-required-for-data-plane-access",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "402a9846-d515-4061-aff8-cd30088693fa",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/high-availability-guide-rhel",
+            "service": "SAP",
             "severity": "High",
-            "text": "Protect incoming requests to APIs (data plane) with Azure AD",
-            "waf": "Security"
+            "text": "If using Load Balancer with Linux guest operating systems, check that the Linux network parameter net.ipv4.tcp_timestamps is set to 0.",
+            "training": "https://learn.microsoft.com/training/modules/implement-ha-sap-netweaver-anydb/?source=recommendations",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "5e5f64ba-c90e-480e-8888-398d96cf0bfb",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-aad",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "87585797-5551-4d53-bb7d-a94ee415734d",
+            "link": "https://learn.microsoft.com/azure/sap/workloads/rise-integration",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Microsoft Entra ID to authenticate users in the Developer Portal",
+            "text": "For SAP RISE/ECS deployments, virtual peering is the preferred way to establish connectivity with customer's existing Azure environment. Both the SAP vnet and customer vnet(s) are protected with network security groups (NSG), enabling communication on SAP and database ports through the vnet peering",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "f8e574ce-280f-49c8-b2ef-68279b081cf3",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-create-groups",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Create appropriate groups to control the visibility of the products",
-            "waf": "Security"
+            "checklist": "SAP Checklist",
+            "guid": "ff5136bd-dcf1-4d2b-ae52-39333efdf45a",
+            "link": "https://learn.microsoft.com/azure/backup/sap-hana-database-about",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Review SAP HANA database backups for Azure VMs.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "06862505-2d9a-4874-9491-2837b00a3475",
-            "link": "https://learn.microsoft.com/azure/api-management/backends",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "cafde29d-a0af-4bcd-87c0-0f299d63f0e8",
+            "link": "https://learn.microsoft.com/azure/site-recovery/site-recovery-monitor-and-troubleshoot",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Backends feature to eliminate redundant API backend configurations",
-            "waf": "Operations"
+            "text": "Review Site Recovery built-in monitoring, where used for SAP.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "03b125d5-b69b-4739-b7fd-84b86da4933e",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-properties?tabs=azure-portal",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Use Named Values to store common values that can be used in policies",
+            "checklist": "SAP Checklist",
+            "guid": "82d7b8de-d3f1-44a0-830b-38e200e82acf",
+            "link": "https://help.sap.com/docs/SAP_HANA_PLATFORM/c4d7c773af4a4e5dbebb6548d6e2d4f4/e3111d2ebb5710149510cc120646bf3f.html?locale=en-US",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Review the Monitoring the SAP HANA System Landscape guidance.",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = ( sku.name == 'Premium' and  isnotnull(properties.additionalLocations)) | distinct id, compliant",
-            "guid": "beae759e-4ddb-4326-bf26-47f87d3454b6",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-deploy-multi-region",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "c823873a-2bec-4c2a-b684-a1ce8ae80efd",
+            "link": "https://learn.microsoft.com/azure/virtual-machines/workloads/oracle/oracle-database-backup-strategies",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "For DR, leverage the premium tier with deployments scaled across two or more regions for 99.99% SLA",
-            "waf": "Reliability"
+            "text": "Review Oracle Database in Azure Linux VM backup strategies.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = ( sku.name == 'Premium' and  isnotnull(zones) and sku.capacity >= 2 ) | distinct id, compliant",
-            "guid": "9c8d1664-dd9a-49d4-bd83-950af0af4044",
-            "link": "https://learn.microsoft.com/azure/api-management/high-availability",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "2943b6d8-1d31-4e19-ade7-78e6b26d1962",
+            "link": "https://learn.microsoft.com/sql/relational-databases/tutorial-use-azure-blob-storage-service-with-sql-server-2016?view=sql-server-ver16",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Deploy at least one unit in two or more availability zones for an increased SLA of 99.99%",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "8d2db6e8-85c6-4118-a52c-ae76a4f27934",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#service-native-backup-capability",
-            "service": "APIM",
-            "severity": "High",
-            "text": "Ensure there is an automated backup routine",
-            "waf": "Reliability"
+            "text": "Review the use of Azure Blob Storage with SQL Server 2016.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "43e60b94-7bca-43a2-aadf-efb04d63a485",
-            "link": "https://learn.microsoft.com/azure/api-management/retry-policy",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "b82e650f-676d-417d-994d-fc33ca54ec14",
+            "link": "https://learn.microsoft.com/azure/azure-sql/virtual-machines/windows/automated-backup?view=azuresql",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Policies to add a fail-over backend URL and caching to reduce failing calls.",
-            "waf": "Reliability"
+            "text": "Review the use of Automated Backup v2 for Azure VMs.",
+            "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "8210699f-8d43-45c2-8f19-57e54134bd8f",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-log-event-hubs",
-            "service": "APIM",
-            "severity": "Low",
-            "text": "If you need to log at high performance levels, consider Event Hubs policy",
+            "checklist": "SAP Checklist",
+            "guid": "347c2dcc-e6eb-4b04-80c5-628b171aa62d",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Enabling Write accelerator for M series when using premium disks(V1)",
             "waf": "Operations"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "121bfc39-fa7b-4096-b93b-ab56c1bc0bed",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-sample-flexible-throttling",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "b96512cf-996f-4b17-b9b8-6b16db1a2a94",
+            "link": "https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/AvZone-Latency-Test",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Apply throttling policies to control the number of requests per second",
-            "training": "https://learn.microsoft.com/training/modules/protect-apis-on-api-management/",
+            "text": "Test availability zone latency.",
             "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | join kind = leftouter (resources | where type == 'microsoft.insights/autoscalesettings' | extend targetResourceUri = tostring(properties.targetResourceUri)) on $left.id == $right.targetResourceUri | extend compliant = (sku.name == 'Premium' and isnotempty(targetResourceUri) and properties1.enabled == true) | distinct id, compliant",
-            "guid": "bb5f356b-3daf-47a2-a9ee-867a8100bbd5",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-autoscale",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "9fd7ffd4-da11-49f6-a374-8d03e94c511d",
+            "link": "https://support.sap.com/en/offerings-programs/support-services/earlywatch-alert.html",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Configure autoscaling to scale out the number of instances when the load increases",
+            "text": "Activate SAP EarlyWatch Alert for all SAP components.",
+            "training": "https://help.sap.com/docs/SUPPORT_CONTENT/techops/3362700736.html",
             "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "84b94abb-59b6-4b9d-8587-3413669468e8",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-provision-self-hosted-gateway",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "b9b140cf-413a-483d-aad2-8802c4e3c017",
+            "link": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/sap-on-azure-general-update-march-2019/ba-p/377456",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Deploy self-hosted gateways where Azure doesn't have a region close to the backend APIs.",
+            "text": "Review SAP application server to database server latency using SAP ABAPMeter report /SSA/CAT.",
+            "training": "https://me.sap.com/notes/0002879613",
             "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "1fe8db45-a017-4888-8c4d-4422583cfae0",
-            "link": "https://learn.microsoft.com/azure/api-management/upgrade-and-scale#upgrade-and-scale",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Use the premium tier for production workloads.",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "1b8d68a4-66cd-44d5-ba94-3ee94440e8d6",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-deploy-multi-region#-route-api-calls-to-regional-backend-services",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "In multi-region model, use Policies to route the requests to regional backends based on availability or latency.",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "46f07d33-ef9a-44e8-8f98-67c097c5d8cd",
-            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/azure-subscription-service-limits#api-management-limits",
-            "service": "APIM",
-            "severity": "High",
-            "text": "Be aware of APIM's limits",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "62fbf0f8-51db-49e1-a961-bb5df7a35f80",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Review SQL Server performance monitoring using CCMS.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type =~ 'microsoft.apimanagement/service' | extend compliant = (properties.platformVersion != 'stv1') | project id, compliant",
-            "guid": "46f07d33-ef9a-44e8-8f98-67c097c5d8ce",
-            "link": "https://learn.microsoft.com/en-us/azure/api-management/migrate-stv1-to-stv2",
-            "service": "APIM",
-            "severity": "High",
-            "text": "Upgrade the platform version and follow lifecyle. stv1 is retirng on 31 August 2024",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "35709da7-fc7d-4efe-bb20-2e91547b7390",
+            "link": "https://me.sap.com/notes/500235",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Test network latency between SAP application layer VMs and DBMS VMs (NIPING).",
+            "training": "https://me.sap.com/notes/1100926/E",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "10f58602-f0f9-4d77-972a-956f6e0f2600",
-            "link": "https://learn.microsoft.com/en-us/azure/api-management/self-hosted-gateway-overview",
-            "service": "APIM",
-            "severity": "High",
-            "text": "Ensure that the self-hosted gateway deployments are resilient.",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "9e9bb4c8-e934-4e4b-a13c-6f7c7c38eb43",
+            "link": "https://learn.microsoft.com/en-us/azure/sap/large-instances/hana-monitor-troubleshoot",
+            "service": "SAP",
+            "severity": "Medium",
+            "text": "Review SAP HANA studio alerts.",
+            "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "7519e385-a88b-4d34-966b-6269d686e890",
-            "link": "https://learn.microsoft.com/azure/api-management/front-door-api-management",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "f1a92ab5-9509-4b57-86ff-b0ade361b694",
+            "link": "https://me.sap.com/notes/1969700",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use Azure Front Door in front of APIM for multi-region deployment",
+            "text": "Perform SAP HANA health checks using HANA_Configuration_Minichecks.",
             "waf": "Performance"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (isnotnull(properties.virtualNetworkConfiguration)) | distinct id, compliant",
-            "guid": "cd45c90e-7690-4753-930b-bf290c69c074",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#virtual-network-integration",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "18dffcf3-248c-4039-a67c-dec8e3a5f804",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-security-operations",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Deploy the service within a Virtual Network (VNet)",
+            "text": "If you run Windows and Linux VMs in Azure, on-premises, or in other cloud environments, you can use the Update management center in Azure Automation to manage operating system updates, including security patches.",
+            "training": "https://learn.microsoft.com/azure/automation/update-management/overview",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "02661582-b3d1-48d1-9d7b-c6a918a0ca33",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#network-security-group-support",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "08951710-79a2-492a-adbc-06d7a401545b",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-security-operations",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Deploy network security groups (NSG) to your subnets to restrict or monitor traffic to/from APIM.",
+            "text": "Routinely review the SAP security OSS notes because SAP releases highly critical security patches, or hot fixes, that require immediate action to protect your SAP systems.",
+            "training": "https://support.sap.com/en/my-support/knowledge-base/security-notes-news.html",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (properties.virtualNetworkType == 'None' and isnotnull(properties.privateEndpointConnections)) | distinct id, compliant",
-            "guid": "67437a28-2721-4a2c-becd-caa54c8237a5",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#azure-private-link",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Deploy Private Endpoints to filter incoming traffic when APIM is not deployed to a VNet.",
+            "checklist": "SAP Checklist",
+            "guid": "1b8b394e-ae64-4a74-8933-357b523ea0a0",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-database-security",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "For SAP on SQL Server, you can disable the SQL Server system administrator account because the SAP systems on SQL Server don't use the account. Ensure that another user with system administrator rights can access the server before disabling the original system administrator account.",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (properties.virtualNetworkType == 'Internal') | distinct id, compliant",
-            "guid": "d698adbd-3288-44cb-b10a-9b572da395ae",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#disable-public-network-access",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "5a76a033-ced9-4eef-9a43-5e4f96634c8e",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-database-security",
+            "service": "SAP",
             "severity": "High",
-            "text": "Disable Public Network Access",
+            "text": "Disable xp_cmdshell. The SQL Server feature xp_cmdshell enables a SQL Server internal operating system command shell. It's a potential risk in security audits.",
+            "training": "https://me.sap.com/notes/3019299/E",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "0674d750-0c6f-4ac0-8717-ceec04d0bdbd",
-            "link": "https://learn.microsoft.com/azure/api-management/automation-manage-api-management",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Simplify management with PowerShell automation scripts",
-            "waf": "Operations"
-        },
-        {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "c385bfcd-49fd-4786-81ba-cedbb4c57345",
-            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/app-platform/api-management/platform-automation-and-devops#design-recommendations",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Configure APIM via Infrastructure-as-code. Review DevOps best practices from the Cloud Adaption Framework APIM Landing Zone Accelerator",
-            "waf": "Operations"
+            "checklist": "SAP Checklist",
+            "guid": "cf65de8e-1309-4ccc-b579-266bcca275fa",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Encrypting SAP HANA database servers on Azure uses SAP HANA native encryption technology. Additionally, if you are using SQL Server on Azure, use Transparent Data Encryption (TDE) to protect your data and log files and ensure that your backups are also encrypted.",
+            "training": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/sap-lza-database-security",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "6c3a27c0-197f-426c-9ffa-86fed51d9ab6",
-            "link": "https://learn.microsoft.com/azure/api-management/visual-studio-code-tutorial",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "a1abfe9d-55d0-44c3-a491-9cb1b3d1325a",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-service-encryption",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Promote usage of Visual Studio Code APIM extension for faster API development",
-            "waf": "Operations"
+            "text": "Azure Storage encryption is enabled for all Azure Resource Manager and classic storage accounts, and can't be disabled. Because your data is encrypted by default, you don't need to modify your code or applications to use Azure Storage encryption.",
+            "training": "https://learn.microsoft.com/training/modules/encrypt-sector-data/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "354f1c03-8112-4965-85ad-c0074bddf231",
-            "link": "https://learn.microsoft.com/azure/api-management/devops-api-development-templates",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Implement DevOps and CI/CD in your workflow",
-            "waf": "Operations"
+            "checklist": "SAP Checklist",
+            "graph": "Resources | join kind=leftouter (ResourceContainers | where type=~'microsoft.resources/subscriptions' | project SubName=name, subscriptionId) on subscriptionId | where type =~ 'microsoft.keyvault/vaults' | project type, name, SubName",
+            "guid": "ce9bd3bb-0cdb-43b5-9eb2-ec14eeaa3592",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/overview",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Use Azure Key Vault to store your secrets and credentials",
+            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "b6439493-426a-45f3-9697-cf65baee208d",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-mutual-certificates-for-clients",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "829e2edb-2173-4676-aff6-691b4935ada4",
+            "link": "https://learn.microsoft.com/azure/azure-resource-manager/management/lock-resources?tabs=json",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Secure APIs using client certificate authentication",
+            "text": "It is recommended to LOCK the Azure Resources post successful deployment to safeguard against unauthorized changes. You can also enforce LOCK constraints and rules on your per-subscription basis using customized Azure policies(Custome role).",
+            "training": "https://learn.microsoft.com/training/modules/use-azure-resource-manager/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "2a67d143-1033-4c0a-8732-680896478f08",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-mutual-certificates",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "2223ece8-1b12-4318-8a54-17415833fb4a",
+            "link": "https://learn.microsoft.com/azure/key-vault/general/soft-delete-overview",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Secure backend services using client certificate authentication",
+            "text": "Provision Azure Key Vault with the soft delete and purge policies enabled to allow retention protection for deleted objects.",
+            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "074435f5-4a46-41ac-b521-d6114cb5d845",
-            "link": "https://learn.microsoft.com/azure/api-management/mitigate-owasp-api-threats",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Review 'Recommendations to mitigate OWASP API Security Top 10 threats' article and check what is applicable to your APIs",
+            "checklist": "SAP Checklist",
+            "guid": "e3c2df74-3165-4c3a-abe0-5bbe209d490d",
+            "link": "https://learn.microsoft.com/azure/role-based-access-control/security-controls-policy",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Based on existing requirements, regulatory and compliance controls (internal/external) - Determine what Azure Policies and Azure RBAC role are needed",
+            "training": "https://learn.microsoft.com/training/paths/describe-azure-management-governance/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "5507c4b8-a7f8-41d6-9661-418c987100c9",
-            "link": "https://learn.microsoft.com/azure/api-management/authorizations-overview",
-            "service": "APIM",
-            "severity": "Medium",
-            "text": "Use Authorizations feature to simplify management of OAuth 2.0 token for your backend APIs",
+            "checklist": "SAP Checklist",
+            "guid": "a4777842-4d11-4678-9d2f-a56c56ad4840",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
+            "service": "SAP",
+            "severity": "High",
+            "text": "When enabling Microsoft Defender for Endpoint on SAP environment, recommend excluding data and log files on DBMS servers instead of targeting all servers. Follow your DBMS vendor's recommendations when excluding target files.",
+            "training": "https://techcommunity.microsoft.com/t5/running-sap-applications-on-the/microsoft-defender-endpoint-mde-for-sap-applications-on-windows/ba-p/3912268",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "2deee033-b906-4bc2-9f26-c8d3699fe091",
-            "link": "https://learn.microsoft.com/azure/api-management/api-management-howto-manage-protocols-ciphers",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "8fe72734-c486-4ba2-a0dc-0591cf65de8e",
+            "link": "https://learn.microsoft.com/azure/defender-for-cloud/just-in-time-access-overview?tabs=defender-for-container-arch-aks",
+            "service": "SAP",
             "severity": "High",
-            "text": "Use the latest TLS version when encrypting information in transit. Disable outdated and unnecessary protocols and ciphers when possible.",
+            "text": "Delegate an SAP admin custom role with just-in-time access of Microsoft Defender for Cloud.",
+            "training": "https://learn.microsoft.com/training/modules/secure-vms-with-azure-security-center/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "f8af3d94-1d2b-4070-846f-849197524258",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#im-8-restrict-the-exposure-of-credential-and-secrets",
-            "service": "APIM",
-            "severity": "High",
-            "text": "Ensure that secrets (Named values) are stored an Azure Key Vault so they can be securely accessed and updated",
+            "checklist": "SAP Checklist",
+            "guid": "1309cccd-5792-466b-aca2-75faa1abfe9d",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "encrypt data in transit by integrating the third-party security product with secure network communications (SNC) for DIAG (SAP GUI), RFC, and SPNEGO for HTTPS",
+            "training": "https://learn.microsoft.com/azure/security/fundamentals/encryption-overview#encryption-of-data-in-transit",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "graph": "resources | where type == 'microsoft.apimanagement/service' | extend compliant = (isnotnull(identity)) | distinct id, compliant",
-            "guid": "791abd8b-7706-4e31-9569-afefde724be3",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#managed-identities",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "guid": "eeaa3592-829e-42ed-a217-3676aff6691b",
+            "link": "https://learn.microsoft.com/azure/storage/common/storage-encryption-key-model-get?tabs=portal",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Use managed identities to authenticate to other Azure resources whenever possible",
+            "text": "Default to Microsoft-managed keys for principal encryption functionality and use customer-managed keys when required.",
+            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.ApiManagement/service",
-            "checklist": "Azure API Management Review",
-            "guid": "220c4ca6-6688-476b-b2b5-425a78e6fb87",
-            "link": "https://learn.microsoft.com/security/benchmark/azure/baselines/api-management-security-baseline?toc=%2Fazure%2Fapi-management%2F&bc=%2Fazure%2Fapi-management%2Fbreadcrumb%2Ftoc.json#ns-6-deploy-web-application-firewall",
-            "service": "APIM",
+            "checklist": "SAP Checklist",
+            "graph": "Resources | join kind=leftouter (ResourceContainers | where type=~'microsoft.resources/subscriptions' | project SubName=name, subscriptionId) on subscriptionId | where type =~ 'microsoft.keyvault/vaults' | project type, name, SubName",
+            "guid": "4935ada4-2223-4ece-a1b1-23181a541741",
+            "link": "https://learn.microsoft.com/ja-jp/azure/key-vault/general/best-practices",
+            "service": "SAP",
             "severity": "High",
-            "text": "Use web application firewall (WAF) by deploying Application Gateway in front of APIM",
+            "text": "Use an Azure Key Vault per application per environment per region.",
+            "training": "https://learn.microsoft.com/training/modules/manage-secrets-with-azure-key-vault/?source=recommendations",
             "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "guid": "43e52f47-22d9-428c-8b1c-d521e54a29a9",
-            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/pass-foundations-playbooks-CosmosDB_v1.docx",
-            "service": "CosmosDB",
-            "severity": "Medium",
-            "text": "FTA Resiliency Playbook",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "abc9634d-c44d-41e9-a530-e8444e16aa3c",
+            "link": "https://learn.microsoft.com/azure/key-vault/certificates/certificate-scenarios",
+            "service": "SAP",
+            "severity": "High",
+            "text": "To control and manage disk encryption keys and secrets for non-HANA Windows and non-Windows operating systems, use Azure Key Vault. SAP HANA isn't supported with Azure Key Vault, so you must use alternate methods like SAP ABAP or SSH keys.",
+            "training": "https://learn.microsoft.com/training/modules/configure-and-manage-azure-key-vault/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "guid": "de39ac0e-7c28-4dc9-9565-7202bff4564b",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#slas",
-            "service": "CosmosDB",
+            "checklist": "SAP Checklist",
+            "guid": "209d490d-a477-4784-84d1-16785d2fa56c",
+            "link": "https://learn.microsoft.com/azure/role-based-access-control/built-in-roles",
+            "service": "SAP",
             "severity": "High",
-            "text": "Leverage Availablity Zones where regionally applicable and ofcourse if the service offers it",
-            "waf": "Reliability"
+            "text": "Customize role-based access control (RBAC) roles for SAP on Azure spoke subscriptions to avoid accidental network-related changes",
+            "training": "https://learn.microsoft.com/training/modules/secure-azure-resources-with-rbac/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "guid": "0d934a34-8b26-43e7-bd60-513a3649906e",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#replica-outages",
-            "service": "CosmosDB",
-            "severity": "Medium",
-            "text": "Run multiple replicas of the database (>1 ) in Prod",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "56ad4840-8fe7-4273-9c48-6ba280dc0591",
+            "link": "https://blogs.sap.com/2019/07/21/sap-security-operations-on-azure/",
+            "service": "SAP",
+            "severity": "High",
+            "text": "Isolate DMZs and NVAs from the rest of the SAP estate, configure Azure Private Link, and securely manage and control the SAP on Azure resources",
+            "training": "https://learn.microsoft.com/azure/architecture/reference-architectures/dmz/secure-vnet-dmz?tabs=portal",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "Multi-region writes capability allows you to take advantage of the provisioned throughput for your databases and containers across the globe",
-            "guid": "bad38ead-53cc-47de-8d8a-aab3571449ab",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#multiple-write-regions",
-            "service": "CosmosDB",
-            "severity": "Medium",
-            "text": "Leverage Multi-Region Writes",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "e124ba34-df68-45ed-bce9-bd3bb0cdb3b5",
+            "link": "https://learn.microsoft.com/en-us/training/modules/secure-vms-with-azure-security-center/?source=recommendations",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "Consider using Microsoft anti-malware software on Azure to protect your virtual machines from malicious files, adware, and other threats.",
+            "training": "https://azure.microsoft.com/blog/deploying-antimalware-solutions-on-azure-virtual-machines/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "Span Cosmos account across two or more regions with multi-region writes",
-            "guid": "8153d89f-89dc-47b3-9be2-b1a27f7b9e91",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/high-availability#slas",
-            "service": "CosmosDB",
-            "severity": "Medium",
-            "text": "Distribute your data globally",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "5eb2ec14-eeaa-4359-8829-e2edb2173676",
+            "link": "https://learn.microsoft.com/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint?view=o365-worldwide",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "For even more powerful protection, consider using Microsoft Defender for Endpoint.",
+            "training": "https://learn.microsoft.com/training/modules/implement-endpoint-protection-use-microsoft-defender/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "Choose from various consistency levels such as Eventual, Consistent Prefix, Session, Bounded Staleness and strong",
-            "guid": "9f8ea848-25ec-4140-bc32-2758e6ee9ac0",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/consistency-levels",
-            "service": "CosmosDB",
+            "checklist": "SAP Checklist",
+            "guid": "87a924c4-25c2-419f-a2f0-96c7c4fe4525",
+            "link": "https://learn.microsoft.com/azure/architecture/guide/sap/sap-whole-landscape",
+            "service": "SAP",
             "severity": "High",
-            "text": "Choose from several well-defined consistency models",
-            "waf": "Reliability"
+            "text": "Isolate the SAP application and database servers from the internet or from the on-premises network by passing all traffic through the hub virtual network, which is connected to the spoke network by virtual network peering. The peered virtual networks guarantee that the SAP on Azure solution is isolated from the public internet.",
+            "training": "https://learn.microsoft.com/training/modules/explore-azure-networking/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "Maintain business continuity during regional outages. Azure Cosmos DB supports service-managed failover during a regional outage. During a regional outage, Azure Cosmos DB continues to maintain its latency, availability, consistency, and throughput SLAs. To help make sure that your entire application is highly available, Azure Cosmos DB offers a manual failover API to simulate a regional outage. By using this API, you can carry out regular business continuity drills.",
-            "guid": "a47e4d1e-bb79-43f9-bf87-69e1032b72fe",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/how-to-manage-database-account#automatic-failover",
-            "service": "CosmosDB",
-            "severity": "Medium",
-            "text": "Enable Service managed failover",
-            "waf": "Reliability"
+            "checklist": "SAP Checklist",
+            "guid": "491ca1c4-3d40-42c0-9d85-b8933999590b",
+            "link": "https://learn.microsoft.com/azure/cloud-adoption-framework/scenarios/sap/eslz-security-governance-and-compliance",
+            "service": "SAP",
+            "severity": "Low",
+            "text": "For internet-facing applications like SAP Fiori, make sure to distribute load per application requirements while maintaining security levels. For Layer 7 security, you can use a third-party Web Application Firewall (WAF) available in the Azure Marketplace.",
+            "training": "https://learn.microsoft.com/training/modules/simplify-cloud-procurement-governance-azure-marketplace/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "Azure Cosmos DB automatically takes backups of your data at regular intervals. The automatic backups are taken without affecting the performance or availability of the database operations. All the backups are stored separately in a storage service.",
-            "guid": "3499c9c1-133d-42f7-a4b1-a5bd06ff1a90",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/online-backup-and-restore",
-            "service": "CosmosDB",
+            "checklist": "SAP Checklist",
+            "guid": "9fc945b9-0527-47af-8200-9d652fe02fcc",
+            "link": "https://learn.microsoft.com/azure/sap/monitor/enable-tls-azure-monitor-sap-solutions",
+            "service": "SAP",
             "severity": "Medium",
-            "text": "Enable Automatic Backups",
-            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
-            "waf": "Reliability"
+            "text": "To enable secure communication in Azure Monitor for SAP solutions, you can choose to use either a root certificate or a server certificate. We highly recommend that you use root certificates.",
+            "training": "https://learn.microsoft.com/training/modules/implement-azure-monitoring-sap-workloads-azure-virtual-machines/?source=recommendations",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "This mode is the default backup mode for all existing accounts. In this mode, backup is taken at a periodic interval and the data is restored by creating a request with the support team. In this mode, you configure a backup interval and retention for your account. The maximum retention period extends to a month. The minimum backup interval can be one hour.",
-            "guid": "a6eb33f6-005c-4d92-9286-7655672d6121",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/periodic-backup-restore-introduction",
-            "service": "CosmosDB",
-            "severity": "Medium",
-            "text": "Perform Periodic Backups",
-            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "Azure Service Bus Premium provides encryption of data at rest. If you use your own key, the data is still encrypted using the Microsoft-managed key, but in addition the Microsoft-managed key will be encrypted using the customer-managed key. ",
+            "guid": "87af4a79-1f89-439b-ba47-768e14c11567",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/configure-customer-managed-key",
+            "service": "Service Bus",
+            "severity": "Low",
+            "text": "Use customer-managed key option in data at rest encryption when required",
+            "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
+            "waf": "Security"
         },
         {
-            "arm-service": "microsoft.documentdb/databaseAccounts",
-            "checklist": "CosmosDB Review Checklist",
-            "description": "Continous 7 day retention and 30 day retention backups. Azure Cosmos DB performs data backup in the background without consuming any extra provisioned throughput (RUs) or affecting the performance and availability of your database. Continuous backups are taken in every region where the account exists.",
-            "guid": "d43918a8-cd28-49be-b6b1-7cb8245461e1",
-            "link": "https://learn.microsoft.com/azure/cosmos-db/continuous-backup-restore-introduction",
-            "service": "CosmosDB",
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "Communication between a client application and an Azure Service Bus namespace is encrypted using Transport Layer Security (TLS). Azure Service Bus namespaces permit clients to send and receive data with TLS 1.0 and above. To enforce stricter security measures, you can configure your Service Bus namespace to require that clients send and receive data with a newer version of TLS.",
+            "guid": "5c1ea55b-46a9-448f-b8ae-7d7e4b475b6c",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/transport-layer-security-enforce-minimum-version",
+            "service": "Service Bus",
             "severity": "Medium",
-            "text": "Continous Backup with point-in-time restore in Azure Cosmos DB",
-            "training": "https://learn.microsoft.com/learn/modules/create-custom-azure-roles-with-rbac/",
-            "waf": "Reliability"
+            "text": "Enforce a minimum required version of Transport Layer Security (TLS) for requests ",
+            "training": "https://learn.microsoft.com/learn/modules/secure-aad-users-with-mfa/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DBforPostgreSQL/servers",
-            "checklist": "PostgreSQL Review Checklist",
-            "guid": "65285269-441c-44bf-9d3e-0844276d4bdc",
-            "link": "https://learn.microsoft.com/azure/postgresql/flexible-server/overview",
-            "service": "PostgreSQL",
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "When you create a Service Bus namespace, a SAS rule named RootManageSharedAccessKey is automatically created for the namespace. This policy has Manage permissions for the entire namespace. It's recommended that you treat this rule like an administrative root account and don't use it in your application.  Using AAD as an authentication provider with RBAC is recommended. ",
+            "guid": "8bcbf59b-ce65-4de8-a03f-97879468d66a",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-sas#shared-access-authorization-policies",
+            "service": "Service Bus",
             "severity": "Medium",
-            "text": "Leverage Flexible Server",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.DBforPostgreSQL/servers",
-            "checklist": "PostgreSQL Review Checklist",
-            "guid": "016ccf31-ae5a-41eb-9888-9535e227896d",
-            "link": "https://learn.microsoft.com/azure/postgresql/flexible-server/overview#architecture-and-high-availability",
-            "service": "PostgreSQL",
-            "severity": "High",
-            "text": "Leverage Availability Zones where regionally applicable",
-            "waf": "Reliability"
+            "text": "Avoid using root account when it is not necessary",
+            "training": "https://learn.microsoft.com/learn/paths/azure-administrator-manage-identities-governance/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DBforPostgreSQL/servers",
-            "checklist": "PostgreSQL Review Checklist",
-            "guid": "31b67c67-be59-4519-8083-845d587cb391",
-            "link": "https://learn.microsoft.com/azure/postgresql/single-server/concepts-business-continuity#cross-region-read-replicas",
-            "service": "PostgreSQL",
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "Microsoft Entra ID provides superior security and ease of use over shared access signatures (SAS). With Microsoft Entra ID, there’s no need to store the tokens in your code and risk potential security vulnerabilities. We recommend that you use Microsoft Entra ID with your Azure Service Bus applications when possible.",
+            "graph": "Resources | where type =~ 'microsoft.servicebus/namespaces' | extend compliant = iif(properties.disableLocalAuth == 'false', 'No', 'Yes') | project id, compliant",
+            "guid": "786d60f9-6c96-4ad8-a55d-04c2b39c986b",
+            "link": "https://learn.microsoft.com/en-us/azure/service-bus-messaging/disable-local-authentication",
+            "service": "Service Bus",
             "severity": "Medium",
-            "text": "Leverage cross-region read replicas for BCDR",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Devices/deviceUpdateServices",
-            "checklist": "Device Update Review",
-            "guid": "0e03f5ee-4648-423c-bb86-7239480f9171",
-            "link": "https://learn.microsoft.com/en-us/azure/iot-dps/iot-dps-ha-dr#high-availability",
-            "service": "Device Update for IoT Hub",
-            "severity": "High",
-            "text": "Leverage Availability Zones if regionally applicable (this is automatically enabled).",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Devices/deviceUpdateServices",
-            "checklist": "Device Update Review",
-            "guid": "c0c273bd-00ad-419a-9f2f-fc72fb181e55",
-            "link": "https://learn.microsoft.com/en-us/azure/iot-dps/iot-dps-ha-dr#high-availability",
-            "service": "Device Update for IoT Hub",
-            "severity": "High",
-            "text": "Be aware of Microsoft-initiated failovers. These are exercised by Microsoft in rare situations to fail over all the DPS instances from an affected region to the corresponding geo-paired region.",
-            "waf": "Reliability"
-        },
-        {
-            "arm-service": "Microsoft.Devices/deviceUpdateServices",
-            "checklist": "Device Update Review",
-            "guid": "3af8abe6-07eb-4287-b393-6c4abe3702eb",
-            "link": "https://learn.microsoft.com/en-us/azure/logic-apps/business-continuity-disaster-recovery-guidance?toc=%2Fazure%2Freliability%2Ftoc.json&bc=%2Fazure%2Freliability%2Fbreadcrumb%2Ftoc.json",
-            "service": "Device Update for IoT Hub",
-            "severity": "High",
-            "text": "Consider a Cross-Region DR strategy for critical workloads",
-            "waf": "Reliability"
+            "text": "When possible, disable SAS key authentication (or local authentication) and use only Microsoft Entra ID for authentication",
+            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.Devices/deviceUpdateServices",
-            "checklist": "Device Update Review",
-            "guid": "bd91245c-fe32-4e98-a085-794a40f4bfe1",
-            "link": "https://learn.microsoft.com/en-us/azure/app-service/environment/intro",
-            "service": "Device Update for IoT Hub",
-            "severity": "High",
-            "text": "If deploying to an Isolated environment, use or migrate to App Service Environment (ASE) v3",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "When creating permissions, provide fine-grained control over a client's access to Azure Service Bus. Permissions in Azure Service Bus can and should be scoped to the individual resource level e.g. queue, topic or subscription. ",
+            "guid": "f615658d-e558-4f93-9249-b831112dbd7e",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/authenticate-application#azure-built-in-roles-for-azure-service-bus",
+            "service": "Service Bus",
+            "severity": "High",
+            "text": "Use least privilege data plane RBAC",
+            "training": "https://learn.microsoft.com/learn/modules/explore-basic-services-identity-types/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "65285269-440c-44be-9d3e-0844276d4bdc",
-            "link": "https://github.com/Azure/fta-resiliencyplaybooks/blob/main/pass-foudations-playbooks-ADB_v1.docx",
-            "service": "Data Factory",
-            "severity": "High",
-            "text": "Reference Databricks HA/DR playbook",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "Azure Service Bus resource logs include operational logs,  virtual network and IP filtering logs. Runtime audit logs capture aggregated diagnostic information for various data plane access operations (such as send or receive messages) in Service Bus.",
+            "guid": "af12e7f9-43f6-4304-922d-929c2b1cd622",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/monitor-service-bus-reference",
+            "service": "Service Bus",
+            "severity": "Medium",
+            "text": "Enable logging for security investigation. Use Azure Monitor to trace resource logs and runtime audit logs (currently available only in the premium tier)",
+            "training": "https://learn.microsoft.com/learn/paths/manage-identity-and-access/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "a0e6c465-89d5-458b-a37d-3974d1112dbd",
-            "link": "https://github.com/databrickslabs/databricks-sync",
-            "service": "Data Factory",
-            "severity": "Low",
-            "text": "Use Databricks Sync",
-            "waf": "Reliability"
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "Azure Service Bus by default has a public IP address and is Internet-reachable. Private endpoints allow traffic between your virtual network and Azure Service Bus traverses over the Microsoft backbone network. In addition to that, you should disable public endpoints if those are not used. ",
+            "guid": "9ae669ca-48e4-4a85-b222-3ece8bb12307",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/private-link-service",
+            "service": "Service Bus",
+            "severity": "Medium",
+            "text": "Consider using private endpoints to access Azure Service Bus and disable public network access when applicable.",
+            "training": "https://learn.microsoft.com/learn/modules/azure-ad-privileged-identity-management/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "89d558b9-37d3-4974-b111-2dbd7aaf12e6",
-            "link": "https://learn.microsoft.com/azure/databricks/security/secrets/secret-scopes",
-            "service": "Data Factory",
+            "arm-service": "Microsoft.ServiceBus/namespaces",
+            "checklist": "Service Bus Review Checklist",
+            "description": "With IP firewall, you can restrict the public endpoint further to only a set of IPv4 addresses or IPv4 address ranges in CIDR (Classless Inter-Domain Routing) notation. ",
+            "guid": "ca5f06f1-58e3-4ea3-a92c-2de7e2165c3a",
+            "link": "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-ip-filtering",
+            "service": "Service Bus",
             "severity": "Medium",
-            "text": "Backup your workspace configuration including ARM templates and secret scopes",
-            "waf": "Reliability"
+            "text": "Consider only allowing access to Azure Service Bus namespace from specific IP addresses or ranges",
+            "training": "https://learn.microsoft.com/learn/paths/implement-resource-mgmt-security/",
+            "waf": "Security"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "b94ee5ef-47d2-4d92-a81b-1cd6d1f54b29",
-            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/sharing-metadata-across-different-databricks-workspaces-using/ba-p/3679757",
-            "service": "Data Factory",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "graph": "resources | where type=~'Microsoft.ServiceFabric/managedClusters' | extend compliant = (sku=~'{\"name\":\"Standard\"}') | distinct id,compliant",
+            "guid": "182840d2-9ef8-4238-8fd6-0d76186830ac",
+            "link": "https://learn.microsoft.com/azure/service-fabric/overview-managed-cluster#service-fabric-managed-cluster-skus",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Share metaData across different Databricks workspaces using Hive external metastore",
+            "text": "Use Standard SKU for production scenarios.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "769e3969-0e78-428a-a936-657d03b0f466",
-            "link": "https://techcommunity.microsoft.com/t5/fasttrack-for-azure/disaster-recovery-strategy-in-azure-databricks-using-the-hive/ba-p/3684581",
-            "service": "Data Factory",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "graph": "resources | where type=~'Microsoft.ServiceFabric/clusters' | extend nodeTypes= array_concat(properties.nodeTypes) | mv-expand nodeTypes | summarize BronzeDurabilityCount = countif(nodeTypes.durabilityLevel == 'Bronze') by id | extend compliant = (BronzeDurabilityCount == 0) | distinct id,compliant",
+            "guid": "182840d2-9ef8-4238-8fd6-0d76186830ac",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-cluster-capacity#durability-characteristics-of-the-cluster",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Plan Disaster Recovery strategy in Databricks using the Hive External Metastore",
+            "text": "Use durability level Silver (5 VMs) or greater for production scenarios",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "4b1d944a-3598-437e-b79d-6c6d3a364a5b",
-            "link": "https://www.databricks.com/blog/2021/04/20/attack-of-the-delta-clones-against-disaster-recovery-availability-complexity.html",
-            "service": "Data Factory",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "graph": "resources | where type=~'Microsoft.ServiceFabric/managedClusters' | extend compliant= ( properties.zonalResiliency =~ 'true') | distinct id,compliant",
+            "guid": "2363878d-55c4-4cbd-9bc2-94523c85f12e",
+            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-cluster-availability-zones",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Backup your data with deep and shallow clones",
+            "text": "Consider using Availability Zones for your Service Fabric clusters. Service Fabric managed cluster supports deployments that span across multiple Availability Zones to provide zone resiliency. This configuration will ensure high-availability of the critical system services and your applications to protect from single-points-of-failure.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "description": "Download the blob using the secondary endpoint in RAGRS storage account",
-            "guid": "7abae48a-bd54-4cd7-ae2e-86768357c559",
-            "link": "https://techcommunity.microsoft.com/t5/azure-paas-blog/download-the-blob-using-secondary-endpoint-in-ragrs-storage/ba-p/2403750",
-            "service": "Data Factory",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "5ba74cc8-3ca2-44d5-9a67-bdc8e102e7b4",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-api-management-overview",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Backup your data to Azure Storage RA-GRS",
+            "text": "Consider using Azure API Management to expose and offload cross-cutting functionality for APIs hosted on the cluster. API Management can integrate with Service Fabric directly.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "675c5ee8-5b85-49c7-944c-e3b1a28b875a",
-            "link": "https://learn.microsoft.com/azure/databricks/dev-tools/index-ci-cd",
-            "service": "Data Factory",
-            "severity": "High",
-            "text": "Backup your code with DevOps",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "ef17bb8f-4e2c-488b-8ceb-a07c3d750dd3",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-reliable-services-introduction",
+            "service": "Azure Service Fabric",
+            "severity": "Medium",
+            "text": "For stateful workload scenarios, consider using Reliable Services. The Reliable Services model allows your services to stay up even in unreliable environments where your machines fail or hit network issues, or in cases where the services themselves encounter errors and crash or fail. For stateful services, your state is preserved even in the presence of network or other failures.",
             "waf": "Reliability"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "guid": "a1bf1038-9f03-4a4d-8ce4-63dbbbc8682a",
-            "link": "https://learn.microsoft.com/azure/databricks/administration-guide/disaster-recovery",
-            "service": "Data Factory",
-            "severity": "High",
-            "text": "Plan for Disaster recovery using Active/Active or Active/Passive Configuration",
-            "waf": "Reliability"
+            "checklist": "Azure Service Fabric Review Checklist",
+            "graph": "resources | where type=~'Microsoft.Compute/virtualMachineScaleSets' | extend vmssExtension= array_concat(properties.virtualMachineProfile.extensionProfile.extensions) | mv-expand vmssExtension | where vmssExtension.properties.publisher matches regex '^Microsoft.Azure.ServiceFabric.*' | summarize arg_max(id, *) | summarize compliant = countif(sku.name matches regex '^Standard_[^d]*$' ) by id",
+            "guid": "4da21268-f775-4c89-a271-eb80543c8df7",
+            "service": "Azure Service Fabric",
+            "severity": "Medium",
+            "text": "Avoid VM SKUs with temp disk offerings. Service Fabric uses managed disks by default, so avoiding temp disk offerings ensures you don't pay for unneeded resources.",
+            "waf": "Cost"
         },
         {
-            "arm-service": "Microsoft.DataFactory/datafactories",
-            "checklist": "DataBricks Review Checklist",
-            "description": "Migration package to log all Databricks resources for backup and/or migrating to another Databricks workspace",
-            "guid": "5abc92a4-eda1-4dae-8cc8-5c47c6b781cc",
-            "link": "https://github.com/databrickslabs/migrate",
-            "service": "Data Factory",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "1890b796-f300-41a3-a8d4-29738c1f4ad0",
+            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-cluster-stateless-node-type#temporary-disk-support",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Use Databricks Migration tools",
-            "waf": "Reliability"
+            "text": "If you need to select a certain VM SKU for capacity reasons and it happens to offer temp disk, consider using temporary disk support for your stateless workloads.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "bb235c70-5e17-496f-bedf-a8a4c8cdec4c",
-            "link": "https://learn.microsoft.com/entra/identity-platform/msal-acquire-cache-tokens",
-            "service": "Entra",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "5247bb32-6778-49c7-8b40-e171c9a3ce1e",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Use long-live revocable token, cache your token and acquire your silently using Microsoft Identity Library",
-            "waf": "Reliability"
+            "text": "Align SKU selection and managed disk size with workload requirements. Matching your selection to your workload demands ensures you don't pay for unneeded resources.",
+            "waf": "Cost"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "503547c1-447e-4c66-828a-71f0f1ce16dd",
-            "link": "https://learn.microsoft.com/azure/active-directory-b2c/deploy-custom-policies-devops",
-            "service": "AAD B2C",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "6028759b-446a-41bc-8b0e-7728e61ca704",
+            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-cluster-networking#manage-nsg-rules",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Make sure that your sign-in user flows are backed up and resilient. Make sure that the code that you use to sign-in your users are backed up and recoverable. Resilient interfaces with external processes",
-            "waf": "Reliability"
+            "text": "Ensure Network Security Groups (NSG) are configured to restrict traffic flow between subnets and node types. For example, you may have an API Management instance (one subnet), a frontend subnet (exposing a website directly), and a backend subnet (accessible only to frontend).",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "3e3553a4-c873-4964-ab66-2d6c15f51296",
-            "link": "https://learn.microsoft.com/entra/architecture/resilient-end-user-experience#use-a-content-delivery-network",
-            "service": "AAD B2C",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "graph": "resources | where type=~'Microsoft.Compute/virtualMachineScaleSets' | extend vmssExtension= array_concat(properties.virtualMachineProfile.extensionProfile.extensions) | mv-expand vmssExtension | where vmssExtension.properties.publisher matches regex '^Microsoft.Azure.ServiceFabric.*' | summarize arg_max(id, *) | extend compliant = (isnotnull(properties.virtualMachineProfile.osProfile.secrets))",
+            "guid": "4e98c903-14cf-4c72-9c45-b8b23bc4cbd8",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-best-practices-security#deploy-key-vault-certificates-to-service-fabric-cluster-virtual-machine-scale-sets",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Custom brand assets should be hosted on a CDN",
-            "waf": "Performance"
+            "text": "Deploy Key Vault certificates to Service Fabric cluster virtual machine scale sets. Centralizing storage of application secrets in Azure Key Vault allows you to control their distribution. Key Vault greatly reduces the chances that secrets may be accidentally leaked.",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "5398e6df-d237-4de1-93b1-6c21d79a9b64",
-            "link": "https://learn.microsoft.com/entra/identity/monitoring-health/reference-sla-performance",
-            "service": "AAD B2C",
-            "severity": "Low",
-            "text": "Have multiple identiy providers (i.e., login with your microsoft, google, facebook accounts)",
-            "waf": "Reliability"
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "001cbb6f-d88d-4431-8434-d01333397776",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-best-practices-security#apply-an-access-control-list-acl-to-your-certificate-for-your-service-fabric-cluster",
+            "service": "Azure Service Fabric",
+            "severity": "Medium",
+            "text": "Apply an Access Control List (ACL) to your client certificate for your Service Fabric cluster. Using an ACL provides an additional level of authentication.",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "604489a8-f42d-478e-98c0-7a73b22a4a57",
-            "link": "https://azure.microsoft.com/blog/setting-up-active-directory-for-a-disaster-recovery-environment-2/",
-            "service": "Windows AD",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "4b74b7a5-bb1e-4fca-948c-037ba95fb73b",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-resource-governance#resource-governance-mechanism",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Follow VM rules for high availability on the VM level (premium disks, two or more in a region, in different availability zones)",
-            "waf": "Reliability"
+            "text": "Use resource requests and limits to govern resource usage across the nodes in your cluster. Enforcing resource limits helps ensure that one service doesn't consume too many resources and starve other services.",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "e7a8dd4a-30e3-47c3-b297-11b2362ceee0",
-            "link": "https://azure.microsoft.com/blog/setting-up-active-directory-for-a-disaster-recovery-environment-2/",
-            "service": "Windows AD",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "cd9233ba-f3aa-4353-8d2f-7ea4a64160e6",
+            "link": "",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Don't replicate! Replication can create issues with directory synchronization",
-            "waf": "Reliability"
+            "text": "Encrypt Service Fabric package secret values. Encryption on your secret values provides an additional level of security.",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "79b598de-fc59-472c-b4cd-21b078036f5e",
-            "link": "https://azure.microsoft.com/blog/setting-up-active-directory-for-a-disaster-recovery-environment-2/",
-            "service": "Windows AD",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "44b989d4-9f72-42b6-99da-ec2a79f83299",
+            "link": "",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Have active-active for multi-regions",
-            "waf": "Reliability"
+            "text": "Include client certificates in Service Fabric applications. Having your applications use client certificates for authentication provides opportunities for security at both the cluster and workload level.",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "6b4bfd3d-5035-447c-8447-ec66128a71f0",
-            "link": "https://learn.microsoft.com/entra/identity/domain-services/tutorial-perform-disaster-recovery-drill",
-            "service": "Entra",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "28e66ff7-4a77-4b2c-910d-0335f141208a",
+            "link": "https://learn.microsoft.com/azure/service-fabric/how-to-managed-identity-managed-cluster-virtual-machine-scale-sets",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Add Azure AD Domain service stamps to additional regions and locations",
-            "waf": "Reliability"
+            "text": "Authenticate Service Fabric applications to Azure Resources using Managed Identity. Using Managed Identity allow you to securely manage the credentials in your code for authenticating to various services without saving them locally on a developer workstation or in source control.",
+            "waf": "Security"
         },
         {
-            "checklist": "Identity Review Checklist",
-            "guid": "f1ce16dd-3f1d-45e8-92e4-2e3611cc58b4",
-            "link": "https://learn.microsoft.com/entra/identity/domain-services/tutorial-perform-disaster-recovery-drill",
-            "service": "Entra",
+            "checklist": "Azure Service Fabric Review Checklist",
+            "guid": "f16c413c-00a6-43aa-852c-b97292c33a56",
+            "link": "https://learn.microsoft.com/azure/service-fabric/service-fabric-best-practices-security#hosting-untrusted-applications-in-a-service-fabric-cluster",
+            "service": "Azure Service Fabric",
             "severity": "Medium",
-            "text": "Use Replica Sets for DR",
-            "waf": "Reliability"
+            "text": "Follow Service Fabric best practices when hosting untrusted applications. Following the best practices provides a security standard to follow.",
+            "waf": "Security"
         }
     ],
     "metadata": {
         "name": "WAF checklist",
-        "timestamp": "October 24, 2024"
+        "timestamp": "October 25, 2024"
     },
     "severities": [
         {
diff --git a/spreadsheet/macrofree/waf_checklist.en.xlsx b/spreadsheet/macrofree/waf_checklist.en.xlsx
index c087c2bd..b36ee210 100644
Binary files a/spreadsheet/macrofree/waf_checklist.en.xlsx and b/spreadsheet/macrofree/waf_checklist.en.xlsx differ