diff --git a/.forgejo/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yml b/.forgejo/ISSUE_TEMPLATE/bug.yml
similarity index 88%
rename from .forgejo/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yml
rename to .forgejo/ISSUE_TEMPLATE/bug.yml
index 56c1667..b0b1b09 100644
--- a/.forgejo/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yml
+++ b/.forgejo/ISSUE_TEMPLATE/bug.yml
@@ -16,7 +16,7 @@ body:
     attributes:
       label: Contact Details
       description: How can we get in touch with you if we need more info?
-      placeholder: ex. email@example.com
+      placeholder: email@example.com
     validations:
       required: true
   - type: textarea
@@ -24,8 +24,7 @@ body:
     attributes:
       label: What happened?
       description: Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see!
-      value: "A bug happened is not very useful! Try to give as many details as possible."
+      placeholder: Tell us what you see! "A bug happened" is not very useful! Try to give as many details as possible.
     validations:
       required: true
   - type: dropdown
@@ -58,7 +57,7 @@ body:
     id: terms
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](/CODE_OF_CONDUCT.md)
+      description: By submitting this issue, you agree to follow our [Code of Conduct](/musselman/notatio/CODE_OF_CONDUCT.md)
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true
diff --git a/.forgejo/ISSUE_TEMPLATE/config.yml b/.forgejo/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..46baddf
--- /dev/null
+++ b/.forgejo/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: James Musselman
+    url: https://musselman.dev
+    about: Please use one of the contacts on his about page to reach out for help!
diff --git a/.forgejo/ISSUE_TEMPLATE/feature-request.yml b/.forgejo/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..71fb6a8
--- /dev/null
+++ b/.forgejo/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,50 @@
+name: Feature Request
+about: Request a Feature or Change
+title: "[Feat Req]: "
+ref: "main"
+labels:
+  - "Feature Request"
+  - "Not Reviewed"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+  # some markdown that will only be visible once the issue has been created
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: email@example.com
+    validations:
+      required: true
+  - type: textarea
+    id: the-request
+    attributes:
+      label: What is your feature request?
+      description: Tell us, what do you want to happen and why?
+      placeholder: Let us know what all you want to see, and if you can, provide a image or mockup if appropriate.
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - Container (Default)
+        - Binary (Advanced)
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](/musselman/notatio/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+        - label: I have also read the CONTRIBUTION.MD
+          required: true
+          visible: [form]