diff --git a/docs/wiki/[User-Guide]-Upgrade-from-v5.2.1-to-v6.0.0.md b/docs/wiki/[User-Guide]-Upgrade-from-v5.2.1-to-v6.0.0.md
index 5e1edfd3e..d92cc6ef6 100644
--- a/docs/wiki/[User-Guide]-Upgrade-from-v5.2.1-to-v6.0.0.md
+++ b/docs/wiki/[User-Guide]-Upgrade-from-v5.2.1-to-v6.0.0.md
@@ -23,7 +23,7 @@ See: <https://github.com/Azure/Enterprise-Scale/wiki/ALZ-Policies>
 
 ## Azure Monitor Agent
 
-The Microsoft Monitoring Agent is deprecated and all assignments have been removed, howwver the policy definitions remain.
+The Microsoft Monitoring Agent is deprecated and all assignments have been removed, however the policy definitions remain.
 We now assign polices that deploy the Azure Monitor Agent (AMA) instead of the Microsoft Monitoring Agent (MMA).
 We deploy AMA resources using the new `configure_management_resources` variable.
 
diff --git a/modules/management/locals.tf b/modules/management/locals.tf
index f2cc2deec..ab79a112f 100644
--- a/modules/management/locals.tf
+++ b/modules/management/locals.tf
@@ -37,8 +37,9 @@ locals {
   custom_settings_aa                  = try(local.custom_settings.azurerm_automation_account["management"], local.empty_map)
   custom_settings_uami                = try(local.custom_settings.azurerm_user_assigned_identity["management"], local.empty_map)
   custom_settings_la_linked_service   = try(local.custom_settings.azurerm_log_analytics_linked_service["management"], local.empty_map)
-  custom_settings_dcr_vm_insights     = try(local.custom_settings.azurerm_data_collection_rule["management"]["vminsights"], local.empty_map)
-  custom_settings_dcr_change_tracking = try(local.custom_settings.azurerm_data_collection_rule["management"]["change_tracking"], local.empty_map)
+  custom_settings_dcr_vm_insights     = try(local.custom_settings.azurerm_data_collection_rule["vm_insights"], local.empty_map)
+  custom_settings_dcr_change_tracking = try(local.custom_settings.azurerm_data_collection_rule["change_tracking"], local.empty_map)
+  custom_settings_dcr_defender_sql    = try(local.custom_settings.azurerm_data_collection_rule["defender_sql"], local.empty_map)
 }
 
 # Logic to determine whether specific resources
@@ -423,12 +424,12 @@ locals {
 locals {
   azure_monitor_data_collection_rule_defender_sql_resource_id = "${local.resource_group_resource_id}/providers/Microsoft.Insights/dataCollectionRules/${local.azure_monitor_data_collection_rule_defender_sql.name}"
   azure_monitor_data_collection_rule_defender_sql = {
-    name                      = lookup(local.custom_settings_dcr_change_tracking, "name", "${local.resource_prefix}-dcr-defendersql-prod${local.resource_suffix}")
+    name                      = lookup(local.custom_settings_dcr_defender_sql, "name", "${local.resource_prefix}-dcr-defendersql-prod${local.resource_suffix}")
     parent_id                 = local.resource_group_resource_id
     type                      = "Microsoft.Insights/dataCollectionRules@2021-04-01"
-    location                  = lookup(local.custom_settings_dcr_vm_insights, "location", local.location)
+    location                  = lookup(local.custom_settings_dcr_defender_sql, "location", local.location)
     schema_validation_enabled = true
-    tags                      = lookup(local.custom_settings_dcr_vm_insights, "tags", local.tags)
+    tags                      = lookup(local.custom_settings_dcr_defender_sql, "tags", local.tags)
     body = {
       properties = {
         description = "Data collection rule for Defender for SQL.",
diff --git a/modules/management/variables.tf b/modules/management/variables.tf
index 179aff872..9f484b070 100644
--- a/modules/management/variables.tf
+++ b/modules/management/variables.tf
@@ -136,7 +136,7 @@ variable "custom_settings_by_resource_type" {
   default     = {}
 
   validation {
-    condition     = can([for k in keys(var.custom_settings_by_resource_type) : contains(["azurerm_resource_group", "azurerm_log_analytics_workspace", "azurerm_log_analytics_solution", "azurerm_automation_account", "azurerm_log_analytics_linked_service"], k)]) || var.custom_settings_by_resource_type == {}
+    condition     = can([for k in keys(var.custom_settings_by_resource_type) : contains(["azurerm_resource_group", "azurerm_log_analytics_workspace", "azurerm_log_analytics_solution", "azurerm_automation_account", "azurerm_log_analytics_linked_service", "azurerm_data_collection_rule"], k)]) || var.custom_settings_by_resource_type == {}
     error_message = "Invalid key specified. Please check the list of allowed resource types supported by the management module for caf-enterprise-scale."
   }
 }