diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
index dae68677de..80f6f60a77 100644
--- a/infra/config/cq.cfg
+++ b/infra/config/cq.cfg
@@ -26,36 +26,36 @@ verifiers {
   try_job {
     buckets {
       name: "tryserver.webrtc"
-      builders { name: "android" }
-      builders { name: "android_arm64_rel" }
-      builders { name: "android_clang" }
-      builders { name: "android_gn" }
-      builders { name: "android_gn_rel" }
+      builders { name: "android_dbg" }
       builders { name: "android_rel" }
-      builders { name: "ios" }
-      builders { name: "ios_arm64" }
+      builders { name: "android_arm64_rel" }
+      builders { name: "android_clang_dbg" }
+      builders { name: "android_gn_dbg" }
+      builders { name: "android_gn_rel" }
+      builders { name: "ios_arm64_dbg" }
       builders { name: "ios_arm64_rel" }
+      builders { name: "ios_dbg" }
       builders { name: "ios_rel" }
-      builders { name: "ios32_sim" }
-      builders { name: "ios64_sim" }
-      builders { name: "linux" }
+      builders { name: "ios32_sim_dbg" }
+      builders { name: "ios64_sim_dbg" }
+      builders { name: "linux_compile_dbg" }
       builders { name: "linux_asan" }
-      builders { name: "linux_gn" }
+      builders { name: "linux_gn_dbg" }
       builders { name: "linux_gn_rel" }
       builders { name: "linux_msan" }
       builders { name: "linux_rel" }
       builders { name: "linux_tsan2" }
-      builders { name: "mac" }
+      builders { name: "mac_compile_dbg" }
+      builders { name: "mac_compile_x64_dbg" }
       builders { name: "mac_asan" }
       builders { name: "mac_rel" }
-      builders { name: "mac_x64" }
-      builders { name: "mac_x64_gn" }
+      builders { name: "mac_x64_gn_dbg" }
       builders { name: "mac_x64_gn_rel" }
       builders { name: "mac_x64_rel" }
       builders { name: "presubmit" }
-      builders { name: "win" }
+      builders { name: "win_compile_dbg" }
       builders { name: "win_rel" }
-      builders { name: "win_x64_gn" }
+      builders { name: "win_x64_gn_dbg" }
       builders { name: "win_x64_gn_rel" }
       builders { name: "win_x64_rel" }
       builders { name: "win_drmemory_light" }