diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 0f6a2bc0d..604e4f8f6 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -17,7 +17,7 @@ categories:
       - 'refactor'
   - title: 'Documentation 📖'
     label: 'docs'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-template: '- $SUBJECT (#$NUMBER) - **_Thanks, @$AUTHOR_**!'
 change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
 version-resolver:
   major:
@@ -37,10 +37,13 @@ template: |
 autolabeler:
   - label: 'chore'
     title:
-      - '/chore\:/i'
+      - '/^chore(\(.*\))?\:/i'
+  - label: 'ci'
+    title:
+      - '/^ci(\(.*\))?\:/i'
   - label: 'bug'
     title:
-      - '/fix\:/i'
+      - '/^fix(\(.*\))?\:/i'
   - label: 'enhancement'
     title:
-      - '/feature/i'
+      - '/^feat(\(.*\))?/i'
diff --git a/.github/workflows/release_drafter.yml b/.github/workflows/release_drafter.yml
index ea236d5c5..ad6b78e52 100644
--- a/.github/workflows/release_drafter.yml
+++ b/.github/workflows/release_drafter.yml
@@ -4,12 +4,19 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    # Only following types are handled by the action, but one can default to all as well
+    types: [opened, reopened, synchronize]
+  # # pull_request_target event is required for autolabeler to support PRs from forks
+  # pull_request_target:
+  #   types: [opened, reopened, synchronize]
 
 env:
   AIRBYTE_ANALYTICS_ID: ${{ vars.AIRBYTE_ANALYTICS_ID }}
 
 permissions:
-  contents: read
+  contents: write
+  pull-requests: write
 
 jobs:
   update_release_draft: