diff --git a/.github/release-drafter-3.x.yml b/.github/release-drafter-3.x.yml
new file mode 100644
index 00000000..9947cd84
--- /dev/null
+++ b/.github/release-drafter-3.x.yml
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+_extends: maven-gh-actions-shared:.github/release-drafter.yml
+
+tag-template: maven-filtering-$RESOLVED_VERSION
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 81278175..1fb87736 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -16,4 +16,8 @@
 # under the License.
 
 _extends: maven-gh-actions-shared
-tag-template: maven-filtering-$NEXT_MINOR_VERSION
+
+tag-template: maven-filtering-$RESOLVED_VERSION
+
+include-pre-releases: true
+prerelease: true
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 63c81105..1d427211 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -14,16 +14,14 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-   
+
 name: Release Drafter
 on:
   push:
     branches:
       - master
+  workflow_dispatch:
+
 jobs:
   update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: release-drafter/release-drafter@v6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4