3 files changed, 81 insertions, 3 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..19aa9e7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,45 @@
+name: Bug Report
+description: "Something isn't working as expected"
+labels: ["type: bug", triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+        
+        Other developers need to be able to reproduce your bug reports to fix them,
+        so please fill the following form to the best of your abilities.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief overview of what the bug is
+      placeholder: Clicking the submit button wipes my harddrive.
+    validations:
+      required: true
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction Steps
+      description: A set of steps that an engineer can take to find and recreate this bug
+      placeholder: |
+        1. Create a new form
+        2. Submit an empty response
+        3. ...
+    validations:
+      required: true
+  - type: textarea
+    id: files
+    attributes:
+      label: Files
+      description: If you have any screenshots, log files, or other files that you believe are relevant, you can attach them here
+      validations:
+        required: false
+  - type: textarea
+    id: technical
+    attributes:
+      label: Technical Details
+      description: "If you have a technical overview of what is causing the bug please describe it here, don't worry if not"
+      validations:
+        required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 4b036ed..194ed86 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Notion task board
-    url: https://www.notion.so/pythondiscord/2c44f303ec36425da23494f606973f14?v=39e0f16a1ffe4152b3dccb9d5bce9301
-    about: Staff-only Notion task board for feature requests and bug reports.
   - name: Public GitHub Discussions
     url: https://github.com/python-discord/forms-backend/discussions
     about: GitHub Discussions from external collaborators.
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000..5d4fe58
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,36 @@
+name: Feature Request
+description: New features, or modifications to existing ones
+labels: ["type: feature", triage]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+        
+        Developers need to be able to understand your request,
+        to properly discuss it an implement it. Please fill this
+        form to the best of your ability.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: "Describe what the feature is for, don't give justification just yet, just give the concrete description of the feature."
+      placeholder: The app needs even more routes.
+    validations:
+      required: true
+  - type: textarea
+    id: justification
+    attributes:
+      label: Justification
+      description: Describe why this feature is necessary, does it fit into one of our epics? Are there any use cases for Forms that we can see this feature being useful for?
+      placeholder: "The current number of routes isn't as high as it should be because..."
+    validations:
+      required: true
+  - type: textarea
+    id: implm
+    attributes:
+      label: Implementation
+      description: If you have any suggestions for engineers, you can leave them here
+      validations:
+        required: false