diff --git a/.github/ISSUE_TEMPLATE/BugReport.yml b/.github/ISSUE_TEMPLATE/BugReport.yml
index 31ec48ec..73083951 100644
--- a/.github/ISSUE_TEMPLATE/BugReport.yml
+++ b/.github/ISSUE_TEMPLATE/BugReport.yml
@@ -1,7 +1,9 @@
 name: Bug Report
 description: Something's not working right in Terraform Juju Provider? Use this 
   template.
-labels: [bug]
+labels:
+  - kind/bug
+  - state/untriaged
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/FeatureRequest.yml b/.github/ISSUE_TEMPLATE/FeatureRequest.yml
index 42869b34..7c75cc25 100644
--- a/.github/ISSUE_TEMPLATE/FeatureRequest.yml
+++ b/.github/ISSUE_TEMPLATE/FeatureRequest.yml
@@ -1,6 +1,8 @@
 name: Feature Request
 description: You want something to be added to Terraform Juju Provider? Proceed with this one.
-labels: [wishlisted]
+labels:
+  - kind/feature
+  - state/untriaged
 body:
   - type: markdown
     attributes:
@@ -41,4 +43,4 @@ body:
       description: |
         Please add relevant notes, links to mattermost chats, other related
         issues/PRs, anything to help diagnose, understand and develop the
-        feature you want.
\ No newline at end of file
+        feature you want.
diff --git a/.github/ISSUE_TEMPLATE/SchemaChanges.yml b/.github/ISSUE_TEMPLATE/SchemaChanges.yml
index 7c11cc72..c9d80528 100644
--- a/.github/ISSUE_TEMPLATE/SchemaChanges.yml
+++ b/.github/ISSUE_TEMPLATE/SchemaChanges.yml
@@ -2,7 +2,10 @@ name: Schema Change
 description: |
   You want to contribute functionality to Terraform Juju Provider,
   requiring a schema change? Proceed with this one.
-labels: [schema changes]
+labels:
+  - area/schema
+  - kind/feature
+  - state/untriaged
 body:
   - type: markdown
     attributes: