diff --git a/.github/auto-labeler.yml b/.github/auto-labeler.yml
index 9727d7434e..47770e6244 100644
--- a/.github/auto-labeler.yml
+++ b/.github/auto-labeler.yml
@@ -1,23 +1,56 @@
 version: v1
 
 labels:
-  - label: 'enhancement'
+  - label: 'ignore-for-release'
+    sync: true
+    matcher:
+      title: '^[vV]?\d+(\.\d+){2}.*'
+      body: '#ignore'
+  - label: 'breaking-change'
     sync: true
     matcher:
-      title: '^feat:.*'
-  - label: 'document'
+      title: '^.+!:|#breaking'
+      body: '#breaking'
+  - label: 'enhancement'
     sync: true
     matcher:
-      title: '^docs:.*'
+      title: '^[fF]eat.*'
   - label: 'bug'
     sync: true
     matcher:
-      title: '^fix:.*'
-  - label: 'ospp-2024'
+      title: '^[fF]ix.*'
+  - label: 'documentation'
+    sync: true
+    matcher:
+      title: '^[dD](ocs|ocumentation).*'
+      files: 'docs/**/*.md'
+  - label: 'refactoring'
+    sync: true
+    matcher:
+      title: '^[rR]efactor.*'
+  - label: 'test'
+    sync: true
+    matcher:
+      title: '^[tT]est.*'
+      files: '**/__tests__/**'
+  - label: 'chore'
+    sync: true
+    matcher:
+      title: '^[cC]hore.*'
+  - label: 'ci'
+    sync: true
+    matcher:
+      title: '^[cC]i.*'
+      files: '.github/**'
+  - label: 'ospp'
+    sync: true
+    matcher:
+      baseBranch: '^ospp-\d+\/.*'
+  - label: '1.x'
     sync: true
     matcher:
-      baseBranch: '^ospp-2024/.*'
-  - label: 'refactor-main'
+      baseBranch: '^v1\.x'
+  - label: 'release'
     sync: true
     matcher:
-      baseBranch: 'refactor/develop'
+      baseBranch: '^release\/v2.*'
diff --git a/.github/release.yml b/.github/release.yml
index 274543b227..578dc43938 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -2,8 +2,6 @@ changelog:
   exclude:
     labels:
       - ignore-for-release
-    authors:
-      - allcontributors[bot]
   categories:
     - title: Breaking Changes 🛠
       labels:
@@ -18,9 +16,16 @@ changelog:
       labels:
         - Semver-Patch
         - bug
-    - title: Other Changes
+    - title: "📖 Documentation"
       labels:
         - documentation
+    - title: "🔧 Maintenance"
+      labels:
         - refactoring
+        - test
         - unit-test
+        - chore
         - ci
+    - title: "Other Changes"
+      labels: ["*"]
+      collapse: true