diff --git a/.asf.yaml b/.asf.yaml
index 84c27cbaf0..0c3d78cacd 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -34,8 +34,15 @@ github:
 
     - java
     - jms
+  enabled_merge_buttons:
+    # disable squash button:
+    squash:  false
+    # disable merge button:
+    merge:   false
+    # enable rebase button:
+    rebase:  true
 notifications:
   commits:      commits@activemq.apache.org
   issues:       gitbox@activemq.apache.org
   pullrequests: gitbox@activemq.apache.org
-  jira_options: link label worklog
\ No newline at end of file
+  jira_options: link label worklog