diff --git a/.asf.yaml b/.asf.yaml
index 14b2e766557..46812c671e4 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -35,8 +35,11 @@ github:
     - java
     - jms
   enabled_merge_buttons:
-    # disable squash button:
-    squash:  false
+    # enable squash button:
+    squash: true
+    # default commit message when merging with a squash commit
+    # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC
+    squash_commit_message: PR_TITLE_AND_DESC
     # disable merge button:
     merge:   false
     # enable rebase button:
diff --git a/pom.xml b/pom.xml
index 2b61bbe0292..2bb8c838b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
       <versions.maven.plugin.version>2.16.1</versions.maven.plugin.version>
       <maven.pmd.plugin.version>3.26.0</maven.pmd.plugin.version>
       <sevntu.checks.version>1.44.1</sevntu.checks.version>
-      <checkstyle.version>10.24.0</checkstyle.version>
+      <checkstyle.version>12.1.1</checkstyle.version>
       <mockito.version>5.18.0</mockito.version>
       <jctools.version>4.0.5</jctools.version>
       <netty.version>4.1.121.Final</netty.version>