diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bd9c12d270..d53cf8edb6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,8 @@
 ---
 name: Bug report
 about: Create an issue to report a bug for the SAM Translator
-title: "Bug: TITLE"
-labels: ['type/bug', 'stage/needs-triage']
+title: 'Bug: TITLE'
+labels: stage/needs-triage, type/bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 64240dabc9..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Feature request
-about: Suggest an idea/feature/enhancement for the SAM Translator
-title: "Feature request: TITLE"
-labels: ['type/feature', 'stage/needs-triage']
-assignees: ''
-
----
-
-<!-- Make sure we don't have an existing Issue for that feature request (open or closed). -->
-
-### Describe your idea/feature/enhancement
-
-Provide a clear description.
-
-Ex: I wish the SAM Translator would [...]
-
-### Proposal
-
-Add details on how to add this to the product.
-
-Things to consider:
-[ ] The [SAM documentation](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification.html) will need to be updated
-
-### Additional Details
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index a2863345ca..e2e2ef889c 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -2,7 +2,9 @@
 name: Other
 about: Choose if your issue doesn't apply to the other templates
 title: ''
-labels: ['stage/needs-triage']
+labels: stage/needs-triage
 assignees: ''
 
----
\ No newline at end of file
+---
+
+