diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
index b15b5c93f4..d938438519 100644
--- a/infra/config/cq.cfg
+++ b/infra/config/cq.cfg
@@ -51,7 +51,8 @@ verifiers {
       builders { name: "ios_api_framework" }
       # TODO(kjellander): Re-enable when https://bugs.webrtc.org/7413 is fixed.
       #builders { name: "linux32_rel" }
-      builders { name: "linux32_arm_dbg" }
+      # TODO(kjellander): Add when bugs.webrtc.org/7090 is fixed.
+      #builders { name: "linux32_arm_dbg" }
       builders { name: "linux32_arm_rel" }
       builders { name: "linux_arm64_dbg" }
       builders { name: "linux_arm64_rel" }
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 25772605cb..b0347e095d 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -94,6 +94,8 @@
       'Mac (swarming)': 'release_bot_x64',
 
       # Linux
+      # TODO(kjellander): Remove when bugs.webrtc.org/7090 is fixed.
+      'Linux32 Debug (ARM)': 'debug_bot_arm',
       'Linux64 GCC': 'gcc_release_bot_x64',
       'Linux (swarming)': 'release_bot_x64',