diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 17514165c..b8ef7e061 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -1,11 +1,11 @@
 <!--
 Thanks for sending a pull request!  Here are some tips for you:
-  1. If this is your first time, please read our contributor guidelines: https://github.com/yaooqinn/kyuubi#contributing
+  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
 -->
 
 ### Please add issue ID here?
 <!-- replace ${issue ID} with the actual issue id -->
-Fixes ${issue ID}
+Fixes #${issue ID}
 
 ### Why are the changes needed?
 <!--
diff --git a/.github/pr-badge.yml b/.github/pr-badge.yml
index 045a7e21c..d9f176de2 100644
--- a/.github/pr-badge.yml
+++ b/.github/pr-badge.yml
@@ -10,12 +10,12 @@
 - label: "Missing"
   message: "Target Issue"
   color: "#ff0000"
-  when: "$payload.pull_request.body.includes('fixes # ') === false"
+  when: "$payload.pull_request.body.includes('fixes #') === false"
 
 - label: "Missing"
   message: "Test Plan"
   color: "#ff0000"
-  when: "$payload.pull_request.body.includes('## Test Plan ') === false"
+  when: "$payload.pull_request.body.includes('## Test Plan') === false"
 
 - label: "Label"
   message: "Feature"