diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 648f1f1a062..3e0e103106f 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -7,7 +7,28 @@ body:
     id: description
     attributes:
       label: Description
-      description: Describe the enhancement at a high-level.
+      description: Describe the enhancement at a high-level
+    validations:
+      required: true
+  - type: textarea
+    id: value_proposition
+    attributes:
+      label: Value Proposition
+      description: Describe what value the enhancement brings
+    validations:
+      required: true
+  - type: textarea
+    id: goals
+    attributes:
+      label: Goals
+      description: Describe what the enhancement should provide
+    validations:
+      required: true
+  - type: textarea
+    id: non_goals
+    attributes:
+      label: Non-Goals
+      description: Describe what the enhancement should not provide, or is out of scope
     validations:
       required: true
   - type: input
@@ -17,20 +38,13 @@ body:
       description: |
         If there has been a discussion around the enhancement, provide a link to the discussion.
 
-        Please note that larger enhancements should be discussed through [GitHub Discussion](https://github.com/keycloak/keycloak/discussions/categories/ideas).
+        Please note that all, except small requests, should be discussed through [GitHub Discussion](https://github.com/keycloak/keycloak/discussions/categories/ideas).
     validations:
       required: false
   - type: textarea
-    id: motivation
+    id: notes
     attributes:
-      label: Motivation
-      description: Describe why the feature should be added.
-    validations:
-      required: false
-  - type: textarea
-    id: details
-    attributes:
-      label: Details
-      description: More details? Implementation ideas? Anything that will give us more context about the enhancement you are proposing!
+      label: Notes
+      description: Design ideas? Implementation ideas? Anything that will give us more context about the enhancement you are proposing!
     validations:
       required: false
\ No newline at end of file