diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..8e8264b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Discussions
+    url: https://github.com/keycloak/keycloak/discussions
+    about: Propose new ideas, provide feedback, or ask for help here
+  - name: User mailing list
+    url: https://groups.google.com/forum/#!forum/keycloak-user
+    about: Ask and answer questions here
+  - name: Developer mailing list
+    url: https://groups.google.com/forum/#!forum/keycloak-dev
+    about: Propose new features and join in design discussions here
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 00000000..70033aec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,31 @@
+name: Enhancement Request
+description: Request an enhancement to an existing feature
+labels: ["kind/enhancement", "status/triage"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: Describe the enhancement at a high-level.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Discussion
+      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).
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Describe why the feature should be added.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Details
+      description: More details? Implementation ideas? Anything that will give us more context about the enhancement you are proposing!
+    validations:
+      required: false
\ No newline at end of file