diff --git a/.github/ISSUE_TEMPLATE/general-issues.md b/.github/ISSUE_TEMPLATE/general-issues.md
new file mode 100644
index 0000000000000..50ed5ffd934d8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-issues.md
@@ -0,0 +1,41 @@
+---
+name: General Issues
+about: Please use this template to submit issues for review
+title: ''
+labels: needs-triage
+assignees: ''
+
+---
+
+**Note: for support questions, please first reference our [documentation](https://docs.aws.amazon.com/cdk/api/latest), then use [Stackoverflow](https://stackoverflow.com/questions/ask?tags=aws-cdk)**. This repository's issues are intended for feature requests and bug reports.
+
+* **I'm submitting a ...**
+  - [ ] :beetle: bug report
+  - [ ] :rocket: feature request
+  - [ ] :books: construct library gap
+  - [ ] :phone: security issue or vulnerability => Please see [policy](https://github.com/awslabs/aws-cdk/security/policy)
+  - [ ] :question: support request => Please see note at the top of this template.
+
+
+* **What is the current behavior?**
+*If the current behavior is a :beetle:bug:beetle:: Please provide the steps to reproduce*
+
+
+
+* **What is the expected behavior (or behavior of feature suggested)?**
+
+
+
+* **What is the motivation / use case for changing the behavior or adding this feature?**
+
+
+
+* **Please tell us about your environment:**
+  
+  - CDK CLI Version: xx.xx.xx
+  - Module Version: xx.xx.xx
+  - OS: [all | Windows 10 | OSX Mojave | Ubuntu | etc... ]
+  - Language: [all | TypeScript | Java | Python ]
+
+
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc)
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
new file mode 100644
index 0000000000000..932e8e5f2f4f7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -0,0 +1,41 @@
+---
+name: Issue_Template
+about: Submit a formatted issue for attention by the CDK team
+title: ''
+labels: needs-triage
+assignees: ''
+
+---
+
+**Note: for support questions, please first reference our [documentation](https://docs.aws.amazon.com/cdk/api/latest), then use [Stackoverflow](https://stackoverflow.com/questions/ask?tags=aws-cdk)**. This repository's issues are intended for feature requests and bug reports.
+
+* **I'm submitting a ...**
+  - [ ] :beetle: bug report
+  - [ ] :rocket: feature request
+  - [ ] :books: construct library gap
+  - [ ] :phone: security issue or vulnerability => Please see [policy](https://github.com/awslabs/aws-cdk/security/policy)
+  - [ ] :question: support request => Please see note at the top of this template.
+
+
+* **What is the current behavior?**
+*If the current behavior is a :beetle:bug:beetle:: Please provide the steps to reproduce*
+
+
+
+* **What is the expected behavior (or behavior of feature suggested)?**
+
+
+
+* **What is the motivation / use case for changing the behavior or adding this feature?**
+
+
+
+* **Please tell us about your environment:**
+  
+  - CDK CLI Version: xx.xx.xx
+  - Module Version: xx.xx.xx
+  - OS: [all | Windows 10 | OSX Mojave | Ubuntu | etc... ]
+  - Language: [all | TypeScript | Java | Python ]
+
+
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc)