diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 47cb5b6c..f136eadc 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -3,87 +3,115 @@ name-template: "$RESOLVED_VERSION"
 tag-template: "$RESOLVED_VERSION"
 include-pre-releases: true
 categories:
-  - title: "💣 Breaking Changes"
+  - title: 💣 Breaking Changes
     labels:
-      - "breaking change"
-  - title: "🔔 Deprecation Warnings"
+      - breaking change
+  - title: 🔔 Deprecation Warnings
     labels:
-      - "deprecation"
-  - title: "🚀 Features"
+      - deprecation
+  - title: 🚀 Features
     labels:
-      - "feature"
-  - title: "🎉 Enhancements"
+      - enhancement
+  - title: 🐛 Bug Fixes
     labels:
-      - "enhancement"
-  - title: "🐛 Bug Fixes"
+      - bug
+  - title: 🧪 Tests
     labels:
-      - "bug"
-  - title: "🧪 Tests"
+      - tests
+  - title: 🔨 Maintenance
     labels:
-      - "tests"
-  - title: "📝 Documentation"
+      - chore
+  - title: 👷 CI/CD
     labels:
-      - "documentation"
-  - title: "⬆️ Dependencies"
+      - ci
+  - title: ⬆️ Dependencies
+    collapse-after: 15
     labels:
-      - "dependencies"
+      - dependencies
+  - title: 📝 Documentation
+    labels:
+      - documentation
+  - title: Other Changes
+    labels:
+      - "*"
 exclude-labels:
-  - "skip-changelog"
+  - skip changelog
 version-resolver:
   minor:
     labels:
-      - "breaking change"
-      - "deprecation"
+      - breaking change
+      - deprecation
   patch:
     labels:
-      - "bug"
-      - "dependencies"
-      - "documentation"
-      - "feature"
-      - "enhancement"
+      - bug
+      - ci
+      - chore
+      - dependencies
+      - documentation
+      - enhancement
+      - tests
   default: patch
 autolabeler:
-  - label: "breaking change"
+  - label: breaking change
     body:
       - "/breaking/i"
-  - label: "deprecation"
+    title:
+      - "/breaking/i"
+      - "/^\\w+!/i"
+  - label: deprecation
     branch:
       - "/deprecate\/.+/"
     title:
       - "/deprecate/i"
-  - label: "feature"
+  - label: enhancement
     branch:
       - "/feat\/.+/"
       - "/feature\/.+/"
     title:
       - "/feat/i"
       - "/feature/i"
-  - label: "enhancement"
-    branch:
-      - "/enhancement\/.+/"
-    title:
-      - "/enhancement/i"
-  - label: "bug"
+  - label: bug
     branch:
       - "/fix\/.+/"
+      - "/bug\/.+/"
+      - "/bugfix\/.+/"
     title:
       - "/fix/i"
-  - label: "tests"
+      - "/bug/i"
+      - "/bugfix/i"
+  - label: tests
     branch:
-      - "/molecule\/.+/"
+      - "/tests{0,1}\/.+/"
+    files:
+      - "/tests/**"
     title:
-      - "/molecule/i"
-  - label: "documentation"
+      - "/tests{0,1}\/.+/i"
+  - label: documentation
     branch:
-      - "/docs\/.+/"
+      - "/docs{0,1}\/.+/"
+      - "/documentation\/.+/"
     files:
-      - "**/!(changelog).md"
+      - "docs/**"
     title:
-      - "/docs/i"
+      - "/docs{0,1}\/.+/i"
       - "/documentation/i"
-  - label: "dependencies"
-    files:
-      - ".github/workflows/requirements/*"
+  - label: ci
+    branch:
+      - "/ci\/.+/"
+    title:
+      - "/ci/i"
+  - label: chore
+    branch:
+      - "/chore\/.+/"
+      - "/refactor\/.+/"
+      - "/style\/.+/"
+    title:
+      - "/chore/i"
+      - "/refactor/i"
+      - "/style/i"
+replacers:
+  - search: "/(\\w+)(\\(\\w+\\))?!?: /g"
+    replace: ""
 template: |
   👾 *Help make the NGINX config Ansible role better by participating in our [survey](https://forms.office.com/Pages/ResponsePage.aspx?id=L_093Ttq0UCb4L-DJ9gcUKLQ7uTJaE1PitM_37KR881UM0NCWkY5UlE5MUYyWU1aTUcxV0NRUllJSC4u)!* 👾
 
@@ -101,5 +129,5 @@ template: |
 
   - Functional configuration examples (check `converge.yml` under each `molecule` scenario) -- [github.com/nginxinc/ansible-role-nginx-config/tree/$RESOLVED_VERSION/molecule](https://github.com/nginxinc/ansible-role-nginx-config/tree/$RESOLVED_VERSION/molecule).
   - Ansible Galaxy repository -- [galaxy.ansible.com/nginxinc/nginx_config](https://galaxy.ansible.com/nginxinc/nginx_config).
-  - NGINX Ansible role & collection introductory blog -- [nginx.com/blog/announcing-nginx-core-collection-ansible](https://www.nginx.com/blog/announcing-nginx-core-collection-ansible).
+  - NGINX Ansible role & collection introductory blog -- [nginx.com/blog/announcing-nginx-core-collection-ansible](https://www.f5.com/blog/announcing-nginx-core-collection-ansible).
   - NGINX: Better with Ansible demo -- [github.com/alessfg/nginx-ansible-demo](https://github.com/alessfg/nginx-ansible-demo).
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60d5dcfd..407858ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,16 +5,19 @@ on:
     branches: [main]
   pull_request_target:
     types: [opened, reopened, synchronize]
+  workflow_dispatch:
 permissions: read-all
 jobs:
-  release-draft:
+  update-release-draft:
     name: Update release draft
     runs-on: ubuntu-24.04
     permissions:
       contents: write
       pull-requests: write
     steps:
-      - name: Run release drafter
+      - name: Run Release Drafter
         uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v6.0.0
+        with:
+          disable-autolabeler: ${{ github.actor == 'renovate[bot]' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa2feb35..902c76b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ CI/CD:
 MAINTENANCE:
 
 - Remove CentOS 7 related artifacts, tests, and metadata since RHEL 7 related distributions are no longer tested nor supported.
+- Tweak Release Drafter to work better with conventional commits.
 
 ## 0.7.1 (October 3rd, 2023)