diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 93e7caf35d..89498d8f80 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,6 +6,16 @@ updates:
     target-branch: dev
     schedule:
       interval: monthly
+    commit-message:
+      prefix: build
+    groups:
+      actions-dependencies:
+        update-types:
+        - "minor"
+        - "patch"
+        - "major"
+        patterns:
+          - "*"
 
   - package-ecosystem: npm
     labels: []
@@ -13,6 +23,16 @@ updates:
     target-branch: dev
     schedule:
       interval: monthly
+    commit-message:
+      prefix: build
+    groups:
+      dev-dependencies:
+        update-types:
+        - "minor"
+        - "patch"
+        - "major"
+        patterns:
+          - "*"
 
   - package-ecosystem: gradle
     labels: []
@@ -20,3 +40,13 @@ updates:
     target-branch: dev
     schedule:
       interval: monthly
+    commit-message:
+      prefix: build
+    groups:
+      maven-dependencies:
+        update-types:
+        - "minor"
+        - "patch"
+        - "major"
+        patterns:
+          - "*"
diff --git a/.releaserc b/.releaserc
index 0e4fa8b8aa..1e7fe6df92 100644
--- a/.releaserc
+++ b/.releaserc
@@ -9,12 +9,31 @@
   "plugins": [
     [
       "@semantic-release/commit-analyzer", {
+        "preset": "conventionalcommits",
         "releaseRules": [
           { "type": "build", "scope": "Needs bump", "release": "patch" }
         ]
       }
     ],
     "@semantic-release/release-notes-generator",
+      {
+        "preset": "conventionalcommits",
+        "presetConfig": {
+          "types": [
+            {
+              "type": "feat",
+              "section": "Features"
+            },
+            {
+              "type": "fix",
+              "section": "Bug Fixes"
+            },
+            {
+              "type": "build",
+              "section": "Dependencies and Other Build Updates",
+              "hidden": false
+            }
+          ],
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
     [
diff --git a/package-lock.json b/package-lock.json
index 29e79ed213..d5e91b7078 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
         "@saithodev/semantic-release-backmerge": "^4.0.1",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
+        "conventional-changelog-conventionalcommits": "7.0.2",
         "gradle-semantic-release-plugin": "^1.9.1",
         "semantic-release": "^23.0.0"
       }
@@ -1455,6 +1456,18 @@
         "node": ">=16"
       }
     },
+    "node_modules/conventional-changelog-conventionalcommits": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz",
+      "integrity": "sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==",
+      "dev": true,
+      "dependencies": {
+        "compare-func": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/conventional-changelog-writer": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-7.0.1.tgz",
@@ -2870,6 +2883,13 @@
         "write-file-atomic"
       ],
       "dev": true,
+      "workspaces": [
+        "docs",
+        "smoke-tests",
+        "mock-globals",
+        "mock-registry",
+        "workspaces/*"
+      ],
       "dependencies": {
         "@isaacs/string-locale-compare": "^1.1.0",
         "@npmcli/arborist": "^7.2.1",
diff --git a/package.json b/package.json
index 3101070000..44be7f0909 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "gradle-semantic-release-plugin": "^1.9.1",
+    "conventional-changelog-conventionalcommits": "7.0.2",
     "semantic-release": "^23.0.0"
   }
 }