diff --git a/CHANGELOG.md b/CHANGELOG.md
index e55c595b..3fccfb31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 **Merged pull requests:**
 
+- Add `location` and `resource_group_name` for `var.log_analytics_workspace` [\#412](https://github.com/Azure/terraform-azurerm-aks/pull/412) ([lonegunmanb](https://github.com/lonegunmanb))
 - Fix \#405 incorrect role assignment resource [\#410](https://github.com/Azure/terraform-azurerm-aks/pull/410) ([lonegunmanb](https://github.com/lonegunmanb))
 
 ## [7.2.0](https://github.com/Azure/terraform-azurerm-aks/tree/7.2.0) (2023-07-10)
diff --git a/examples/multiple_node_pools/TestRecord.md b/examples/multiple_node_pools/TestRecord.md
index 4bdba3d4..c599c6eb 100644
--- a/examples/multiple_node_pools/TestRecord.md
+++ b/examples/multiple_node_pools/TestRecord.md
@@ -1,3 +1,23 @@
+## 01 Aug 23 03:28 UTC
+
+Success: true
+
+### Versions
+
+Terraform v1.5.1
+on linux_amd64
++ provider registry.terraform.io/azure/azapi v1.8.0
++ provider registry.terraform.io/hashicorp/azurerm v3.67.0
++ provider registry.terraform.io/hashicorp/null v3.2.1
++ provider registry.terraform.io/hashicorp/random v3.3.2
++ provider registry.terraform.io/hashicorp/tls v4.0.4
+
+### Error
+
+
+
+---
+
 ## 30 Jul 23 00:29 UTC
 
 Success: true
diff --git a/examples/named_cluster/TestRecord.md b/examples/named_cluster/TestRecord.md
index 9b0e0cce..60565a85 100644
--- a/examples/named_cluster/TestRecord.md
+++ b/examples/named_cluster/TestRecord.md
@@ -1,3 +1,24 @@
+## 01 Aug 23 04:30 UTC
+
+Success: true
+
+### Versions
+
+Terraform v1.5.1
+on linux_amd64
++ provider registry.terraform.io/anschoewe/curl v1.0.2
++ provider registry.terraform.io/azure/azapi v1.8.0
++ provider registry.terraform.io/hashicorp/azurerm v3.67.0
++ provider registry.terraform.io/hashicorp/null v3.2.1
++ provider registry.terraform.io/hashicorp/random v3.3.2
++ provider registry.terraform.io/hashicorp/tls v4.0.4
+
+### Error
+
+
+
+---
+
 ## 30 Jul 23 01:23 UTC
 
 Success: true
diff --git a/examples/startup/TestRecord.md b/examples/startup/TestRecord.md
index 80fb8ee5..fe11ae85 100644
--- a/examples/startup/TestRecord.md
+++ b/examples/startup/TestRecord.md
@@ -1,3 +1,24 @@
+## 01 Aug 23 03:50 UTC
+
+Success: true
+
+### Versions
+
+Terraform v1.5.1
+on linux_amd64
++ provider registry.terraform.io/anschoewe/curl v1.0.2
++ provider registry.terraform.io/azure/azapi v1.8.0
++ provider registry.terraform.io/hashicorp/azurerm v3.67.0
++ provider registry.terraform.io/hashicorp/null v3.2.1
++ provider registry.terraform.io/hashicorp/random v3.3.2
++ provider registry.terraform.io/hashicorp/tls v4.0.4
+
+### Error
+
+
+
+---
+
 ## 30 Jul 23 00:52 UTC
 
 Success: true
diff --git a/examples/with_acr/TestRecord.md b/examples/with_acr/TestRecord.md
index 6031a966..e6433aa8 100644
--- a/examples/with_acr/TestRecord.md
+++ b/examples/with_acr/TestRecord.md
@@ -1,3 +1,23 @@
+## 01 Aug 23 03:25 UTC
+
+Success: true
+
+### Versions
+
+Terraform v1.5.1
+on linux_amd64
++ provider registry.terraform.io/azure/azapi v1.8.0
++ provider registry.terraform.io/hashicorp/azurerm v3.67.0
++ provider registry.terraform.io/hashicorp/null v3.2.1
++ provider registry.terraform.io/hashicorp/random v3.3.2
++ provider registry.terraform.io/hashicorp/tls v4.0.4
+
+### Error
+
+
+
+---
+
 ## 30 Jul 23 00:28 UTC
 
 Success: true
diff --git a/examples/without_monitor/TestRecord.md b/examples/without_monitor/TestRecord.md
index 405dd001..ef7841ac 100644
--- a/examples/without_monitor/TestRecord.md
+++ b/examples/without_monitor/TestRecord.md
@@ -1,3 +1,24 @@
+## 01 Aug 23 04:14 UTC
+
+Success: true
+
+### Versions
+
+Terraform v1.5.1
+on linux_amd64
++ provider registry.terraform.io/anschoewe/curl v1.0.2
++ provider registry.terraform.io/azure/azapi v1.8.0
++ provider registry.terraform.io/hashicorp/azurerm v3.67.0
++ provider registry.terraform.io/hashicorp/null v3.2.1
++ provider registry.terraform.io/hashicorp/random v3.3.2
++ provider registry.terraform.io/hashicorp/tls v4.0.4
+
+### Error
+
+
+
+---
+
 ## 30 Jul 23 01:13 UTC
 
 Success: true
diff --git a/locals.tf b/locals.tf
index 8569306a..b5c09745 100644
--- a/locals.tf
+++ b/locals.tf
@@ -39,7 +39,7 @@ locals {
       pool.pod_subnet_id
     ]
   ], [var.vnet_subnet_id]))
