diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..fe3b042
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,45 @@
+---
+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.
+2.
+3.
+4.
+
+---
+
+**System Information**
+
+- OS: [e.g. Ubuntu 22.04, macOS Sierra]
+- Kernel version: [e.g. 6.2.0-39-generic]
+- System architecture: [e.g. x86_64]
+- Airflow version used:
+- aws-mwaa-docker-images commit ID:
+
+---
+
+**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/development-task-template.md b/.github/ISSUE_TEMPLATE/development-task-template.md
new file mode 100644
index 0000000..8aafb47
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/development-task-template.md
@@ -0,0 +1,20 @@
+---
+name: Development task template
+about: A task added by the development team as part of milestone planning
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Overview
+
+<A short overview of what you want achieved when this issue is worked on>
+
+## Acceptance Criteria
+
+<A crisp clear list of criteria that has to be met before this issue can be closed>
+
+## Additional Info
+
+<Optional if you have additional info/context that you are useful to attach>