diff --git a/.github/workflows/automerge_scan.yml b/.github/workflows/automerge_scan.yml
index fed485e8da91..15eb65dd617f 100644
--- a/.github/workflows/automerge_scan.yml
+++ b/.github/workflows/automerge_scan.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   automerge_scan:
-    #if: github.repository_owner == 'sonic-net'
+    if: github.repository_owner == 'sonic-net'
     runs-on: ubuntu-latest
     steps:
     - name: Debug
@@ -42,9 +42,11 @@ jobs:
 
             # EasyCLA success flag:  state=SUCCESS
             # Others success flag:   conclusion in SUCCESS,NEUTRAL
-            if echo $name | grep Semgrep;then
-              continue
-            elif [[ "$state" == "SUCCESS" ]];then
+            # Ignore Azure.sonic-buildimage stage check result. It may be set continueOnError
+            echo "$name" | grep "Azure.sonic-buildimage (" && continue
+            # Ignore Semgrep, it has issues.
+            [[ "$name" == "Semgrep" ]] && continue
+            if [[ "$state" == "SUCCESS" ]];then
               # check pass
               continue
             elif [[ "$conclusion" == "SUCCESS" ]] || [[ "$conclusion" == "NEUTRAL" ]];then
@@ -53,9 +55,6 @@ jobs:
             else
               echo "$url Check failed!!!"
               echo $check | jq
-              if [[ $created_at > $(date --date "1 day ago" -u +"%FT%TZ") ]];then
-                gh pr comment $url -b "/azp run Azure.sonic-buildimage"
-              fi
               continue 2
             fi
           done