diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 57e9cf3c0..d744348b4 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,6 +1,12 @@
 name-template: "$RESOLVED_VERSION"
 tag-template: "$RESOLVED_VERSION"
 autolabeler:
+  - label: "area/ci"
+    title:
+      - "/^ci/i"
+  - label: "kind/test"
+    title:
+      - "/^test/i"
   - label: "kind/feature"
     title:
       - "/^feat/i"
@@ -32,7 +38,10 @@ categories:
       - "kind/bug"
   - title: "🧰 Maintenance"
     label:
+      - "area/ci"
+      - "kind/test"
       - "kind/refactor"
+      - "kind/chore"
       - "kind/cleanup"
       - "dependencies"
   - title: "📝 Documentation"