diff --git a/.asf.yaml b/.asf.yaml
index c43fe91b7..ab6aa571e 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,3 +21,9 @@ notifications:
   commits: commits@mynewt.apache.org
   issues: notifications@mynewt.apache.org
   pullrequests: notifications@mynewt.apache.org
+
+github:
+  enabled_merge_buttons:
+    squash:  true
+    merge:   false
+    rebase:  true