diff --git a/.github/ISSUE_TEMPLATE/BugReport.yml b/.github/ISSUE_TEMPLATE/BugReport.yml
index 4ed2c03e..321fb223 100644
--- a/.github/ISSUE_TEMPLATE/BugReport.yml
+++ b/.github/ISSUE_TEMPLATE/BugReport.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: Something's not working right in python-libjuju? Use this template.
-labels: [bug]
+labels: [kind/bug]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/FeatureRequest.yml b/.github/ISSUE_TEMPLATE/FeatureRequest.yml
index 52c17586..be196b26 100644
--- a/.github/ISSUE_TEMPLATE/FeatureRequest.yml
+++ b/.github/ISSUE_TEMPLATE/FeatureRequest.yml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: You want something to be added to python-libjuju? Proceed with this one.
-labels: [wishlisted]
+labels: [kind/wishlist]
 body:
   - type: markdown
     attributes: