diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6f3c0e025..2a23c9209 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -104,21 +104,45 @@ jobs:
           configuration: |
             {
               "categories": [
+                {
+                  "title": "## 🖥️ Black & White Radio Changes",
+                  "labels": ["scope:bw"]
+                },
+                {
+                  "title": "## 🎨 Color Radio Changes",
+                  "labels": ["scope:color"]
+                },
+                {
+                  "title": "## 🎮 Firmware (All Radios Generally)",
+                  "labels": ["scope:firmware", "scope:fw"]
+                },
+                {
+                  "title": "## 💻 Companion Software Changes",
+                  "labels": ["scope:cpn", "companion"]
+                },
                 {
                   "title": "## 🚀 Features",
-                  "labels": ["feat", "feature"]
+                  "labels": ["feat", "enhancement ✨"]
                 },
                 {
                   "title": "## 🐛 Fixes",
-                  "labels": ["fix", "bugfix"]
+                  "labels": ["fix", "bugfix", "bug 🪲", "bug/regression ↩️"]
+                },
+                {
+                  "title": "## 🧹 Chores",
+                  "labels": ["chore", "house keeping 🧹"]
+                },
+                {
+                  "title": "## 🔧 CI/CD",
+                  "labels": ["ci", "ci/cd 🔧"]
                 },
                 {
                   "title": "## 🧪 Tests",
-                  "labels": ["test"]
+                  "labels": ["scope:test", "test", "unit tests 🧪"]
                 },
                 {
                   "title": "## 📝 Documentation",
-                  "labels": ["docs"]
+                  "labels": ["scope:docs", "docs", "documentation 📝"]
                 },
                 {
                   "title": "## 🔨 Refactoring",
@@ -138,8 +162,12 @@ jobs:
               "empty_template": "- No changes",
               "label_extractor": [
                 {
-                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\(.+\\))?(!)?:",
+                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([^)]+\\))?(!)?:",
                   "target": "$1"
+                },
+                {
+                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\\(([^)]+)\\)",
+                  "target": "scope:$2"
                 }
               ]
             }
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 5b1217b26..5aab366d7 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -193,21 +193,45 @@ jobs:
           configuration: |
             {
               "categories": [
+                {
+                  "title": "## 🖥️ Black & White Radio Changes",
+                  "labels": ["scope:bw"]
+                },
+                {
+                  "title": "## 🎨 Color Radio Changes",
+                  "labels": ["scope:color"]
+                },
+                {
+                  "title": "## 🎮 Firmware (All Radios Generally)",
+                  "labels": ["scope:firmware", "scope:fw"]
+                },
+                {
+                  "title": "## 💻 Companion Software Changes",
+                  "labels": ["scope:cpn", "companion"]
+                },
                 {
                   "title": "## 🚀 Features",
-                  "labels": ["feat", "feature"]
+                  "labels": ["feat", "enhancement ✨"]
                 },
                 {
                   "title": "## 🐛 Fixes",
-                  "labels": ["fix", "bugfix"]
+                  "labels": ["fix", "bugfix", "bug 🪲", "bug/regression ↩️"]
+                },
+                {
+                  "title": "## 🧹 Chores",
+                  "labels": ["chore", "house keeping 🧹"]
+                },
+                {
+                  "title": "## 🔧 CI/CD",
+                  "labels": ["ci", "ci/cd 🔧"]
                 },
                 {
                   "title": "## 🧪 Tests",
-                  "labels": ["test"]
+                  "labels": ["scope:test", "test", "unit tests 🧪"]
                 },
                 {
                   "title": "## 📝 Documentation",
-                  "labels": ["docs"]
+                  "labels": ["scope:docs", "docs", "documentation 📝"]
                 },
                 {
                   "title": "## 🔨 Refactoring",
@@ -227,8 +251,12 @@ jobs:
               "empty_template": "- No changes",
               "label_extractor": [
                 {
-                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\(.+\\))?(!)?:",
+                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([^)]+\\))?(!)?:",
                   "target": "$1"
+                },
+                {
+                  "pattern": "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\\(([^)]+)\\)",
+                  "target": "scope:$2"
                 }
               ],
               "max_pull_requests": 1000,