diff --git a/.github/mergify.yml b/.github/mergify.yml
index 0009c95ce0..6b93d13d5d 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -88,7 +88,7 @@ pull_request_rules:
   - name: Blocking PR if missing a related issue
     conditions:
       - base=master
-      - "-body~= #[0-9]{1,6}"
+      - -body~=\#[0-9]{1,6}(\s+|$)
       - -title~=\[automated\]
     actions:
       label:
@@ -96,13 +96,21 @@ pull_request_rules:
           - do-not-merge/missing-related-issue
       comment:
         message: |
-          @{{author}} Please associate the related issue to the body of your Pull Request.  (eg. “issue: #5”)
+          @{{author}} Please associate the related issue to the body of your Pull Request.  (eg. “issue: #6534”)
 
 
   - name: Dismiss block label if related issue be added into PR
     conditions:
       - base=master
-      - "body~= #[0-9]{1,6}"
+      - body~=\#[0-9]{1,6}(\s+|$)
+    actions:
+      label:
+        remove:
+          - do-not-merge/missing-related-issue
+
+  - name: Dismiss block label if automated create PR
+    conditions:
+      - base=master
       - title~=\[automated\]
     actions:
       label: