diff --git a/.asf.yaml b/.asf.yaml
index 1b6252a6..72c619d9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -69,7 +69,20 @@ github:
 
       # requires all conversations to be resolved before merging is possible
       required_conversation_resolution: true
-  del_branch_on_merge: true
+
+  # Pull request settings
+  pull_requests:
+    # Allow a PR to be merged automatically once all required reviews
+    # and status checks pass.  Committers should only enable it on a PR
+    # whose commit history is already in a mergeable shape; PRs that
+    # need squashing or history cleanup are still merged by hand.
+    allow_auto_merge: true
+    # Show the "Update branch" button, since main requires branches to
+    # be up to date before merging (strict status checks)
+    allow_update_branch: true
+    # Automatically delete head branches after merging
+    del_branch_on_merge: true
+
   dependabot_alerts: true
   dependabot_updates: false
   protected_tags: