diff --git a/triagebot.toml b/triagebot.toml
index 293ad259910fd..c3ed32ce09e36 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -308,6 +308,23 @@ exclude_labels = [
     "T-*",
 ]
 
+trigger_labels = [
+    "D-*",
+    "A-diagnostics",
+]
+
+[autolabel."A-diagnostics"]
+
+trigger_labels = [
+    "D-*",
+]
+
+[autolabel."A-lints"]
+
+trigger_labels = [
+    "L-*",
+]
+
 [autolabel."T-libs"]
 trigger_files = [
     "library/alloc",