diff --git a/.github/DISCUSSION_TEMPLATE/feature_request.yml b/.github/DISCUSSION_TEMPLATE/feature-request.yml
similarity index 84%
rename from .github/DISCUSSION_TEMPLATE/feature_request.yml
rename to .github/DISCUSSION_TEMPLATE/feature-request.yml
index 9b536e9..260beac 100644
--- a/.github/DISCUSSION_TEMPLATE/feature_request.yml
+++ b/.github/DISCUSSION_TEMPLATE/feature-request.yml
@@ -1,10 +1,6 @@
-name: Generator feature request
-description: To start all new feature discussions for the Auro WC Generator
-title: 'Generator feature request'
-labels:
-  - 'Type: Feature'
-  - not-reviewed
-  - wc-generator
+
+description: 'To start all new feature discussions for the Auro WC Generator'
+title: ['Generator feature request']
 body:
   - type: textarea
     id: request
diff --git a/.github/DISCUSSION_TEMPLATE/general-support.yml b/.github/DISCUSSION_TEMPLATE/general-support.yml
index d36ae2a..7ad3970 100644
--- a/.github/DISCUSSION_TEMPLATE/general-support.yml
+++ b/.github/DISCUSSION_TEMPLATE/general-support.yml
@@ -1,10 +1,5 @@
-name: General support
-description: Need help with something that is not a bug or new feature request?
-title: 'General support'
-labels:
-  - 'Type: Question'
-  - not-reviewed
-  - wc-generator
+description: 'Need help with something that is not a bug or new feature request?'
+title: ['General support']
 body:
   - type: textarea
     id: request
diff --git a/.github/DISCUSSION_TEMPLATE/generator-feature-request.yml b/.github/DISCUSSION_TEMPLATE/generator-feature-request.yml
new file mode 100644
index 0000000..a1bcd3e
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/generator-feature-request.yml
@@ -0,0 +1,30 @@
+description: 'To start all new feature discussions for the Auro WC Generator'
+title: ['Generator feature request']
+body:
+  - type: textarea
+    id: request
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is.
+      placeholder: Ex. I'm always frustrated when [...]
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+  - type: textarea
+    id: exit-criteria
+    attributes:
+      label: Exit criteria
+      description: Define your issue's exit criteria
+      placeholder: "This issue can be closed once the error has been corrected. Any additional scope e.g. updates or refactors, should be discussed PRIOR to adding scope to this issue."