diff --git a/.gitlab-ci/bare-metal/cros_servo_run.py b/.gitlab-ci/bare-metal/cros_servo_run.py
index 69902be18aa..dc5014bb283 100755
--- a/.gitlab-ci/bare-metal/cros_servo_run.py
+++ b/.gitlab-ci/bare-metal/cros_servo_run.py
@@ -139,12 +139,6 @@ class CrosServoRun:
                 self.print_error("Detected cheza power management bus error, restarting run...")
                 return 2
 
-            # db820c sometimes wedges around iommu fault recovery
-            if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line):
-                self.print_error(
-                    "Detected kernel soft lockup, restarting run...")
-                return 2
-
             result = re.search("bare-metal result: (\S*)", line)
             if result:
                 if result.group(1) == "pass":
diff --git a/.gitlab-ci/bare-metal/fastboot_run.py b/.gitlab-ci/bare-metal/fastboot_run.py
index f680d4b02f1..eb0b7d4e8ad 100755
--- a/.gitlab-ci/bare-metal/fastboot_run.py
+++ b/.gitlab-ci/bare-metal/fastboot_run.py
@@ -74,6 +74,12 @@ class FastbootRun:
                 self.print_error("Detected spontaneous reboot, restarting run...")
                 return 2
 
+            # db820c sometimes wedges around iommu fault recovery
+            if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line):
+                self.print_error(
+                    "Detected kernel soft lockup, restarting run...")
+                return 2
+
             result = re.search("bare-metal result: (\S*)", line)
             if result:
                 if result.group(1) == "pass":