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 7138cd844..768f4b2a6 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 82c64c4c3..288eaa920 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