diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 6118b3bf48..66014bf890 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -11,8 +11,10 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '🧰 Maintenance'
-    label: 'chore'
+  - title: '📚 Documentation'
+    label: 'documentation'
+  - title: '🔒 Security'
+    label: 'security'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
   ## Changes
@@ -22,3 +24,35 @@ template: |
   ## Contributors
 
   $CONTRIBUTORS
+
+change-title-escapes: '\<*_&"'''
+autolabeler:
+  - label: 'documentation'
+    files:
+      - '*.md'
+    branch:
+      - '/docs{0,1}\/.+/'
+  - label: 'bug'
+    branch:
+      - '/fix\/.+/'
+    title:
+      - '/fix/i'
+  - label: 'enhancement'
+    branch:
+      - '/feature\/.+/'
+    body:
+      - '/[A-Z]+-[0-9]+/'
+  - label: 'documentation'
+    files:
+      - '**/*.md'
+      - 'docs/**/*'
+  - label: 'security'
+    branch:
+      - '/security\/.+/'
+replacers:
+  - search: /"/g
+    replace: ''
+  - search: /'/g
+    replace: ''
+exclude-labels:
+  - 'skip-changelog'
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
index 825bd893f0..79a2a0d1c0 100644
--- a/.github/workflows/pre-release.yaml
+++ b/.github/workflows/pre-release.yaml
@@ -95,16 +95,7 @@ jobs:
         with:
           config-name: release-drafter.yml
           version: ${{ env.version }}
-          tag: ${{ env.LATEST_TAG }}
-
-      - name: Prepare Release Body
-        id: prepare_body
-        run: |
-          $newChanges = '${{ steps.generate_notes.outputs.body }}'
-          $escapedChanges = $newChanges -replace '(?m)^\s*(.+)\s*$', '$1' -replace "'", '\"' -replace '"', '\"' -replace "`n", "\n" -replace "`r", ""
-          echo "body=$escapedChanges" | Out-File -Append -Encoding utf8 $env:GITHUB_OUTPUT
-        shell: pwsh
-
+        
       - name: Create and Upload Release
         id: create_release
         uses: softprops/action-gh-release@v2