diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
deleted file mode 100644
index f918378db6..0000000000
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-name: "Bug Report"
-about: Report a bug in the Angular Framework
----
-<!--
-
-Oh hi there!
-
-To expedite issue processing please search open and closed issues before submitting a new one.
-Existing issues often contain information about workarounds, resolution, or progress updates.
-
--->
-
-
-# Bug Report
-
-### Affected Package
-<!-- Can you pin-point one or more @angular/* packages as the source of the bug? -->
-<!-- edit: --> The issue is caused by package @angular/....
-
-
-### Is this a regression?
-
-<!-- Did this behavior use to work in the previous version? -->
-<!-- edit: --> Yes, the previous version in which this bug was not present was: ....
-
-
-### Description
-<!-- edit: --> A clear and concise description of the problem...
-
-
-## Minimal Reproduction
-<!--
-Please create and share minimal reproduction of the issue starting with this template: https://stackblitz.com/fork/angular-ivy
--->
-<!-- edit: --> https://stackblitz.com/...
-
-<!--
-If StackBlitz is not suitable for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue.
-A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem.
-Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
-
-Issues that don't have enough info and can't be reproduced will be closed.
-
-You can read more about issue submission guidelines here: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#submit-issue
--->
-
-## Exception or Error
-<pre><code>
-<!-- If the issue is accompanied by an exception or an error, please share it below: -->
-
-</code></pre>
-
-
-## Your Environment
-
-**Angular Version:**
-<pre><code>
-<!-- run `ng version` and paste output below -->
-
-</code></pre>
-
-**Anything else relevant?**
-<!-- Is this a browser specific issue? If so, please specify the browser and version. -->
-
-<!-- Do any of these matter: operating system, IDE, package manager, HTTP server, ...? If so, please mention it below. -->
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yaml b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
new file mode 100644
index 0000000000..243c2fc9f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
@@ -0,0 +1,84 @@
+name: Bug Report
+description: Report a bug in the Angular Framework
+
+body:
+  - type: dropdown
+    id: affected-packages
+    attributes:
+      label: Which @angular/* package(s) are the source of the bug?
+      options:
+        - animations
+        - bazel
+        - common
+        - compiler-cli
+        - compiler
+        - elements
+        - forms
+        - language-service
+        - localize
+        - platform-browser-dynamic
+        - platform-browser
+        - platform-server
+        - router
+        - service-worker
+        - upgrade
+        - Don't known / other
+      multiple: true
+    validations:
+      required: true
+
+  - type: dropdown
+    id: is-regression
+    attributes:
+      label: Is this a regression?
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: input
+    id: reproduction
+    attributes:
+      label: Please provide a link to a minimal reproduction of the bug
+
+  - type: textarea
+    id: exception-or-error
+    attributes:
+      label: Please provide the exception or error you saw
+      render: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Please provide the environment you discovered this bug in
+      render: true
+      placeholder: |
+        Angular CLI: 12.0.5
+        Node: 14.17.0
+        Package Manager: yarn 1.22.10
+        OS: linux x64
+
+        Angular: 12.0.5
+        ... animations, cli, common, compiler, compiler-cli, core, forms
+        ... platform-browser, platform-browser-dynamic, router
+
+        Package                         Version
+        ---------------------------------------------------------
+        @angular-devkit/architect       0.1200.5
+        @angular-devkit/build-angular   12.0.5
+        @angular-devkit/core            12.0.5
+        rxjs                            6.6.7
+        typescript                      4.2.4
+
+  - type: textarea
+    id: other
+    attributes:
+      label: Anything else?
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
deleted file mode 100644
index c88cc8186b..0000000000
--- a/.github/ISSUE_TEMPLATE/2-feature-request.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: "Feature Request"
-about: Suggest a feature for Angular Framework
----
-<!--
-
-Oh hi there!
-
-To expedite issue processing please search open and closed issues before submitting a new one.
-Existing issues often contain information about workarounds, resolution, or progress updates.
-
--->
-
-
-# Feature Request
-
-### Relevant Package
-<!-- Can you pin-point one or more @angular/* packages the are relevant for this feature request? -->
-<!-- edit: --> This feature request is for @angular/....
-
-
-### Description
-<!-- edit: --> A clear and concise description of the problem or missing capability...
-
-
-### Describe the solution you'd like
-<!-- edit: --> If you have a solution in mind, please describe it.
-
-
-### Describe alternatives you've considered
-<!-- edit: --> Have you considered any alternative solutions or workarounds?
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.yaml b/.github/ISSUE_TEMPLATE/2-feature-request.yaml
new file mode 100644
index 0000000000..5954acabfc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.yaml
@@ -0,0 +1,46 @@
+name: 'Feature Request'
+description: Suggest a feature for Angular Framework
+
+body:
+  - type: dropdown
+    id: affected-packages
+    attributes:
+      label: Which @angular/* package(s) are relevant/releated to the feature request?
+      options:
+        - animations
+        - bazel
+        - common
+        - compiler-cli
+        - compiler
+        - elements
+        - forms
+        - language-service
+        - localize
+        - platform-browser-dynamic
+        - platform-browser
+        - platform-server
+        - router
+        - service-worker
+        - upgrade
+      multiple: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposed-solution
+    attributes:
+      label: Proposed solution
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Alternatives considered
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/3-docs-bug.md b/.github/ISSUE_TEMPLATE/3-docs-bug.md
deleted file mode 100644
index caa23d5fbc..0000000000
--- a/.github/ISSUE_TEMPLATE/3-docs-bug.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-name: "Docs or angular.io Bug Report"
-about: Report an issue in Angular's documentation or angular.io application
----
-<!--
-
-Oh hi there!
-
-To expedite issue processing please search open and closed issues before submitting a new one.
-Existing issues often contain information about workarounds, resolution, or progress updates.
-
--->
-
-# Docs or angular.io Bug Report
-
-### Description
-
-<!-- edit: --> A clear and concise description of the problem...
-
-
-## Minimal Reproduction
-
-### What's the affected URL?**
-<!-- edit: --> https://angular.io/...
-
-### Reproduction Steps**
-<!-- If applicable please list the steps to take to reproduce the issue -->
-
-### Expected vs Actual Behavior**
-<!-- If applicable please describe the difference between the expected and actual behavior after following the repro steps. -->
-
-## Screenshot
-<!-- Often a screenshot can help to capture the issue better than a long description. -->
-<!-- upload a screenshot:-->
-
-## Exception or Error
-<pre><code>
-<!-- If the issue is accompanied by an exception or an error, please share it below: -->
-
-</code></pre>
-
-## Your Environment
-
-### Browser info
-<!-- Is this a browser specific issue? If so, please specify the device, browser, and version. -->
-
-### Anything else relevant?
-<!-- Please provide additional info if necessary. -->
diff --git a/.github/ISSUE_TEMPLATE/3-docs-bug.yaml b/.github/ISSUE_TEMPLATE/3-docs-bug.yaml
new file mode 100644
index 0000000000..a6a2eb840b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-docs-bug.yaml
@@ -0,0 +1,42 @@
+name: 'Docs or angular.io Bug Report'
+description: Report an issue in Angular's documentation or angular.io application
+
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: input
+    id: affected-url
+    attributes:
+      label: What is the affected URL?
+
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Please provide the steps to reproduce the issue
+
+  - type: textarea
+    id: expected-vs-actual-behavior
+    attributes:
+      label: Please provide the expected behavior vs the actual behavior you encountered
+
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: Please provide a screenshot if possible
+
+  - type: textarea
+    id: exception-or-error
+    attributes:
+      label: Please provide the exception or error you saw
+      render: true
+
+  - type: textarea
+    id: browser-info
+    attributes:
+      label: Is this a browser specific issue? If so, please specify the device, browser, and version.
+      render: true