diff --git a/.github/ISSUE_TEMPLATE/installation-difficulties.md b/.github/ISSUE_TEMPLATE/1-installation-difficulties.md
similarity index 96%
rename from .github/ISSUE_TEMPLATE/installation-difficulties.md
rename to .github/ISSUE_TEMPLATE/1-installation-difficulties.md
index 2fe066bcff..2dfe2c556b 100644
--- a/.github/ISSUE_TEMPLATE/installation-difficulties.md
+++ b/.github/ISSUE_TEMPLATE/1-installation-difficulties.md
@@ -1,8 +1,8 @@
 ---
 name: Installation Difficulties
 about: If you're having trouble installing Nokogiri ...
-title: Installation difficulties
-labels: ''
+title: [install] 
+labels: 'topic/installation'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/bug-report-or-help-request.md b/.github/ISSUE_TEMPLATE/2-bug-report-or-help-request.md
similarity index 97%
rename from .github/ISSUE_TEMPLATE/bug-report-or-help-request.md
rename to .github/ISSUE_TEMPLATE/2-bug-report-or-help-request.md
index b5077193ba..63d9ed0f22 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-or-help-request.md
+++ b/.github/ISSUE_TEMPLATE/2-bug-report-or-help-request.md
@@ -1,8 +1,8 @@
 ---
 name: Bug Report or Help Request
 about: Create a report to help us improve
-title: ''
-labels: ''
+title: '[bug]'
+labels: 'state/needs-triage'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..a5573ce3c4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,4 @@
+contact_links:
+  - name: Nokogiri Community Chat
+    url: https://gitter.im/sparklemotion/nokogiri
+    about: Please ask and answer questions here.