diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg
index 65e61b34e7..6a3580a159 100644
--- a/infra/config/commit-queue.cfg
+++ b/infra/config/commit-queue.cfg
@@ -90,6 +90,9 @@ config_groups {
       builders {
         name: "webrtc/try/ios_compile_arm64_rel"
       }
+      builders {
+        name: "webrtc/try/ios_dbg_simulator"
+      }
       builders {
         name: "webrtc/try/linux_asan"
       }
@@ -267,6 +270,9 @@ config_groups {
       builders {
         name: "webrtc/try/ios_compile_arm64_rel"
       }
+      builders {
+        name: "webrtc/try/ios_dbg_simulator"
+      }
       builders {
         name: "webrtc/try/linux_asan"
       }
diff --git a/infra/config/config.star b/infra/config/config.star
index 4f47256b06..a0446516d9 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -53,7 +53,6 @@ def os_from_name(name):
 # useful when a failure can be safely ignored while fixing it without
 # blocking the LKGR finder on it.
 skipped_lkgr_bots = [
-    "iOS Debug (simulator)",
 ]
 
 # Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
@@ -761,8 +760,7 @@ ios_builder("iOS64 Release", "iOS|arm64|rel")
 ios_try_job("ios_compile_arm64_rel")
 ios_builder("iOS Debug (simulator)", "iOS|x64|sim")
 
-# TODO: b/396118151 - Reenable the bot when the issue is fixed.
-ios_try_job("ios_dbg_simulator", cq = None)
+ios_try_job("ios_dbg_simulator")
 ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True)
 ios_try_job("ios_api_framework", recipe = "ios_api_framework")
 
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 6e20161eb1..d50224ea9c 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -1907,6 +1907,7 @@ buckets {
         '          "Win64 Debug (Clang)",'
         '          "Win64 Release (Clang)",'
         '          "iOS API Framework Builder",'
+        '          "iOS Debug (simulator)",'
         '          "iOS64 Debug",'
         '          "iOS64 Release"'
         '        ]'
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index e2835fb848..53a6c5eb3b 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -943,6 +943,11 @@ notifiers {
     name: "iOS Debug (simulator)"
     repository: "https://webrtc.googlesource.com/src"
   }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
 }
 notifiers {
   notifications {