diff --git a/.github/DISCUSSION_TEMPLATE/feature-requests.yml b/.github/DISCUSSION_TEMPLATE/feature-requests.yml
deleted file mode 100644
index 5899b4a7..00000000
--- a/.github/DISCUSSION_TEMPLATE/feature-requests.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: "🚀 Feature request"
-description: Suggest a feature that will improve NuxtAuth
-labels: ["pending", "enchantment"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to fill out this feature request!
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Describe the feature
-      description: A clear and concise description of what you think would be a helpful addition to NuxtAuth, including the possible use cases and alternatives you have considered. If you have a working prototype or module that implements it, please include a link.
-      placeholder: Feature description
-    validations:
-      required: true
-  - type: checkboxes
-    id: provider
-    attributes:
-      label: Which provider would this enchantment improve?
-      description: "We currently offer three providers: authjs, local and refresh. If the enchanment is a general one, please select all three."
-      options:
-        - label: AuthJS
-        - label: Local
-        - label: Refresh
-        - label: New Provider
-  - type: checkboxes
-    id: additional-info
-    attributes:
-      label: Additional information
-      description: Additional information that helps us decide how to proceed.
-      options:
-        - label: Would you be willing to help implement this feature?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3daa74ee..779fb139 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 📚 nuxt-auth documentation
+  - name: 📚 Documentation
     url: https://sidebase.io/nuxt-auth
-    about: Check the documentation for usage of nuxt-auth
-  - name: 🚀 Feature request
-    url: https://github.com/sidebase/nuxt-auth/discussions/new?category=feature-requests
-    about: Suggest a feature to improve this project
+    about: Check the documentation for usage of nuxt-auth!
+  - name: ⭐ Other projects
+    url: https://sidebase.io
+    about: Supercharge your Nuxt application with more of our projects!
diff --git a/.github/ISSUE_TEMPLATE/enchantment.yml b/.github/ISSUE_TEMPLATE/enchantment.yml
new file mode 100644
index 00000000..515c6647
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enchantment.yml
@@ -0,0 +1,49 @@
+name: "🚀 Enchantment"
+description: Suggest an enchantment that will improve NuxtAuth
+labels: ["pending", "enchantment"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out this feature request!
+
+        Please note: Only post enchanments that you have properly considered. This means:
+        - You have properly determined what problem your enchanment fixes
+        - How you would recommend implementing your enchancement
+        - How this change would impact NuxtAuth
+
+        If you are still unsure about your implementation or would like to discuss it prior, open a discussion first:
+        👉 https://github.com/sidebase/nuxt-auth/discussions/new?category=feature-requests
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe the feature
+      description: A clear and concise description of what you think would be a helpful addition to NuxtAuth, including the possible use cases and alternatives you have considered.
+      placeholder: Feature description
+    validations:
+      required: true
+  - type: textarea
+    id: feature-implementation
+    attributes:
+      label: How would you implement this?
+      description: For this, please outline how this feature would work. This could be in the form of a textual description, or a walkthrough of what would be adjusted inside the code.
+      placeholder: Feature description
+    validations:
+      required: true
+  - type: checkboxes
+    id: additional-info
+    attributes:
+      label: Additional information
+      description: Additional information that helps us decide how to proceed.
+      options:
+        - label: Would you be willing to help implement this feature?
+  - type: checkboxes
+    id: provider-selection
+    attributes:
+      label: Provider
+      description: Please check the provider this feature targets.
+      options:
+        - label: AuthJS
+        - label: Local
+        - label: Refresh
+        - label: New Provider
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f99be3b8..ef48f7e7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,5 @@
 <!---
 ☝️ PR title should follow conventional commits (https://conventionalcommits.org)
-
-Please carefully read the contribution docs before creating a pull request
- 👉 https://nuxt.com/docs/community/contribution
 -->
 
 ### 🔗 Linked issue
@@ -22,16 +19,9 @@ Please carefully read the contribution docs before creating a pull request
 
 ### 📚 Description
 
-<!-- Describe your changes in detail -->
-<!-- Why is this change required? What problem does it solve? -->
-<!-- If it resolves an open issue, please link to the issue here. For example "Resolves #1337" -->
 
 ### 📝 Checklist
 
-<!-- Put an `x` in all the boxes that apply. -->
-<!-- If your change requires a documentation PR, please link it appropriately -->
-<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-
 - [ ] I have linked an issue or discussion.
 - [ ] I have added tests (if possible).
 - [ ] I have updated the documentation accordingly.