diff --git a/apps/api/src/services/mcp_tool_registry.py b/apps/api/src/services/mcp_tool_registry.py
index 4a22e6ad..ce6585ba 100644
--- a/apps/api/src/services/mcp_tool_registry.py
+++ b/apps/api/src/services/mcp_tool_registry.py
@@ -170,6 +170,11 @@ class MCPToolRegistry:
             list[RegisteredTool]: 推薦工具（已排序）
         """
         suggested: list[RegisteredTool] = []
+        labels = incident_labels or {}
+        has_k8s_locator = any(
+            labels.get(key)
+            for key in ("deployment", "pod", "node", "namespace", "container")
+        )
 
         # 依優先度排序後篩選
         sorted_tools = sorted(self._tools, key=lambda t: t.priority)
@@ -181,7 +186,9 @@ class MCPToolRegistry:
 
             # incident_type_hints 過濾
             if reg.incident_type_hints:
-                if not any(alertname.startswith(hint) for hint in reg.incident_type_hints):
+                matches_hint = any(alertname.startswith(hint) for hint in reg.incident_type_hints)
+                is_k8s_state_tool = SensorDimension.D1_K8S_STATE in reg.dimensions
+                if not matches_hint and not (has_k8s_locator and is_k8s_state_tool):
                     continue
 
             # 感官維度去重（每個維度取優先度最高的一個工具即可）
diff --git a/apps/api/src/services/playbook_match_resolver.py b/apps/api/src/services/playbook_match_resolver.py
index f0e9b4e0..b4154119 100644
--- a/apps/api/src/services/playbook_match_resolver.py
+++ b/apps/api/src/services/playbook_match_resolver.py
@@ -96,10 +96,11 @@ async def _resolve_exact_yaml_rule(
                             """
                             SELECT playbook_id
                             FROM playbooks
-                            WHERE source = 'yaml_rule'
-                              AND status = 'approved'
+                            WHERE status = 'approved'
                               AND (symptom_pattern::jsonb->'alert_names') ? :alertname
-                            ORDER BY updated_at DESC
+                            ORDER BY
+                              CASE WHEN source = 'yaml_rule' THEN 0 ELSE 1 END,
+                              updated_at DESC
                             LIMIT 1
                             """
                         ),
diff --git a/apps/api/tests/test_mcp_tool_registry.py b/apps/api/tests/test_mcp_tool_registry.py
index 7223f3e8..b950fd88 100644
--- a/apps/api/tests/test_mcp_tool_registry.py
+++ b/apps/api/tests/test_mcp_tool_registry.py
@@ -21,7 +21,6 @@ import pytest
 from src.plugins.mcp.interfaces import MCPTool, MCPToolProvider, MCPToolResult
 from src.services.mcp_tool_registry import (
     MCPToolRegistry,
-    RegisteredTool,
     SensorDimension,
     _classify_tool,
 )
@@ -267,6 +266,16 @@ class TestSuggestTools:
         assert "kubectl_describe" not in names
         assert "prometheus_query" in names
 
+    def test_custom_alert_with_deployment_label_gets_k8s_tool(self):
+        registry = self._registry_with_tools()
+        tools = registry.suggest_tools(
+            alertname="AwoooPT16Canary",
+            incident_labels={"deployment": "awoooi-auto-repair-canary", "namespace": "awoooi-prod"},
+        )
+        names = [t.tool.name for t in tools]
+        assert "kubectl_describe" in names
+        assert "prometheus_query" in names
+
     def test_empty_alertname_gets_generic_only(self):
         registry = self._registry_with_tools()
         tools = registry.suggest_tools(alertname="")