diff --git a/.asf.yaml b/.asf.yaml
index e1dde177dc..be8f953aef 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,7 +29,7 @@ github:
   #labels:
   enabled_merge_buttons:
     merge:  false
-    rebase: false
+    rebase: true
     squash: true
   protected_branches:
     master:
@@ -52,5 +52,5 @@ notifications:
   # before use the config, we should ensure the "mail" address has set well (exist)
   #pullrequests_comment: issues@hugegraph.apache.org
   #issues: issues@hugegraph.apache.org
-  #discussions:  issues@hugegraph.apache.org
+  #discussions: issues@hugegraph.apache.org