diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 933361a0d..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
-Before reporting a new issue, make sure we don't have any duplicates already open or closed by
-searching the issues list. If there is a duplicate, re-open or add a comment to the
-existing issue instead of creating a new one. If you are reporting a bug,
-make sure to include relevant information asked below to help with debugging.
-
-## GENERAL HELP QUESTIONS ##
-GitHub Issues is for bug reports and feature requests. If you have general support
-questions, the following locations are a good place:
-
-- Post a question in StackOverflow  with "aws-sam" tag
-
--->
-
-**Description:**
-
-<!-- Briefly describe the problem you are facing -->
-
-**Steps to reproduce the issue:**
-1.
-2.
-3.
-
-**Observed result:**
-
-**Expected result:**
-
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 27d29d044..bd9c12d27 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: ''
-labels: ''
+title: "Bug: TITLE"
+labels: ['type/bug', 'stage/needs-triage']
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..ec4bb386b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 144feb3fb..64240dabc 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,8 @@
 ---
 name: Feature request
 about: Suggest an idea/feature/enhancement for the SAM Translator
-title: ''
-labels: ''
+title: "Feature request: TITLE"
+labels: ['type/feature', 'stage/needs-triage']
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 000000000..a2863345c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,8 @@
+---
+name: Other
+about: Choose if your issue doesn't apply to the other templates
+title: ''
+labels: ['stage/needs-triage']
+assignees: ''
+
+---
\ No newline at end of file
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index e4d50db9d..434e6ada4 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -26,6 +26,6 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: ['pr/external']
+                labels: ['pr/external', 'stage/needs-triage']
               })
             }