diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000000..891c6177548
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
new file mode 100644
index 00000000000..c22ae5d7d37
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new-issue.md
@@ -0,0 +1,10 @@
+---
+name: New Issue
+about: Blank Issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/remediation-component-inclusion-template.md b/.github/ISSUE_TEMPLATE/remediation-component-inclusion-request.md
similarity index 88%
rename from .github/ISSUE_TEMPLATE/remediation-component-inclusion-template.md
rename to .github/ISSUE_TEMPLATE/remediation-component-inclusion-request.md
index 16fc419d8b1..26dd28d39ba 100644
--- a/.github/ISSUE_TEMPLATE/remediation-component-inclusion-template.md
+++ b/.github/ISSUE_TEMPLATE/remediation-component-inclusion-request.md
@@ -1,7 +1,7 @@
 ---
-name: remediation component inclusion template
+name: Remediation Component inclusion Request
 about: Request to add your remediation component to the hub
-title: remediation component inclusion
+title: Remediation Component inclusion
 labels: ''
 assignees: ''