diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yaml b/.github/ISSUE_TEMPLATE/1.bug_report.yaml
index 55e33d0619b..1caff965352 100644
--- a/.github/ISSUE_TEMPLATE/1.bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/1.bug_report.yaml
@@ -4,14 +4,13 @@ description: Create a report to help us improve Amplify CLI
 body:
   - type: markdown
     attributes:
-      value: Thanks for taking the time to fill out this bug report! Try to include as much information as you can.
-  - type: markdown
-    attributes:
-      value: For reference, the current version of the Amplify CLI is <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
-  - type: markdown
-    attributes:
-      value: |
-        > **Note**: If your issue is regarding the AWS Amplify Console service, please log it in the [Amplify Console GitHub Issue Tracker](https://github.com/aws-amplify/amplify-console/issues).
+      value: | 
+        Thanks for taking the time to fill out this bug report! Try to include as much information as you can.
+
+        For reference, the current version of the Amplify CLI is <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
+
+        **Note**: If your issue is regarding the AWS Amplify Console service, please log it in the [Amplify Console GitHub Issue Tracker](https://github.com/aws-amplify/amplify-console/issues).
+ 
   - type: checkboxes
     attributes:
       label: |
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.md b/.github/ISSUE_TEMPLATE/2.feature_request.md
deleted file mode 100644
index 80e16f0a1ac..00000000000
--- a/.github/ISSUE_TEMPLATE/2.feature_request.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature-request
-assignees: ''
-
----
->**Note**: If your feature-request is regarding the AWS Amplify Console service, please log it in the 
-[AWS Amplify Console repository](https://github.com/aws-amplify/amplify-console/issues)
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yaml b/.github/ISSUE_TEMPLATE/2.feature_request.yaml
new file mode 100644
index 00000000000..e75cd3b7975
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2.feature_request.yaml
@@ -0,0 +1,73 @@
+name: Feature request
+description: Suggest an idea for the CLI
+labels: feature-request
+
+body:
+  - type: markdown
+    attributes:
+      value: | 
+        Thanks for taking the time to submit a feature request! Try to include as much information as you can.
+
+        For reference, the current version of the Amplify CLI is <img src="https://img.shields.io/npm/v/@aws-amplify/cli.svg" />.
+
+  - type: dropdown
+    attributes:
+      label: Is this related to a new or existing Amplify category?
+      description: Which categories does this request impact?
+      multiple: true
+      options:
+        - auth
+        - storage
+        - function
+        - api
+        - analytics
+        - hosting
+        - notifications
+        - interactions
+        - predictions
+        - xr
+        - New category
+
+  - type: input
+    attributes:
+      label: Is this related to another service?
+      placeholder: e.g. DynamoDB, S3
+  
+  - type: textarea
+    attributes:
+      label: Describe the feature you'd like to request
+      description: |
+        A clear and concise description of what you want to happen. Please include **any related issues**, documentation, etc.
+    validations:
+      required: true
+ 
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+        A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Add any other use cases or context about the feature request here. Please include any prototype, workaround, reference implementation, etc.
+  
+  - type: checkboxes
+    attributes:
+      label: Is this something that you'd be interested in working on?
+      options:
+        - label: 👋 I may be able to implement this feature request  
+        - label: ⚠️ This feature might incur a breaking change
+          
+  
\ No newline at end of file