diff --git a/.github/ISSUE_TEMPLATE/az-module-bug-report.md b/.github/ISSUE_TEMPLATE/az-module-bug-report.md
index ecf0c71ff528..a46d4aaf8df2 100644
--- a/.github/ISSUE_TEMPLATE/az-module-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/az-module-bug-report.md
@@ -2,7 +2,7 @@
 name: Az module bug report
 about: Report errors or unexpected behaviors for the Az module
 title: ''
-labels: triage
+labels: needs-triage
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md b/.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md
index cbe9f74263ff..e777bb28a516 100644
--- a/.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/azurerm-module-bug-report.md
@@ -2,7 +2,7 @@
 name: AzureRM module bug report
 about: Report errors or unexpected behaviors for the AzureRM module
 title: ''
-labels: triage
+labels: needs-triage, AzureRM 6.x
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8cf9da9edb4e..a0f668fe66fe 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest a new feature or improvement
 title: ''
-labels: Azure PS Team, Feature Request, triage
+labels: feature-request, needs-triage
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/internal-issue.md b/.github/ISSUE_TEMPLATE/internal-issue.md
index 0481111b73a8..3c12d5e3fd6a 100644
--- a/.github/ISSUE_TEMPLATE/internal-issue.md
+++ b/.github/ISSUE_TEMPLATE/internal-issue.md
@@ -2,7 +2,7 @@
 name: Internal issue
 about: Azure PowerShell team only
 title: ''
-labels: Azure PS Team, triage
+labels: needs-triage, Engineering
 assignees: ''
 
 ---