diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py
index 7001d810446..3d8042944bc 100644
--- a/src/azure-cli/azure/cli/command_modules/acs/custom.py
+++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py
@@ -2887,62 +2887,92 @@ def _ensure_default_log_analytics_workspace_for_monitoring(cmd, subscription_id,
     # log analytics workspaces cannot be created in WCUS region due to capacity limits
     # so mapped to EUS per discussion with log analytics team
     AzureCloudLocationToOmsRegionCodeMap = {
-        "australiasoutheast": "ASE",
+        "southcentralus": "SCUS",
+        "uksouth": "SUK",
+        "southeastasia": "SEA",
+        "westeurope": "WEU",
+        "eastus": "EUS",
         "australiaeast": "EAU",
-        "australiacentral": "CAU",
-        "canadacentral": "CCA",
-        "centralindia": "CIN",
+        "eastus2": "EUS2",
+        "northeurope": "NEU",
+        "japaneast": "EJP",
+        "brazilsouth": "CQ",
         "centralus": "CUS",
+        "norwayeast": "NOE",
+        "chinaeast2": "CNE2",
         "eastasia": "EA",
-        "eastus": "EUS",
-        "eastus2": "EUS2",
-        "eastus2euap": "EAP",
+        "switzerlandnorth": "CHN",
+        "southafricanorth": "JNB",
         "francecentral": "PAR",
-        "japaneast": "EJP",
+        "northcentralus": "NCUS",
+        "westus": "WUS",
+        "westus2": "WUS2",
+        "centralindia": "CIN",
         "koreacentral": "SE",
-        "northeurope": "NEU",
-        "southcentralus": "SCUS",
-        "southeastasia": "SEA",
-        "uksouth": "SUK",
+        "uaenorth": "DXB",
+        "germanywestcentral": "DEWC",
         "usgovvirginia": "USGV",
+        "canadacentral": "CAC",
+        "usgovarizona": "PHX",
+        "ukwest": "WUK",
+        "australiasoutheast": "SEAU",
         "westcentralus": "EUS",
-        "westeurope": "WEU",
-        "westus": "WUS",
-        "westus2": "WUS2"
+        "switzerlandwest": "CHW",
+        "australiacentral": "CAU",
+        "uaecentral": "AUH",
+        "eastus2euap": "EASTUS2EUAP",
+        "brazilsoutheast": "BRSE"
     }
     AzureCloudRegionToOmsRegionMap = {
-        "australiacentral": "australiacentral",
-        "australiacentral2": "australiacentral",
+        "southcentralus": "southcentralus",
+        "uksouth": "uksouth",
+        "southeastasia": "southeastasia",
+        "westeurope": "westeurope",
+        "eastus": "eastus",
         "australiaeast": "australiaeast",
-        "australiasoutheast": "australiasoutheast",
-        "brazilsouth": "southcentralus",
-        "canadacentral": "canadacentral",
-        "canadaeast": "canadacentral",
+        "eastus2": "eastus2",
+        "northeurope": "northeurope",
+        "japaneast": "japaneast",
+        "brazilsouth": "brazilsouth",
         "centralus": "centralus",
-        "centralindia": "centralindia",
+        "norwayeast": "norwayeast",
+        "chinaeast2": "chinaeast2",
         "eastasia": "eastasia",
-        "eastus": "eastus",
-        "eastus2": "eastus2",
+        "switzerlandnorth": "switzerlandnorth",
+        "southafricanorth": "southafricanorth",
         "francecentral": "francecentral",
-        "francesouth": "francecentral",
-        "japaneast": "japaneast",
-        "japanwest": "japaneast",
+        "northcentralus": "northcentralus",
+        "westus": "westus",
+        "westus2": "westus2",
+        "centralindia": "centralindia",
         "koreacentral": "koreacentral",
-        "koreasouth": "koreacentral",
-        "northcentralus": "eastus",
-        "northeurope": "northeurope",
-        "southafricanorth": "westeurope",
-        "southafricawest": "westeurope",
-        "southcentralus": "southcentralus",
-        "southeastasia": "southeastasia",
-        "southindia": "centralindia",
-        "uksouth": "uksouth",
-        "ukwest": "uksouth",
+        "uaenorth": "uaenorth",
+        "germanywestcentral": "germanywestcentral",
+        "usgovvirginia": "usgovvirginia",
+        "canadacentral": "canadacentral",
+        "usgovarizona": "usgovarizona",
+        "ukwest": "ukwest",
+        "australiasoutheast": "australiasoutheast",
         "westcentralus": "eastus",
-        "westeurope": "westeurope",
+        "switzerlandwest": "switzerlandwest",
+        "australiacentral": "australiacentral",
+        "uaecentral": "uaecentral",
+        "eastus2euap": "eastus2euap",
+        "brazilsoutheast": "brazilsoutheast",
+        "southafricawest": "southafricanorth",
         "westindia": "centralindia",
-        "westus": "westus",
-        "westus2": "westus2"
+        "chinaeast": "chinaeast2",
+        "chinanorth": "chinaeast2",
+        "australiacentral2": "australiacentral",
+        "norwaywest": "norwayeast",
+        "germanynorth": "germanywestcentral",
+        "southindia": "centralindia",
+        "koreasouth": "koreacentral",
+        "chinanorth2": "chinaeast2",
+        "francesouth": "francecentral",
+        "canadaeast": "canadacentral",
+        "usgovtexas": "usgovvirginia",
+        "japanwest": "japaneast"
     }
 
     # mapping for azure china cloud