diff --git a/.asf.yaml b/.asf.yaml
index 459dcb6e2fe57..5c3b8cb98d964 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -35,12 +35,9 @@ github:
     # Enable projects for project management boards
     projects: true
   enabled_merge_buttons:
-    # enable squash button:
     squash:  true
-    # disable merge button:
     merge:   false
-    # disable rebase button:
-    rebase:  false
+    rebase:  true
   protected_branches:
     master:
       required_status_checks: