diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index c90a406806..024c2aeacf 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -329,16 +329,16 @@
       'clang', 'openh264', 'release_bot', 'x64',
     ],
     'win_msvc_debug_bot_x86': [
-      'no_clang', 'debug_bot', 'x86', 'no_lld',
+      'no_clang', 'debug_bot_no_goma', 'x86', 'no_lld',
     ],
     'win_msvc_release_bot_x86': [
-      'no_clang', 'release_bot', 'x86', 'no_lld',
+      'no_clang', 'release_bot_no_goma', 'x86', 'no_lld', 'minimal_symbols',
     ],
     'win_msvc_debug_bot_x64': [
-      'no_clang', 'debug_bot', 'x64', 'no_lld'
+      'no_clang', 'debug_bot_no_goma', 'x64', 'no_lld'
     ],
     'win_msvc_release_bot_x64': [
-      'no_clang', 'release_bot', 'x64', 'no_lld',
+      'no_clang', 'release_bot_no_goma', 'x64', 'no_lld', 'minimal_symbols',
     ],
     'win_asan_clang_release_bot_x64': [
       'asan', 'clang',  'full_symbols', 'openh264', 'release_bot', 'x64',
@@ -490,6 +490,10 @@
       'mixins': ['debug', 'goma'],
     },
 
+    'debug_bot_no_goma': {
+      'mixins': ['debug', 'no_goma'],
+    },
+
     'debug_static_bot': {
       'mixins': ['debug', 'minimal_symbols', 'goma'],
     },