diff --git a/.asf.yaml b/.asf.yaml
index 5aaccf1388..c005d46062 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -35,6 +35,8 @@ github:
     squash: true
     rebase: false
 
+  del_branch_on_merge: true
+
   protected_branches:
     main:
       required_pull_request_reviews:
@@ -43,8 +45,6 @@ github:
 
       required_linear_history: true
 
-      del_branch_on_merge: true
-
       required_status_checks:
         # strict means "Require branches to be up to date before merging".
         strict: false
@@ -61,6 +61,8 @@ github:
     wiki: false
     issues: true
     projects: true
+    discussions: true
+
   ghp_branch: gh-pages
   ghp_path: /
 
@@ -73,6 +75,7 @@ notifications:
   commits:      commits@polaris.apache.org
   issues:       issues@polaris.apache.org
   pullrequests: issues@polaris.apache.org
+  discussions:  issues@polaris.apache.org
   jira_options: link label
 
 publish: