diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 9b731e0b7a..2c150a5661 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug Report 
 about: Create a report to help us squash bugs!
-labels: bug, needs-triage
+labels: "type: bug", "status: waiting-triage"
 ---
 
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
diff --git a/.github/ISSUE_TEMPLATE/epic-template.md b/.github/ISSUE_TEMPLATE/epic-template.md
index 6738bb12d1..32a25e8458 100644
--- a/.github/ISSUE_TEMPLATE/epic-template.md
+++ b/.github/ISSUE_TEMPLATE/epic-template.md
@@ -1,7 +1,7 @@
 ---
 name: EPIC Template
 about: Basic template for EPICs (used by the team)
-labels: epic, needs-triage
+labels: "admin: epic", "status: waiting-triage"
 ---
 
 ## Problem
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 44f19495cd..af7c52c285 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature Request
 about: Create a proposal to request a feature
-labels: enhancement, epic, needs-triage
+labels: "type: feature-request", "admin: epic", "status: waiting-triage"
 ---
 
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
index bef74bd4bb..cbfdaf8247 100644
--- a/.github/ISSUE_TEMPLATE/issue-template.md
+++ b/.github/ISSUE_TEMPLATE/issue-template.md
@@ -1,7 +1,7 @@
 ---
 name: Issue Template
 about: Basic template for issues (used by the team)
-labels: needs-triage
+labels: "status: waiting-triage"
 ---
 
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
diff --git a/.github/ISSUE_TEMPLATE/protocol-change-request.md b/.github/ISSUE_TEMPLATE/protocol-change-request.md
index dd7c9cab75..be15342f29 100644
--- a/.github/ISSUE_TEMPLATE/protocol-change-request.md
+++ b/.github/ISSUE_TEMPLATE/protocol-change-request.md
@@ -1,7 +1,7 @@
 ---
 name: Protocol change proposal
 about: Create a proposal to request a change to the protocol
-labels: protocol-change, needs-triage
+labels: "type: protocol-change", "status: waiting-triage"
 ---
 
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