diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..2504bfc04
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Report an issue with an existing Lambda runtime
+title: "[BUG] Enter issue title, including runtime name/version"
+labels: ''
+assignees: ''
+
+---
+
+**For information relating to the patching status of specific CVEs in Lambda runtime images, please contact AWS Support. Please do not create a public GitHub issue. See [README.md](https://github.com/aws/aws-lambda-base-images/blob/main/README.md) for more information.**
+
+**Runtime**
+Which Lambda runtime(s) does this bug apply to?
+If using a container image, specify the exact image tag.
+
+**Describe the bug**
+A clear and concise description of what the issue is.
+
+**To reproduce**
+Steps to reproduce the behavior:
+
+1. ...
+2. ...
+3. ...
+
+**Actual behavior**
+The current behaviour which you are seeing
+
+**Expected behavior**
+What you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment/Tools**
+Describe your environment. How are you building and deploying your functions?
+
+**Impact**
+How does this issue affect you?
+
+**Additional information**
+Add any other information about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..9d9644d81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Share your ideas for how to improve Lambda runtimes
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**For information relating to the patching status of specific CVEs in Lambda runtime images, please contact AWS Support. Please do not create a public GitHub issue. See [README.md](https://github.com/aws/aws-lambda-base-images/blob/main/README.md) for more information.**
+
+**What is the problem you're trying to solve?**
+Describe your context, and the problem you're trying to solve, or the opportunity you see.
+
+**Describe the solution you'd like**
+What solution do you suggest? What is the developer experience you're looking for?
+
+**Alternatives you've considered**
+Describe alternative solutions or features you've considered. What pros/cons do you see?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.