diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 931515868..35be94f80 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,2 +1,19 @@
 _extends: .github
-tag-template: versions-maven-plugin-$NEXT_MINOR_VERSION
+name-template: '$RESOLVED_VERSION'
+tag-template: 'versions-maven-plugin-$RESOLVED_VERSION'
+version-resolver:
+  major:
+    labels:
+      - major
+  minor:
+    labels:
+      - minor
+      - enhancement
+  patch:
+    labels:
+      - patch
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES
\ No newline at end of file
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 4e2af9953..8e9603bfe 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 jobs:
   update_release_draft:
     runs-on: ubuntu-latest