diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 5371d422793e3..0000000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: "\U00002753 General Issue"
-about: Create a new issue
-labels: needs-triage
----
-
-<!-- NOTE:📕 If issue regarding developer guide, please create issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->
-
-## :question: General Issue
-
-<!--
-⚠️ Important Information
-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.
--->
-
-### The Question
-<!--
-Ask your question here. Include any details relevant. Make sure you are not
-falling prey to the [X/Y problem][2]!
-
-[2]: http://xyproblem.info
--->
-
-### Environment
-
-  - **CDK CLI Version:** <!-- Output of `cdk version` -->
-  - **Module Version:** <!-- Version of the module in question -->
-  - **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
-  - **OS:** <!-- [all | Windows 10 | OSX Mojave | Ubuntu | etc... ] -->
-  - **Language:** <!-- [all | TypeScript | Java | Python ] etc... ] -->
-
-
-### Other information
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 6835abe99e034..0000000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: "\U0001F41B Bug Report"
-about: Report a bug
-title: "(module name): short issue description"
-labels: bug, needs-triage
----
-
-<!--
-description of the bug:
--->
-
-
-
-
-### Reproduction Steps
-
-<!--
-minimal amount of code that causes the bug (if possible) or a reference.
-
-The code sample should be an SSCCE. See http://sscce.org/ for details.
-In short, provide a code sample that we can copy/paste, run and reproduce.
--->
-
-### What did you expect to happen?
-
-<!--
-What were you trying to achieve by performing the steps above?
--->
-
-### What actually happened?
-
-<!--
-What is the unexpected behavior you were seeing? If you got an error, paste it here.
--->
-
-
-### Environment
-
-  - **CDK CLI Version  :**
-  - **Framework Version:**
-  - **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
-  - **OS               :**
-  - **Language (Version):** <!-- [all | TypeScript (3.8.3) | Java (8)| Python (3.7.3) | etc... ] -->
-
-### Other
-
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->
-
-
-
-
---- 
-
-This is :bug: Bug Report
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000000000..f77fa5beb193e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,108 @@
+name: Bug Report
+description: Report a bug
+title: "(module name): short issue description"
+labels: [bug, needs-triage]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: What is the problem?
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproduction Steps
+      description: |
+        Minimal amount of code that causes the bug (if possible) or a reference.
+
+        The code sample should be an SSCCE. See http://sscce.org/ for details.
+        In short, provide a code sample that we can copy/paste, run and reproduce.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: What did you expect to happen?
+      description: |
+        What were you trying to achieve by performing the steps above?
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: What actually happened?
+      description: |
+        What is the unexpected behavior you were seeing? If you got an error, paste it here.
+    validations:
+      required: true
+
+  - type: input
+    id: cdk-version
+    attributes:
+      label: CDK CLI Version
+      description: Output of `cdk version`
+    validations:
+      required: true
+
+  - type: input
+    id: framework-version
+    attributes:
+      label: Framework Version
+    validations:
+      required: false
+
+  - type: input
+    id: node-version
+    attributes:
+      label: Node.js Version
+    validations:
+      required: true
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: OS
+    validations:
+      required: true
+
+  - type: dropdown
+    id: language
+    attributes:
+      label: Language
+      multiple: true
+      options:
+        - Typescript
+        - Python
+        - .NET
+        - Java
+        - Go
+    validations:
+      required: true
+
+  - type: input
+    id: language-version
+    attributes:
+      label: Language Version
+      description: E.g. TypeScript (3.8.3) | Java (8) | Python (3.7.3)
+    validations:
+      required: false
+
+  - type: textarea
+    id: other
+    attributes:
+      label: Other information
+      description: |
+        e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        This is :bug: Bug Report
diff --git a/.github/ISSUE_TEMPLATE/doc.md b/.github/ISSUE_TEMPLATE/doc.md
deleted file mode 100644
index 3c8a1dc691d0e..0000000000000
--- a/.github/ISSUE_TEMPLATE/doc.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: "📕 Documentation Issue"
-about: Issue in the reference documentation or developer guide
-title: "(module name): short issue description"
-labels: feature-request, documentation, needs-triage
----
-
-<!-- 
-- developer guide? raise issue/pr here: https://github.com/awsdocs/aws-cdk-guide
-- want to help? submit a pull request here: https://github.com/aws/aws-cdk
--->
-
-<!--
-link to reference doc page:
--->
-
-
-
-<!--
-describe your issue:
--->
-
-
-
-
-
----
-
-This is a 📕 documentation issue
diff --git a/.github/ISSUE_TEMPLATE/doc.yml b/.github/ISSUE_TEMPLATE/doc.yml
new file mode 100644
index 0000000000000..974a752cac810
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/doc.yml
@@ -0,0 +1,32 @@
+name: Documentation Issue
+description: Issue in the reference documentation or developer guide
+title: "(module name): short issue description"
+labels: [feature-request, documentation, needs-triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Developer guide? Raise issue/pr here: https://github.com/awsdocs/aws-cdk-guide
+
+        Want to help? Submit a pull request here: https://github.com/aws/aws-cdk
+
+  - type: input
+    id: doc-link
+    attributes:
+      label: link to reference doc page
+    validations:
+      required: false
+
+  - type: textarea
+    id: issue
+    attributes:
+      label: Describe your issue?
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        This is a 📕 documentation issue
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 163f2f54d0b88..0000000000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: "\U0001F680 Feature Request"
-about: Request a new feature
-title: "(module name): short issue description"
-labels: feature-request, needs-triage
----
-
-<!-- short description of the feature you are proposing: -->
-
-
-
-
-
-### Use Case
-
-<!-- why do you need this feature? -->
-
-
-
-
-
-### Proposed Solution
-
-<!-- Please include prototype/workaround/sketch/reference implementation: -->
-
-
-
-
-
-### Other
-
-<!-- 
-e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, 
-links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
--->
-
-
-
-
-
-* [ ] :wave: I may be able to implement this feature request
-* [ ] :warning: This feature might incur a breaking change
-
----
-
-This is a :rocket: Feature Request
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000000000..a16053f420a82
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,56 @@
+name: Feature Request
+description: Request a new feature
+title: "(module name): short issue description"
+labels: [feature-request, needs-triage]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Short description of the feature you are proposing.
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use Case
+      description: |
+        Why do you need this feature?
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: |
+        Please include prototype/workaround/sketch/reference implementation.
+    validations:
+      required: true
+
+  - type: textarea
+    id: other
+    attributes:
+      label: Other information
+      description: |
+        e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: acknowledgments
+    attributes:
+      label: Acknowledge
+      options:
+        - label: I may be able to implement this feature request
+          required: false
+        - label: This feature might incur a breaking change
+          required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        This is a :rocket: Feature Request
diff --git a/.github/ISSUE_TEMPLATE/general-issue.yml b/.github/ISSUE_TEMPLATE/general-issue.yml
new file mode 100644
index 0000000000000..61119a33a761c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-issue.yml
@@ -0,0 +1,87 @@
+name: General Issue
+description: Create a new issue
+title: "(module name): short issue description"
+labels: [needs-triage, guidance]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If there is an issue regarding developer guide, please create an issue [here](https://github.com/awsdocs/aws-cdk-guide/issues).
+
+  - type: input
+    id: issue
+    attributes:
+      label: General Issue
+      description: |
+        For support questions, please first reference our [documentation](https://docs.aws.amazon.com/cdk/api/latest), then use [Stackoverflow](https://stackoverflow.com/questions/tagged/aws-cdk). This repository's issues are intended for feature requests and bug reports.
+    validations:
+      required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: The Question
+      description: |
+        Ask your question here. Include any details relevant. Make sure you are not falling prey to the [X/Y problem](http://xyproblem.info)!
+    validations:
+      required: true
+
+  - type: input
+    id: cdk-version
+    attributes:
+      label: CDK CLI Version
+      description: Output of `cdk version`
+    validations:
+      required: true
+
+  - type: input
+    id: framework-version
+    attributes:
+      label: Framework Version
+    validations:
+      required: false
+
+  - type: input
+    id: node-version
+    attributes:
+      label: Node.js Version
+    validations:
+      required: false
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: OS
+    validations:
+      required: false
+
+  - type: dropdown
+    id: language
+    attributes:
+      label: Language
+      multiple: true
+      options:
+        - Typescript
+        - Python
+        - .NET
+        - Java
+        - Go
+    validations:
+      required: true
+
+  - type: input
+    id: language-version
+    attributes:
+      label: Language Version
+      description: E.g. TypeScript (3.8.3) | Java (8) | Python (3.7.3)
+    validations:
+      required: false
+
+  - type: textarea
+    id: other
+    attributes:
+      label: Other information
+      description: |
+        e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/general-issues.md b/.github/ISSUE_TEMPLATE/general-issues.md
deleted file mode 100644
index 2b478904a6fca..0000000000000
--- a/.github/ISSUE_TEMPLATE/general-issues.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: "\U00002753 General Issue"
-about: Create a new issue
-title: "(module name): short issue description"
-labels: needs-triage, guidance
----
-
-<!-- NOTE:📕 If there is an issue regarding developer guide, please create an issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->
-
-## :question: General Issue
-
-<!--
-⚠️ Important Information
-For support questions, please first reference our [documentation](https://docs.aws.amazon.com/cdk/api/latest), then use [Stackoverflow](https://stackoverflow.com/questions/tagged/aws-cdk). This repository's issues are intended for feature requests and bug reports.
--->
-
-### The Question
-<!--
-Ask your question here. Include any details relevant. Make sure you are not
-falling prey to the [X/Y problem][2]!
-
-[2]: http://xyproblem.info
--->
-
-### Environment
-
-  - **CDK CLI Version:** <!-- Output of `cdk version` -->
-  - **Module Version:** <!-- Version of the module in question -->
-  - **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
-  - **OS:** <!-- [all | Windows 10 | macOS Mojave | Ubuntu | etc... ] -->
-  - **Language (Version):** <!-- [all | TypeScript (3.8.3) | Java (8)| Python (3.7.3) | etc... ] -->
-
-
-### Other information
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->
diff --git a/.github/ISSUE_TEMPLATE/tracking.md b/.github/ISSUE_TEMPLATE/tracking.md
deleted file mode 100644
index b3655dfaa6dca..0000000000000
--- a/.github/ISSUE_TEMPLATE/tracking.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-name: "📊 Tracking Issue"
-title: "📊Tracking: [service]"
-about: Add a module tracking issue (internal use only)
-labels: management/tracking
----
-
-Add your +1 👍  to help us prioritize high-level constructs for this service
---- 
-
-### Overview:
-<!-- 
-Summary of the service (leverage the service’s product page for the text) and a link to the relevant AWS Docs. 
-This should be the same text that we put at the top of the package’s README.md. Also include a link to the 
-service’s CDK Construct Library API reference page.
--->
-
-
-
-
-
-
-[AWS Docs](url)  <!-- replace `url` with link to the relevant AWS Docs -->
-
-### Maturity: CloudFormation Resources Only
-<!--
-The valid maturity states are: CloudFormation Resources Only, Experimental, Developer Preview, Stable
--->
-
-See the [AWS Construct Library Module Lifecycle doc](https://github.com/aws/aws-cdk-rfcs/blob/master/text/0107-construct-library-module-lifecycle.md) for more information about maturity levels.
-
-
-### Implementation:
-<!-- 
-Checklist of use cases, constructs, features (such as grant methods) that will ship in this package 
-(not required until the issue is added to the public roadmap)
-- [ ] 
-- [ ]
--->
-See the [CDK API Reference](url) for more implementation details.<!-- replace `url` with link to the service's CDK API reference -->
-
-
-
-
-
-
-### Issue list:
-<!-- 
-e.g. checklist of links to feature requests, bugs, and PRs that are in scope for GA release of this module 
-(not required until the issues is added to the public roadmap)
-- [ ] 
-- [ ]
--->
-
-
-
-
-
-
-<!-- 
-Labels to add:
-    - package/[name] (create new labels if they don’t already exist)
-    - needs-design (if cfn-only)
-    - management/roadmap (when added to the roadmap)
-    - in-progress (when added to “working on it” column of the roadmap)
--->
---- 
-This is a  📊Tracking Issue
diff --git a/.github/ISSUE_TEMPLATE/tracking.yml b/.github/ISSUE_TEMPLATE/tracking.yml
new file mode 100644
index 0000000000000..0ecfc903b002c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/tracking.yml
@@ -0,0 +1,76 @@
+name: Tracking Issue
+description: Add a module tracking issue (internal use only)
+title: "Tracking: [service]"
+labels: [management/tracking]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Add your +1 👍  to help us prioritize high-level constructs for this service
+
+  - type: textarea
+    id: overview
+    attributes:
+      label: Overview
+      description: |
+        Summary of the service (leverage the service’s product page for the text) and a link to the relevant AWS Docs. This should be the same text that we put at the top of the package’s README.md.
+    validations:
+      required: true
+
+  - type: input
+    id: cdk-api-docs-link
+    attributes:
+      label: Link to the service’s CDK Construct Library API reference page.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: maturity
+    attributes:
+      label:  "Maturity: CloudFormation Resources Only"
+      description: |
+        See the [AWS Construct Library Module Lifecycle doc](https://github.com/aws/aws-cdk-rfcs/blob/master/text/0107-construct-library-module-lifecycle.md) for more information about maturity levels.
+      options:
+        - CloudFormation Resources Only
+        - Experimental
+        - Developer Preview
+        - Stable
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Implementation
+      description: |
+        Checklist of use cases, constructs, features (such as grant methods) that will ship in this package. This is not required until the issue is added to the public roadmap.
+    validations:
+      required: true
+
+  - type: textarea
+    id: issue-list
+    attributes:
+      label: Issue list
+      description: |
+        Checklist of links to feature requests, bugs, and PRs that are in scope for GA release of this module (not required until the issues is added to the public roadmap).
+      value: |
+          - [ ]
+          - [ ]
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        Labels to add:
+        - package/[name] (create new labels if they don’t already exist)
+        - needs-design (if cfn-only)
+        - management/roadmap (when added to the roadmap)
+        - in-progress (when added to “working on it” column of the roadmap)
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+        This is a 📊 Tracking Issue