diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 0eac250..2f64c88 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,33 +1,69 @@
-name-template: 'Release v${{NEXT_VERSION}}'
-tag-template: 'v${{NEXT_VERSION}}'
+name-template: 'Release v${{ env.RELEASE_VERSION }}'
+tag-template: 'v${{ env.RELEASE_VERSION }}'
 categories:
   - title: '🚀 Features'
     labels:
       - 'feature'
-      - 'enhancement'
+    collapse-after: 3
   - title: '🐛 Bug Fixes'
     labels:
       - 'fix'
       - 'bugfix'
       - 'bug'
+    collapse-after: 3
   - title: '🧰 Maintenance'
     labels:
       - 'chore'
       - 'maintenance'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-change-title-escapes: '\<*_&'
-version-resolver:
-  major:
+    collapse-after: 3
+  - title: '🔨 Refactor'
     labels:
-      - 'major'
-  minor:
+      - 'refactor'
+      - 'refactoring'
+    collapse-after: 3
+  - title: '🧪 Testing'
     labels:
-      - 'minor'
-  patch:
+      - 'tests'
+      - 'testing'
+      - 'test'
+      - 'unittest'
+      - 'pytest'
+    collapse-after: 3
+  - title: '📚 Documentation'
     labels:
-      - 'patch'
-  default: patch
-template: |
-  ## Changes
+      - 'docs'
+      - 'documentation'
+    collapse-after: 3
+  - title: '🔒 Security'
+    labels:
+      - 'security'
+      - 'vulnerability'
+      - 'vulnerabilities'
+      - 'security-fix'
+      - 'security-fixes'
+      - 'security-update'
+      - 'security-updates'
+      - 'security-patch'
+      - 'security-patches'
+      - 'security-release'
+      - 'security-releases'
+      - 'security-issue'
+      - 'security-issues'
+      - 'security-bug'
+      - 'security-bugs'
+      - 'security-vulnerability'
+      - 'security-vulnerabilities'
+      - 'security-notice'
+      - 'security-notices'`
+    collapse-after: 3
+  - title: 'Enhancement'
+    collapse-after: 3
+change-template: '- $TITLE by @$AUTHOR in (#$NUMBER)'
+change-title-escapes: '\<*_&'
 
+template: |
+  ## What’s Changed
   $CHANGES
+
+  ## New Contributors
+  $CONTRIBUTORS
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a045b36..2a752af 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -78,8 +78,8 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }}
 
   create-release:
-    needs: build-and-publish
-    if: needs.build-and-publish.outputs.publish_to_pypi == 'true'
+    needs: [prepare-and-check, build-and-publish]
+    if: needs.prepare-and-check.outputs.publish_to_pypi == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -95,6 +95,9 @@ jobs:
         with:
           inputs: ./dist/*.tar.gz ./dist/*.whl
 
+      - name: Set Release Version Env
+        run: echo "RELEASE_VERSION=${{ needs.prepare-and-check.outputs.version }}" >> $GITHUB_ENV
+
       - name: Draft Release
         id: draft_release
         uses: release-drafter/release-drafter@v6