diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
index 01d64f7bc7..46c18fa0a1 100644
--- a/infra/config/cq.cfg
+++ b/infra/config/cq.cfg
@@ -26,12 +26,12 @@ verifiers {
       builders { name: "android_dbg" }
       builders { name: "android_rel" }
       builders { name: "android_arm64_rel" }
+      builders { name: "android_chromium_compile" }
       builders { name: "android_compile_mips_dbg" }
       builders { name: "android_compile_x86_dbg" }
       builders { name: "android_compile_x86_rel" }
       builders { name: "android_compile_x64_dbg" }
       builders { name: "android_more_configs" }
-      builders { name: "android_webrtc_compile_rel" }
       builders { name: "ios_arm64_dbg" }
       builders { name: "ios_arm64_rel" }
       builders { name: "ios_dbg" }
@@ -49,7 +49,7 @@ verifiers {
       builders { name: "linux_arm64_rel" }
       builders { name: "linux_asan" }
       builders { name: "linux_baremetal" }
-      builders { name: "linux_chromium_webrtc_compile_rel_ng" }
+      builders { name: "linux_chromium_compile" }
       builders { name: "linux_compile_dbg" }
       builders { name: "linux_libfuzzer_rel" }
       # TODO(bugs.webrtc.org/8356): Investigate fixing and re-enabling.
@@ -63,14 +63,13 @@ verifiers {
       builders { name: "linux_more_configs" }
       builders { name: "mac_asan" }
       builders { name: "mac_baremetal" }
-      builders { name: "mac_chromium_webrtc_compile_rel_ng" }
+      builders { name: "mac_chromium_compile" }
       builders { name: "mac_compile_dbg" }
       builders { name: "mac_rel" }
       builders { name: "presubmit" }
       builders { name: "win_asan" }
       builders { name: "win_baremetal" }
-      # TODO(crbug.com/808111): Fix the breakage caused by long file names.
-      #builders { name: "win_chromium_webrtc_compile_rel_ng" }
+      builders { name: "win_chromium_compile" }
       builders { name: "win_clang_dbg" }
       builders { name: "win_clang_rel" }
       builders { name: "win_dbg" }