diff --git a/.asf.yaml b/.asf.yaml
index eb3074b2b6..c8f8b42fa6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -34,8 +34,9 @@ github:
     squash:  true
     merge:   false
     rebase:  true
+  autolink_jira: HBASE
 notifications:
   commits:      commits@hbase.apache.org
   issues:       issues@hbase.apache.org
   pullrequests: issues@hbase.apache.org
-  jira_options: link
+  jira_options: link label