diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
index 3ba13e0..6517862 100644
--- a/.github/ISSUE_TEMPLATE/config.yaml
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -1 +1,8 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Get Help
+    url: https://github.com/olimorris/persisted.nvim/discussions/new?category=q-a
+    about: If you can't get something to work the way you expect, open a question in the discussion forums.
+  - name: Feature Request
+    url: https://github.com/olimorris/persisted.nvim/discussions/new?category=ideas
+    about: Suggest any ideas you have using the discussion forums.
diff --git a/.github/ISSUE_TEMPLATE/general.yaml b/.github/ISSUE_TEMPLATE/general.yaml
deleted file mode 100644
index 12d5809..0000000
--- a/.github/ISSUE_TEMPLATE/general.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: General (non bug) issue
-description: For general issues, questions or enhancements. NOT for bugs or configuration issues
-assignees: olimorris
-
-body:
-    - type: markdown
-      attributes:
-        value: |
-          > **Note:** Please do not use this template if you are having issues using the plugin. We have a dedicated issue template specifically for that purpose.
-
-    - type: textarea
-      id: description
-      attributes:
-        label: Issue/Question/Enhancement
-        description: Please include the detail of your issue below
-        placeholder: Your issue
-      validations:
-        required: true