diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index f821eb3524..edb58358a1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,8 +1,7 @@
 ---
 name: Bug report
-about: Create a report to help us improve Superset's stability! For feature requests please open a discussion at https://github.com/apache/superset/discussions/categories/ideas
-labels: "#bug"
-
+about: "Create a report to help us improve Superset's stability! For feature requests please open a discussion [here](https://github.com/apache/superset/discussions/categories/ideas)."
+labels: bug
 ---
 
 A clear and concise description of what the bug is.
diff --git a/.github/ISSUE_TEMPLATE/cosmetic.md b/.github/ISSUE_TEMPLATE/cosmetic.md
index 753c2bc5cd..1a2e6ea2da 100644
--- a/.github/ISSUE_TEMPLATE/cosmetic.md
+++ b/.github/ISSUE_TEMPLATE/cosmetic.md
@@ -2,7 +2,6 @@
 name: Cosmetic Issue
 about: Describe a cosmetic issue with CSS, positioning, layout, labeling, or similar
 labels: "cosmetic-issue"
-
 ---
 
 ## Screenshot
diff --git a/.github/ISSUE_TEMPLATE/sip.md b/.github/ISSUE_TEMPLATE/sip.md
index c2b0a14b91..c01e7b1ab7 100644
--- a/.github/ISSUE_TEMPLATE/sip.md
+++ b/.github/ISSUE_TEMPLATE/sip.md
@@ -1,10 +1,9 @@
 ---
 name: SIP
-about: Superset Improvement Proposal (See SIP-0: https://github.com/apache/superset/issues/5602)
-labels: "#SIP"
+about: "Superset Improvement Proposal. See [here](https://github.com/apache/superset/issues/5602) for details."
+labels: sip
 title: "[SIP] Your Title Here (do not add SIP number)"
 asignees: "apache/superset-committers"
-
 ---
 
 *Please make sure you are familiar with the SIP process documented*