diff --git a/.github/draft-config.yml b/.github/draft-config.yml
new file mode 100644
index 000000000..590556e7d
--- /dev/null
+++ b/.github/draft-config.yml
@@ -0,0 +1,62 @@
+name-template: 'Cornac $RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
+autolabeler:
+  - label: 'docs'
+    files:
+      - '*.md'
+    branch:
+      - '/docs{0,1}\/.+/'
+  - label: 'models'
+    files:
+      - '/cornac/models/*.py'
+      - '/cornac/models/**/*.py'
+  - label: 'datasets'
+    files:
+      - '/cornac/datasets/*.py'
+
+template: |
+  # What's Changed
+
+  $CHANGES
+
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+
+categories:
+  - title: 'Breaking'
+    label: 'type: breaking'
+  - title: 'Models'
+    label: 'type: models'
+  - title: 'Datasets'
+    label: 'type: datasets'
+  - title: 'New'
+    label: 'type: feature'
+  - title: 'Bug Fixes'
+    label: 'type: bug'
+  - title: 'Maintenance'
+    label: 'type: maintenance'
+  - title: 'Documentation'
+    label: 'type: docs'
+  - title: 'Other changes'
+  - title: 'Dependency Updates'
+    label: 'type: dependencies'
+    collapse-after: 5
+
+version-resolver:
+  major:
+    labels:
+      - 'type: breaking'
+  minor:
+    labels:
+      - 'type: feature'
+  patch:
+    labels:
+      - 'type: bug'
+      - 'type: maintenance'
+      - 'type: docs'
+      - 'type: dependencies'
+      - 'type: security'
+      - 'type: models'
+      - 'type: datasets'
+
+exclude-labels:
+  - 'skip-changelog'
\ No newline at end of file
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index a65573022..b163bfdbe 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -2,18 +2,25 @@ name: Release Drafter
 
 on:
   push:
-    tags:        
-      - '*'
+    branches:
+      - master
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+permissions:
+  contents: read
 
 jobs:
   update_release_draft:
+    permissions:
+      contents: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - name: Draft release
         uses: release-drafter/release-drafter@v5.25.0
         id: release_drafter
         with:
-          config-name: workflows/release-drafter.yml
-          disable-autolabeler: true
+          config-name: draft-config.yml
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file