-  subnet_ids                                            = toset([for id in local.potential_subnet_ids : id if id != null])
   query_datasource_for_log_analytics_workspace_location = var.log_analytics_workspace_enabled && (var.log_analytics_workspace != null ? var.log_analytics_workspace.location == null : false)
+  subnet_ids                                            = toset([for id in local.potential_subnet_ids : id if id != null])
 }
 
diff --git a/main.tf b/main.tf
index ff900949..ffb87b14 100644
--- a/main.tf
+++ b/main.tf
@@ -40,7 +40,7 @@ resource "azurerm_kubernetes_cluster" "main" {
     avm_git_last_modified_at = "2023-06-05 02:21:33"
     avm_git_org              = "Azure"
     avm_git_repo             = "terraform-azurerm-aks"
-    avm_yor_trace            = "c19f554b-eb14-4ffc-9db0-c9bec84c40ae"
+    avm_yor_trace            = "3e791853-9e8a-42d8-a0d9-827d5ecf05d5"
     } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
     avm_yor_name = "main"
   } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
@@ -560,7 +560,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool" {
     avm_git_last_modified_at = "2023-05-04 05:02:32"
     avm_git_org              = "Azure"
     avm_git_repo             = "terraform-azurerm-aks"
-    avm_yor_trace            = "393fc4a0-1ab7-41c5-b436-6dc5d7c5fe84"
+    avm_yor_trace            = "bf76a7df-0574-4f9a-8b16-a7f1d9a262ff"
     } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
     avm_yor_name = "node_pool"
   } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
@@ -704,7 +704,7 @@ resource "azurerm_log_analytics_workspace" "main" {
     avm_git_last_modified_at = "2023-06-05 02:21:33"
     avm_git_org              = "Azure"
     avm_git_repo             = "terraform-azurerm-aks"
-    avm_yor_trace            = "8b23511d-0f36-43f7-9671-b701da1ef6ef"
+    avm_yor_trace            = "fcfb45d8-6893-4c7d-9d85-33adcb2ba4a2"
     } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
     avm_yor_name = "main"
   } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
@@ -719,8 +719,8 @@ resource "azurerm_log_analytics_workspace" "main" {
 
 locals {
   azurerm_log_analytics_workspace_id                  = try(azurerm_log_analytics_workspace.main[0].id, null)
-  azurerm_log_analytics_workspace_name                = try(azurerm_log_analytics_workspace.main[0].name, null)
   azurerm_log_analytics_workspace_location            = try(azurerm_log_analytics_workspace.main[0].location, null)
+  azurerm_log_analytics_workspace_name                = try(azurerm_log_analytics_workspace.main[0].name, null)
   azurerm_log_analytics_workspace_resource_group_name = try(azurerm_log_analytics_workspace.main[0].resource_group_name, null)
 }
 
@@ -740,12 +740,12 @@ resource "azurerm_log_analytics_solution" "main" {
   workspace_name        = local.log_analytics_workspace.name
   workspace_resource_id = local.log_analytics_workspace.id
   tags = merge(var.tags, (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
-    avm_git_commit           = "c6e76a18f3c11daf1e16920ec0219bf7a0f5fef5"
+    avm_git_commit           = "886c26d95843149cc2a58ae72edb31478faa2a8c"
     avm_git_file             = "main.tf"
-    avm_git_last_modified_at = "2023-06-01 03:13:59"
+    avm_git_last_modified_at = "2023-07-20 06:04:07"
     avm_git_org              = "Azure"
     avm_git_repo             = "terraform-azurerm-aks"
-    avm_yor_trace            = "a321a214-5272-40c6-8eb1-3ff054d22618"
+    avm_yor_trace            = "29ec82ef-fdf6-48fc-9b72-6d330496da1d"
     } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
     avm_yor_name = "main"
   } /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))