diff --git a/.github/workflows/green_master.yaml b/.github/workflows/green_master.yaml
index 5ae388d01..1984aa692 100644
--- a/.github/workflows/green_master.yaml
+++ b/.github/workflows/green_master.yaml
@@ -31,8 +31,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh api --method GET -f head_sha=$(git rev-parse HEAD) -f status=completed -f exclude_pull_requests=true /repos/emqx/emqx/actions/runs > runs.json
-          for id in $(jq -r '.workflow_runs[] | select((."conclusion" != "success") and .run_attempt < 3) | .id' runs.json); do
+          gh api --method GET -f head_branch=master -f status=completed -f exclude_pull_requests=true /repos/emqx/emqx/actions/runs > runs.json
+          for id in $(jq -r '.workflow_runs[] | select((."conclusion" == "failure") and (."name" != "Keep master green") and .run_attempt < 3) | .id' runs.json); do
             echo "rerun https://github.com/emqx/emqx/actions/runs/$id"
-            gh api --method POST /repos/emqx/emqx/actions/runs/$id/rerun-failed-jobs
+            gh api --method POST /repos/emqx/emqx/actions/runs/$id/rerun-failed-jobs || true
           done
diff --git a/scripts/spellcheck/spellcheck.sh b/scripts/spellcheck/spellcheck.sh
index 920fb6453..0abb46fdf 100755
--- a/scripts/spellcheck/spellcheck.sh
+++ b/scripts/spellcheck/spellcheck.sh
@@ -29,7 +29,7 @@ set +e
 docker run --rm -i ${DOCKER_TERMINAL_OPT} --name spellcheck \
     -v "${PROJ_ROOT}"/scripts/spellcheck/dicts:/dicts \
     -v "$SCHEMA":/schema.json \
-    ghcr.io/emqx/emqx-schema-validate:0.5.0 -j 10 /schema.json
+    ghcr.io/emqx/emqx-schema-validate:0.5.1 -j 10 /schema.json
 
 result="$?"