diff --git a/config/engine_config.star b/config/engine_config.star
index cfea017..b49c505 100644
--- a/config/engine_config.star
+++ b/config/engine_config.star
@@ -60,8 +60,8 @@
     notifies = [
         luci.notifier(
             name = "engine_build_failure_notification",
-            on_occurrence = ["CANCELED", "FAILURE"],
-            failed_step_regexp = "^(build)|^(test)",
+            on_occurrence = ["INFRA_FAILURE", "FAILURE"],
+            failed_step_regexp = "^(build|test).*",
             notify_emails = ["flutter-engine@grotations.appspotmail.com"],
         ),
     ]
diff --git a/config/generated/flutter/luci/luci-notify.cfg b/config/generated/flutter/luci/luci-notify.cfg
index f56b6cb..166fdd9 100644
--- a/config/generated/flutter/luci/luci-notify.cfg
+++ b/config/generated/flutter/luci/luci-notify.cfg
@@ -6,9 +6,9 @@
 
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -21,9 +21,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -36,9 +36,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -51,9 +51,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -66,9 +66,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -81,9 +81,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -96,9 +96,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -111,9 +111,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -126,9 +126,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -141,9 +141,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -156,9 +156,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -171,9 +171,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -186,9 +186,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -201,9 +201,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -216,9 +216,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -231,9 +231,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -246,9 +246,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -261,9 +261,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -276,9 +276,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -291,9 +291,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -306,9 +306,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -321,9 +321,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -336,9 +336,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -351,9 +351,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -366,9 +366,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }
@@ -381,9 +381,9 @@
 }
 notifiers {
   notifications {
-    on_occurrence: CANCELED
+    on_occurrence: INFRA_FAILURE
     on_occurrence: FAILURE
-    failed_step_regexp: "^(build)|^(test)"
+    failed_step_regexp: "^(build|test).*"
     email {
       recipients: "flutter-engine@grotations.appspotmail.com"
     }