diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 96%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index cd7d8db..d867328 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!-- Provide a general summary of the issue in the Title above -->
 <!-- Note: these are comments that don't show up in the actual issue, no need to delete them as you fill out the template -->
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..62d5533
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,12 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions and Configurations
+    url: https://discourse.pi-hole.net
+    about: Ask a question or get help with configurations.
+  - name: Feature Requests
+    url: https://discourse.pi-hole.net/c/feature-requests/8
+    about: See existing Feature Requests and suggest new ones.
+  - name: Documentation
+    url: https://docs.pi-hole.net
+    about: Documentation and guides.
+