diff --git a/.github/draft-release-notes-config.yml b/.github/draft-release-notes-config.yml
index 8810497fef..801a3da613 100644
--- a/.github/draft-release-notes-config.yml
+++ b/.github/draft-release-notes-config.yml
@@ -5,38 +5,41 @@ template: |
 
 # Setting the formatting and sorting for the release notes body
 name-template: Version $RESOLVED_VERSION
-change-template: "- $TITLE (PR [#$NUMBER](https://github.com/opendistro-for-elasticsearch/sql/pull/$NUMBER))"
+change-template: "* $TITLE ([#$NUMBER](https://github.com/opendistro-for-elasticsearch/sql/pull/$NUMBER))"
 sort-by: merged_at
 sort-direction: ascending
+replacers:
+  - search: '##'
+    replace: '###'
 
-# Organizing the tagged PRs into categories
+# Organizing the tagged PRs into unified ODFE categories
 categories:
-  - title: "Version Upgrades"
+  - title: 'Breaking Changes'
     labels:
-      - "version compatibility"
-  - title: "SQL and PPL"
+      - 'Breaking Changes'
+  - title: 'Features'
     labels:
-      - "SQL"
-      - "PPL"
-  - title: "SQL CLI"
+      - 'feature'
+  - title: 'Enhancements'
     labels:
-      - "CLI"
-  - title: "SQL JDBC"
+      - 'enhancement'
+  - title: 'Bug Fixes'
     labels:
-      - "JDBC"
-  - title: "SQL ODBC"
+      - 'bug'
+  - title: 'Infrastructure'
     labels:
-      - "ODBC"
-  - title: "SQL Workbench"
+      - 'infra'
+      - 'test'
+      - 'dependencies'
+      - 'github actions'
+  - title: 'Documentation'
     labels:
-      - "Workbench"
-  - title: "Enhancements"
+      - 'documentation'
+  - title: 'Maintenance'
     labels:
-      - "enhancement"
+      - "version compatibility"
       - "maintenance"
-  - title: "Bug Fixes"
-    labels:
-      - "bug"
-  - title: "Documentation"
+  - title: 'Refactoring'
     labels:
-      - "documentation"
+      - 'refactor'
+      - 'code quality'
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
index 200d6a8569..bcd1a017c1 100644
--- a/.github/workflows/draft-release-notes-workflow.yml
+++ b/.github/workflows/draft-release-notes-workflow.yml
@@ -3,19 +3,19 @@ name: Release Drafter
 on:
   push:
     branches:
-      - master
+      - develop
 
 jobs:
   update_release_draft:
     name: Update draft release notes
     runs-on: ubuntu-latest
     steps:
-      # Drafts your next Release notes as Pull Requests are merged into "master"
+      # Drafts your next Release notes as Pull Requests are merged into "develop"
       - name: Update draft release notes
         uses: release-drafter/release-drafter@v5
         with:
           config-name: draft-release-notes-config.yml
           tag: (None)
-          version: 1.9.0.1
+          version: 1.10.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}