diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8dc87bcc..c4f13edf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve Azure RTOS.
 title: ''
-labels: bug
+labels: bug, hardware
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/hardware-or-architecture-support.md b/.github/ISSUE_TEMPLATE/hardware-or-architecture-support.md
index 213c5829..64c78e1b 100644
--- a/.github/ISSUE_TEMPLATE/hardware-or-architecture-support.md
+++ b/.github/ISSUE_TEMPLATE/hardware-or-architecture-support.md
@@ -13,7 +13,7 @@ Describe in details the hardware support being requested and why this support be
 **Describe why you are asking for this support?**
 Describe why you are asking for this support.
 
-If this is a new board or SoC, please state whether you are willing to maintain the Azure RTOT support together with you.
+If this is a new board or SoC, please state whether you are willing to maintain the Azure RTOS support together with you.
 
 **Additional context**
 Add any other context or graphics (drag-and-drop an image) about the hardware here.