diff --git a/.github/release-draft-template-v1.yml b/.github/release-draft-template-v1.yml
index e0c373e1..8c881876 100644
--- a/.github/release-draft-template-v1.yml
+++ b/.github/release-draft-template-v1.yml
@@ -1,7 +1,9 @@
 name-template: "v$RESOLVED_VERSION 🔒"
 tag-template: "v$RESOLVED_VERSION"
+filter-by-commitish: true
 exclude-labels:
   - "skip-changelog"
+version-template: "1.0.0"
 version-resolver:
   major:
     labels:
@@ -24,16 +26,12 @@ categories:
       - "maintenance"
       - "documentation"
 template: |
-  ## What's Changed in v1.x
-
-  This is a maintenance release for the v1.x series. For the latest features and improvements, please consider upgrading to v2.x.
-
   $CHANGES
 
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  Thanks to $CONTRIBUTORS! 🎉
+
+  **See full changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
 
-  Thanks to all contributors! 🎉
-  $CONTRIBUTORS
 no-changes-template: "Changes are coming soon 😎"
 sort-direction: "ascending"
 replacers:
diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml
index df60c01c..64c45292 100644
--- a/.github/release-draft-template.yml
+++ b/.github/release-draft-template.yml
@@ -1,5 +1,6 @@
 name-template: "v$RESOLVED_VERSION 🚀"
 tag-template: "v$RESOLVED_VERSION"
+filter-by-commitish: true
 exclude-labels:
   - "skip-changelog"
 version-resolver:
@@ -26,13 +27,11 @@ categories:
       - "maintenance"
       - "documentation"
 template: |
-  ## What's Changed
   $CHANGES
 
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  Thanks to $CONTRIBUTORS! 🎉
 
-  Thanks to all contributors! 🎉
-  $CONTRIBUTORS
+  **See full changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
 no-changes-template: "Changes are coming soon 😎"
 sort-direction: "ascending"
 replacers:
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 645a9ada..ca3d148d 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -13,5 +13,6 @@ jobs:
       - uses: release-drafter/release-drafter@v6
         with:
           config-name: ${{ github.ref_name == 'v1.x' && 'release-draft-template-v1.yml' || 'release-draft-template.yml' }}
+          commitish: ${{ github.ref_name }}
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_DRAFTER_TOKEN }}