diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index a6f582ad5..4fcffae47 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -1,7 +1,7 @@
 name: 🐞 Bug
 description: File a bug/issue
 title: "<title>"
-labels: [bug, triage]
+labels: ["kind/bug", "status/triage"]
 body:
 - type: checkboxes
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 4b2a356cf..99d6a539e 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,7 +1,7 @@
 name: ⭐️ Feature Request
 description: Request a feature
 title: "<title>"
-labels: [feature, triage]
+labels: ["kind/feature", "status/triage"]
 body:
 - type: checkboxes
   attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
index 002a4a6ee..2c656fa92 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -4,10 +4,10 @@
 
 Fixes #<!-- Link the relevant issue here -->
 
-#### Checklist 
+#### Checklist
 
 <!-- See https://github.com/cerbos/cerbos/blob/main/CONTRIBUTING.md#submitting-pull-requests for more information. -->
 
-- [ ] The PR title has the correct prefix 
+- [ ] The PR title has the correct prefix
 - [ ] PR is linked to the corresponding issue
 - [ ] All commits are signed-off (`git commit -s ...`) to provide the [DCO](https://developercertificate.org/)
diff --git a/.github/renovate.json b/.github/renovate.json
index 4e092d875..392a2244a 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -47,8 +47,8 @@
     }
   ],
   "labels": [
-    "chore",
-    "ci",
+    "kind/chore",
+    "area/dependencies",
     "bots"
   ]
 }