diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
index af9817f56..e0c744abd 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_template.md
@@ -1,7 +1,5 @@
 ---
-name: Tracking issue
-about: Use this template for tracking new features.
-title: "[DATE]: [FEATURE NAME]"
-labels: tracking issue, needs triage
-assignees: octocat
+name: Bug
+about: Use this template for tracking bugs.
+title: "[COMPONENT]: [DESCRIPTION]"
 ---
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_template.md b/.github/ISSUE_TEMPLATE/feature_template.md
new file mode 100644
index 000000000..f9bb06037
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_template.md
@@ -0,0 +1,5 @@
+---
+name: Feature
+about: Use this template for proposed new features or enhancement requests
+title: "[COMPONENT]: [DESCRIPTION]"
+---
\ No newline at end of file