diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index c8d0e9780..a4a7049cd 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,3 +1,5 @@
+name-template: Home Assistant OS $NEXT_MINOR_VERSION
+version-template: "$MAJOR.$MINOR"
 categories:
   - title: 'Home Assistant Operating System'
     label: 'os'
@@ -5,6 +7,8 @@ categories:
     label: 'build'
   - title: 'Raspberry Pi'
     label: 'board/raspberrypi'
+  - title: 'Home Assistant Yellow'
+    label: 'board/yellow'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
   - title: 'Generic x86-64'
@@ -15,8 +19,9 @@ categories:
     label: 'board/tinker'
   - title: 'Khadas VIM Series'
     label: 'board/khadas'
+  - title: 'Generic aarch64'
+    label: 'board/generic-aarch64'
 filter-by-commitish: true
-commitish: dev
 template: |
   ## Changes
 
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 684391dd8..b4865d078 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - dev
-      - rel-4
+      - rel-*
 
 jobs:
   update_release_draft: