diff --git a/eng/tools/ToolDescriptionEvaluator/prompts/namespace-tools.json b/eng/tools/ToolDescriptionEvaluator/prompts/namespace-tools.json
index 12fe3519bb..9c6037b6df 100644
--- a/eng/tools/ToolDescriptionEvaluator/prompts/namespace-tools.json
+++ b/eng/tools/ToolDescriptionEvaluator/prompts/namespace-tools.json
@@ -323,7 +323,7 @@
     {
       "id": "",
       "name": "extension_azqr",
-      "description": "Runs Azure Quick Review CLI (azqr) commands to generate compliance/security reports for Azure resources.\r\nThis tool should be used when the user wants to identify any non-compliant configurations or areas for improvement in their Azure resources.\r\nRequires a subscription id and optionally a resource group name. Returns the generated report file's path.\r\nNote that Azure Quick Review CLI (azqr) is different from Azure CLI (az).",
+      "description": "Runs Azure Quick Review CLI (azqr) to scan an Azure subscription (or resource group) for compliance issues and provide compliance recommendations. Generates a compliance and security assessment report that identifies non-compliant configurations and recommends improvements for your Azure resources. Use this whenever a user wants to scan, check, review, or assess a subscription for compliance issues or compliance recommendations, or wants recommendations to fix compliance and security problems. Requires a subscription (ID or name) and optionally a resource group. Returns the generated report file paths (XLSX and JSON). Note: azqr performs compliance and security scans and is different from Azure CLI (az), from Azure Policy assignments, and from Azure Advisor recommendations for cost, security, reliability, operational excellence, and performance improvements.",
       "command": "extension azqr"
     },
     {
diff --git a/servers/Azure.Mcp.Server/changelog-entries/karishmaghiya-fix-azqr-tool-selection.yaml b/servers/Azure.Mcp.Server/changelog-entries/karishmaghiya-fix-azqr-tool-selection.yaml
new file mode 100644
index 0000000000..abf5bae9b7
--- /dev/null
+++ b/servers/Azure.Mcp.Server/changelog-entries/karishmaghiya-fix-azqr-tool-selection.yaml
@@ -0,0 +1,3 @@
+changes:
+  - section: "Bugs Fixed"
+    description: "Improved the Azure Quick Review (azqr) tool, extension namespace, and consolidated tool descriptions so that prompts asking to scan a subscription for compliance issues or compliance recommendations reliably select the `extension_azqr` tool in All and Namespace modes."
diff --git a/servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json b/servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json
index 78163706e7..c8362a0f74 100644
--- a/servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json
+++ b/servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json
@@ -719,7 +719,7 @@
     },
     {
       "name": "audit_azure_resources_compliance",
-      "description": "Generate compliance and security audit reports for Azure resources using Azure Quick Review (azqr).",
+      "description": "Scan an Azure subscription (or resource group) for compliance issues and provide compliance recommendations using Azure Quick Review (azqr). Generates a compliance and security assessment report identifying non-compliant configurations and recommending improvements. Use this to scan, check, review, or assess a subscription for compliance issues or compliance recommendations. Distinct from Azure Policy assignments and Azure Advisor recommendations for cost, security, reliability, operational excellence, and performance improvements.",
       "toolMetadata": {
         "destructive": {
           "value": false,
diff --git a/tools/Azure.Mcp.Tools.Extension/src/Commands/AzqrCommand.cs b/tools/Azure.Mcp.Tools.Extension/src/Commands/AzqrCommand.cs
index dc47415478..eedaba4490 100644
--- a/tools/Azure.Mcp.Tools.Extension/src/Commands/AzqrCommand.cs
+++ b/tools/Azure.Mcp.Tools.Extension/src/Commands/AzqrCommand.cs
@@ -20,7 +20,7 @@ namespace Azure.Mcp.Tools.Extension.Commands;
     Id = "e7ef18a3-2730-4300-bad3-dc766f47dd2a",
     Name = "azqr",
     Title = "Azure Quick Review CLI Command",
-    Description = "Runs Azure Quick Review CLI (azqr) commands to generate compliance and security reports for Azure resources, identifying non-compliant configurations or areas for improvement. Requires a subscription id and optionally a resource group name. Returns the generated report file path. Note: azqr is different from Azure CLI (az).",
+    Description = "Runs Azure Quick Review CLI (azqr) to scan an Azure subscription (or resource group) for compliance issues and provide compliance recommendations. Generates a compliance and security assessment report that identifies non-compliant configurations and recommends improvements for your Azure resources. Use this whenever a user wants to scan, check, review, or assess a subscription for compliance issues or compliance recommendations, or wants recommendations to fix compliance and security problems. Requires a subscription (ID or name) and optionally a resource group. Returns the generated report file paths (XLSX and JSON). Note: azqr performs compliance and security scans and is different from Azure CLI (az), from Azure Policy assignments, and from Azure Advisor recommendations for cost, security, reliability, operational excellence, and performance improvements."
     Destructive = false,
     Idempotent = true,
     OpenWorld = false,
diff --git a/tools/Azure.Mcp.Tools.Extension/src/ExtensionSetup.cs b/tools/Azure.Mcp.Tools.Extension/src/ExtensionSetup.cs
index 7aca179789..6565789ff4 100644
--- a/tools/Azure.Mcp.Tools.Extension/src/ExtensionSetup.cs
+++ b/tools/Azure.Mcp.Tools.Extension/src/ExtensionSetup.cs
@@ -34,7 +34,7 @@ public CommandGroup RegisterCommands(IServiceProvider serviceProvider)
         bool exposeExternalProcessCommands = ShouldExposeExternalProcessCommands(serviceProvider);
 
         string description = exposeExternalProcessCommands
-            ? "Extension commands for CLI tooling related to Azure. Includes running Azure Quick Review (azqr) for compliance reports, generating Azure CLI commands from user intent, and providing installation instructions for Azure CLI (az), Azure Developer CLI (azd), and Azure Functions Core Tools (func)."
+            ? "Extension commands for CLI tooling related to Azure. Includes running Azure Quick Review (azqr) to scan a subscription for compliance issues and generate compliance and security reports with compliance recommendations, generating Azure CLI commands from user intent, and providing installation instructions for Azure CLI (az), Azure Developer CLI (azd), and Azure Functions Core Tools (func)."
             : "Extension commands for CLI tooling related to Azure. Includes generating Azure CLI commands from user intent and providing installation instructions for Azure CLI (az), Azure Developer CLI (azd), and Azure Functions Core Tools (func).";
 
         var extension = new CommandGroup(Name, description, Title);