diff --git a/.github/ISSUE_TEMPLATE/cloud-scoring-bug-report.md b/.github/ISSUE_TEMPLATE/cloud-scoring-bug-report.md
index 26105bc..dc3cd09 100644
--- a/.github/ISSUE_TEMPLATE/cloud-scoring-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/cloud-scoring-bug-report.md
@@ -2,7 +2,8 @@
 name: Cloud Scoring Bug Report
 about: Submit a bug in ftc-scoring.firstinspires.org
 title: ''
-labels: Cloud, bug
+labels: Cloud
+type: Bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/cloud-scoring-feature-request.md b/.github/ISSUE_TEMPLATE/cloud-scoring-feature-request.md
index 098cbef..d44285f 100644
--- a/.github/ISSUE_TEMPLATE/cloud-scoring-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/cloud-scoring-feature-request.md
@@ -2,7 +2,8 @@
 name: Cloud Scoring Feature Request
 about: Suggest an idea for for ftc-scoring.firstinspires.org
 title: ''
-labels: Cloud, enhancement
+labels: Cloud
+type: Feature
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/ftc-events-bug-report.md b/.github/ISSUE_TEMPLATE/ftc-events-bug-report.md
index 7e0583d..6eba326 100644
--- a/.github/ISSUE_TEMPLATE/ftc-events-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/ftc-events-bug-report.md
@@ -2,7 +2,8 @@
 name: FTC Events Bug Report
 about: Submit a bug in ftc-events.firstinspires.org (including ftc-api)
 title: ''
-labels: ftc-events, bug
+labels: ftc-events
+type: Bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/ftc-events-feature-request.md b/.github/ISSUE_TEMPLATE/ftc-events-feature-request.md
index 1c21d2a..489543a 100644
--- a/.github/ISSUE_TEMPLATE/ftc-events-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/ftc-events-feature-request.md
@@ -2,7 +2,8 @@
 name: FTC Events Feature Request
 about: Suggest an idea for for ftc-events.firstinspires.org (including ftc-api)
 title: ''
-labels: ftc-events, enhancement
+labels: ftc-events
+type: Feature
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/local--ftclive--bug-report.md b/.github/ISSUE_TEMPLATE/local--ftclive--bug-report.md
index 724d9be..8fd5014 100644
--- a/.github/ISSUE_TEMPLATE/local--ftclive--bug-report.md
+++ b/.github/ISSUE_TEMPLATE/local--ftclive--bug-report.md
@@ -2,7 +2,8 @@
 name: Traditional (FTCLive) Bug Report
 about: Submit a bug in the traditional scoring system
 title: ''
-labels: Local, bug
+labels: Local
+type: Bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/local--ftclive--feature-request.md b/.github/ISSUE_TEMPLATE/local--ftclive--feature-request.md
index a29c676..01837c3 100644
--- a/.github/ISSUE_TEMPLATE/local--ftclive--feature-request.md
+++ b/.github/ISSUE_TEMPLATE/local--ftclive--feature-request.md
@@ -2,7 +2,8 @@
 name: Traditional (FTCLive) Feature Request
 about: Suggest an idea for the traditional scoring system
 title: ''
-labels: Local, enhancement
+labels: Local
+type: Feature
 assignees: ''
 
 ---