diff --git a/.github/release-drafter-config.yml b/.github/release-drafter-config.yml
index 4607da071c..9ebf523bb8 100644
--- a/.github/release-drafter-config.yml
+++ b/.github/release-drafter-config.yml
@@ -1,7 +1,28 @@
-name-template: '$NEXT_MINOR_VERSION'
-tag-template: 'v$NEXT_MINOR_VERSION'
+name-template: '$NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+
+
 filter-by-commitish: true
-commitish: master
+commitish: 6.0
+
+pre-release: true
+
+version-resolver:
+  major:
+    labels:
+      - 'breakingchange'
+  minor:
+    labels:
+      - 'feature'
+      - 'deprecation'
+  patch:
+    labels:
+      - 'bug'
+      - 'maintenance'
+      - 'update-docs'
+      - 'dependencies'
+      - 'security'
+
 autolabeler:
   - label: 'maintenance'
     files:
@@ -16,33 +37,37 @@ autolabeler:
   - label: 'feature'
     branch:
       - '/feature-.+'
+
 categories:
-  - title: '🔥 Breaking Changes'
+  - title: '🚀 New Features'
     labels:
-      - 'breakingchange'
+      - 'feature'
   - title: '🧪 Experimental Features'
     labels:
       - 'experimental'
-  - title: '🚀 New Features'
+  - title: '🔥 Breaking Changes'
     labels:
-      - 'feature'
-      - 'enhancement'
+      - 'breakingchange'
+  - title: '⚠️ Deprecations'
+    labels:
+      - 'deprecation'
   - title: '🐛 Bug Fixes'
     labels:
-      - 'fix'
       - 'bugfix'
       - 'bug'
-      - 'BUG'
   - title: '🧰 Maintenance'
     labels:
       - 'maintenance'
       - 'dependencies'
-      - 'documentation'
-      - 'docs'
-      - 'testing'
-change-template: '- $TITLE (#$NUMBER)'
+      - 'techdebt'
+      - 'docs-review'
+      - 'update-docs'
+
+change-template: '- $TITLE $AUTHOR (#$NUMBER)'
+
 exclude-labels:
   - 'skip-changelog'
+
 template: |
   # Changes
 
diff --git a/.github/tmp-release-drafter-cong.yml b/.github/tmp-release-drafter-cong.yml
new file mode 100644
index 0000000000..9ebf523bb8
--- /dev/null
+++ b/.github/tmp-release-drafter-cong.yml
@@ -0,0 +1,80 @@
+name-template: '$NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+
+
+filter-by-commitish: true
+commitish: 6.0
+
+pre-release: true
+
+version-resolver:
+  major:
+    labels:
+      - 'breakingchange'
+  minor:
+    labels:
+      - 'feature'
+      - 'deprecation'
+  patch:
+    labels:
+      - 'bug'
+      - 'maintenance'
+      - 'update-docs'
+      - 'dependencies'
+      - 'security'
+
+autolabeler:
+  - label: 'maintenance'
+    files:
+      - '*.md'
+      - '.github/*'
+  - label: 'bug'
+    branch:
+      - '/bug-.+'
+  - label: 'maintenance'
+    branch:
+      - '/maintenance-.+'
+  - label: 'feature'
+    branch:
+      - '/feature-.+'
+
+categories:
+  - title: '🚀 New Features'
+    labels:
+      - 'feature'
+  - title: '🧪 Experimental Features'
+    labels:
+      - 'experimental'
+  - title: '🔥 Breaking Changes'
+    labels:
+      - 'breakingchange'
+  - title: '⚠️ Deprecations'
+    labels:
+      - 'deprecation'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    labels:
+      - 'maintenance'
+      - 'dependencies'
+      - 'techdebt'
+      - 'docs-review'
+      - 'update-docs'
+
+change-template: '- $TITLE $AUTHOR (#$NUMBER)'
+
+exclude-labels:
+  - 'skip-changelog'
+
+template: |
+  # Changes
+
+  $CHANGES
+
+  ## Contributors
+  We'd like to thank all the contributors who worked on this release!
+
+  $CONTRIBUTORS
+
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 6695abfe4b..dc3321eadd 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -4,6 +4,8 @@ on:
   push:
     # branches to consider in the event; optional, defaults to all
     branches:
+      - ps_rearrange_release_notes_template
+      - 6.0
       - master
 
 permissions: {}
@@ -19,6 +21,6 @@ jobs:
       - uses: release-drafter/release-drafter@v6
         with:
           # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
-           config-name: release-drafter-config.yml
+           config-name: tmp-release-drafter-config.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}