diff --git a/.asf.yaml b/.asf.yaml
index 936c8dd38e..63fe6434db 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -37,8 +37,8 @@ github:
     - microservice
     - state-management
   enabled_merge_buttons:
-    squash:  true
     merge:   true
+    squash:  true
     rebase:  false
   protected_branches:
     master: