diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..25184f7ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+    - name: GoldenCheetah Users Forum
+      url: https://groups.google.com/forum/#!forum/golden-cheetah-users
+      about: Please ask and answer technical support questions here.
+    - name: GoldenCheetah Developers Forum
+      url: https://groups.google.com/forum/#!forum/golden-cheetah-developers
+      about: Please ask and answer source code related questions here.
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
new file mode 100644
index 000000000..a9e216f60
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,4 @@
+---
+name: Open an Issue
+about: Issue tracker is **only** for  previously discussed Bugs and Features, others will be closed without discussion.
+---
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 91d88be20..000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-If you need help, technical support or want to ask questions or give feedback, please use users/developers forums:
-- Users - https://groups.google.com/forum/#!forum/golden-cheetah-users
-- Developers - https://groups.google.com/forum/#!forum/golden-cheetah-developers
-
-Issue tracker is **only** for  previously discussed Bugs and Features, others will be closed without discussion.