diff --git a/.github/label-pr.json b/.github/label-pr.json
index e32a7ed30b..ff83587a02 100644
--- a/.github/label-pr.json
+++ b/.github/label-pr.json
@@ -1,14 +1,14 @@
 {
   "title_patterns": {
-    "t:feature-app": ["feat", "feature"],
-    "t:feature-tool": ["tool"],
+    "t:feature": ["feat", "feature", "tool"],
     "t:bug": ["fix", "bug", "bugfix"],
     "t:tech-debt": ["refactor", "chore", "cleanup", "revert", "debt", "test", "perf"],
     "t:docs": ["docs"],
     "t:ci": ["ci", "build", "chore(ci)"],
     "t:deps": ["deps"],
     "t:breaking-change": ["breaking", "breaking-change"],
-    "t:misc": ["misc"]
+    "t:misc": ["misc"],
+    "t:llm": ["llm"]
   },
   "path_patterns": {
     "app:shared": [
@@ -28,12 +28,14 @@
     "app:authenticator": [
       "authenticator/"
     ],
-    "t:feature-tool": [
+    "t:feature": [
+      "app/src/main/assets/fido2_privileged_community.json",
+      "app/src/main/assets/fido2_privileged_google.json",
       "testharness/"
     ],
-    "t:feature-app": [
-      "app/src/main/assets/fido2_privileged_community.json",
-      "app/src/main/assets/fido2_privileged_google.json"
+    "t:tech-debt": [
+      "gradle.properties",
+      "keystore/"
     ],
     "t:ci": [
       ".checkmarx/",
@@ -41,7 +43,6 @@
       "scripts/",
       "fastlane/",
       ".gradle/",
-      ".claude/",
       "detekt-config.yml"
     ],
     "t:docs": [
@@ -50,8 +51,8 @@
     "t:deps": [
       "gradle/"
     ],
-    "t:misc": [
-      "keystore/"
+    "t:llm": [
+      ".claude/"
     ]
   }
 }
diff --git a/.github/release.yml b/.github/release.yml
index b50ce23441..67fb7f8d89 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -6,14 +6,13 @@ changelog:
     - title: '✨ Community Highlight'
       labels:
         - community-pr
-    - title: '🚀 New Features & Enhancements'
+    - title: ':shipit: Feature Development'
       labels:
+        - t:feature
         - t:feature-app
+        - t:feature-tool
         - t:new-feature
         - t:enhancement
-    - title: ':shipit: Tools'
-      labels:
-        - t:feature-tool
     - title: '❗ Breaking Changes'
       labels:
         - t:breaking-change