diff --git a/.asf.yaml b/.asf.yaml
index f49aa6ff46..cc75ef5e03 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -33,6 +33,11 @@ github:
         # it does not work because our github teams are private/secret, see INFRA-25666
         require_code_owner_reviews: false
         required_approving_review_count: 0
+  pull_requests:
+    # allow auto-merge
+    allow_auto_merge: true
+    # auto-delete head branches after being merged
+    del_branch_on_merge: true
   autolink_jira:
     - WW
   dependabot_alerts:  true
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 46dbdede00..ea0d1fa6a8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -32,3 +32,4 @@ updates:
       - dependency-name: "org.springframework:spring-core"
       - dependency-name: "org.apache.struts:struts-annotations"
       - dependency-name: "org.apache.juneau:juneau-marshall"
+      - dependency-name: "org.apache.tomcat:tomcat-api"