diff --git a/.github/ISSUE_TEMPLATE/camera_support_request.yml b/.github/DISCUSSION_TEMPLATE/camera_support.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/camera_support_request.yml
rename to .github/DISCUSSION_TEMPLATE/camera_support.yml
index 7640d26ecf..ea87901cc8 100644
--- a/.github/ISSUE_TEMPLATE/camera_support_request.yml
+++ b/.github/DISCUSSION_TEMPLATE/camera_support.yml
@@ -14,7 +14,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: Visible on the Debug page in the Web UI
+      description: Visible on the System page in the Web UI
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/config_support_request.yml b/.github/DISCUSSION_TEMPLATE/config_support.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/config_support_request.yml
rename to .github/DISCUSSION_TEMPLATE/config_support.yml
index cb95f6fa98..97258b5010 100644
--- a/.github/ISSUE_TEMPLATE/config_support_request.yml
+++ b/.github/DISCUSSION_TEMPLATE/config_support.yml
@@ -14,7 +14,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: Visible on the Debug page in the Web UI
+      description: Visible on the System page in the Web UI
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/detector_support_request.yml b/.github/DISCUSSION_TEMPLATE/detector_support.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/detector_support_request.yml
rename to .github/DISCUSSION_TEMPLATE/detector_support.yml
index 3f5b349358..ae561f92ee 100644
--- a/.github/ISSUE_TEMPLATE/detector_support_request.yml
+++ b/.github/DISCUSSION_TEMPLATE/detector_support.yml
@@ -14,7 +14,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: Visible on the Debug page in the Web UI
+      description: Visible on the System page in the Web UI
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/general_support_request.yml b/.github/DISCUSSION_TEMPLATE/general_support.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/general_support_request.yml
rename to .github/DISCUSSION_TEMPLATE/general_support.yml
index 7138cd8446..768f4b2a69 100644
--- a/.github/ISSUE_TEMPLATE/general_support_request.yml
+++ b/.github/DISCUSSION_TEMPLATE/general_support.yml
@@ -14,7 +14,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: Visible on the Debug page in the Web UI
+      description: Visible on the System page in the Web UI
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/hwaccel_support_request.yml b/.github/DISCUSSION_TEMPLATE/hwaccel_support.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/hwaccel_support_request.yml
rename to .github/DISCUSSION_TEMPLATE/hwaccel_support.yml
index 82c64c4c37..288eaa920a 100644
--- a/.github/ISSUE_TEMPLATE/hwaccel_support_request.yml
+++ b/.github/DISCUSSION_TEMPLATE/hwaccel_support.yml
@@ -14,7 +14,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: Visible on the Debug page in the Web UI
+      description: Visible on the System page in the Web UI
     validations:
       required: true
   - type: textarea
diff --git a/.github/DISCUSSION_TEMPLATE/question.yml b/.github/DISCUSSION_TEMPLATE/question.yml
new file mode 100644
index 0000000000..8b1471ee32
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/question.yml
@@ -0,0 +1,12 @@
+name: Question
+description: General question about Frigate
+title: "[Question]: "
+labels: ["question"]
+assignees: []
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: What is your question:
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3ba13e0cec..7ae5ad8ead 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Frigate Support
+    url: https://github.com/blakeblackshear/frigate/discussions/new/choose
+    about: Get support for setting up or troubelshooting Frigate.