diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 537491d76..c7df2d60b 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -51,5 +51,3 @@ Steps to reproduce the behavior:
 - **Additional details**: *The more context you can provide, the easier it is (and therefore quicker) to help.*
 
 ## Additional context
-
-
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
index bffdf0c70..7ee4a8625 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -2,12 +2,11 @@
 name: "\U0001F4A1 Suggestion"
 about: Suggest an enhancement to make one of our web part samples even better
 title: Let's make SAMPLE even better
-labels: "\U0001F4A1 Enhancement"
+labels: ''
 assignees: ''
 
 ---
 
-
 Thank you for your suggestion! Use the sections below to submit a suggestion ONLY if it's related to samples in this repo. If you have an issue or question about list formatting or its documentation, please submit it at https://aka.ms/spdev-issues
 
 - Suggestions that do not follow the below template will automatically be closed
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index cc7314459..22bd0f86c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -31,4 +31,3 @@ DELETE EVERYTHING ABOVE AFTER READING - THANKS!
 ## Question (the more details, the better)
 
 ## Question
-
diff --git a/.github/ISSUE_TEMPLATE/samplerequest.md b/.github/ISSUE_TEMPLATE/samplerequest.md
index 5348ad1d4..a33210638 100644
--- a/.github/ISSUE_TEMPLATE/samplerequest.md
+++ b/.github/ISSUE_TEMPLATE/samplerequest.md
@@ -2,7 +2,7 @@
 name: "\U0001F9EA Sample request"
 about: Request a new sample from the community
 title: ''
-labels: ''
+labels: type:sample-request
 assignees: ''
 
 ---
@@ -22,6 +22,3 @@ DELETE EVERYTHING ABOVE AFTER READING - THANKS!
 
 
 ## Are you Willing to Help?
-
-
-