diff --git a/triagebot.toml b/triagebot.toml
index 61be91bf..9c23b523 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -1,6 +1,9 @@
 [assign]
 
 [relabel]
+allow-unauthenticated = [
+    "S-*", "A-*", "Edition-*", "bug", "enhancement", "question",
+]
 
 [shortcut]
 
@@ -8,3 +11,14 @@
 remove = []
 add = ["S-waiting-on-author"]
 unless = ["S-blocked", "S-waiting-on-review"]
+
+[autolabel."S-waiting-on-review"]
+new_pr = true
+
+[review-submitted]
+reviewed_label = "S-waiting-on-author"
+review_labels = ["S-waiting-on-review"]
+
+[review-requested]
+remove_labels = ["S-waiting-on-author"]
+add_labels = ["S-waiting-on-review"]