diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 960162e..20c94a9 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -2,7 +2,7 @@
 name: ask a question
 about: ask us question - assume stackoverflow's guidelines apply here
 title: 'q: ( your question title goes here )'
-labels: 'type: question, status: triage, version: v2'
+labels: 'kind/question, status/triage, area/v2'
 assignees: lynncyrin
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/v1-bug-report.md b/.github/ISSUE_TEMPLATE/v1-bug-report.md
index e524619..cb91610 100644
--- a/.github/ISSUE_TEMPLATE/v1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/v1-bug-report.md
@@ -2,7 +2,7 @@
 name: v1 bug report
 about: Create a report to help us fix v1 bugs
 title: 'v1 bug: ( your bug title goes here )'
-labels: 'type: bug, status: triage, version: v1'
+labels: 'kind/bug, status/triage, area/v1'
 assignees: lynncyrin
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/v2-bug-report.md b/.github/ISSUE_TEMPLATE/v2-bug-report.md
index 8d688a9..9944769 100644
--- a/.github/ISSUE_TEMPLATE/v2-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/v2-bug-report.md
@@ -2,7 +2,7 @@
 name: v2 bug report
 about: Create a report to help us fix v2 bugs
 title: 'v2 bug: ( your bug title goes here )'
-labels: 'type: bug, version: v2, status: triage'
+labels: 'kind/bug, area/v2, status/triage'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/v2-feature-request.md b/.github/ISSUE_TEMPLATE/v2-feature-request.md
index 7fef658..bc527b1 100644
--- a/.github/ISSUE_TEMPLATE/v2-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/v2-feature-request.md
@@ -2,7 +2,7 @@
 name: v2 feature request
 about: Suggest an improvement for v2
 title: 'v2 feature: ( your feature title goes here )'
-labels: 'type: feature, version: v2, status: triage'
+labels: 'type/feature, area/v2, status/triage'
 assignees: ''
 
 ---