diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b329c26..97a8ed4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,9 +9,9 @@ assignees: ''
 
 <!-- Thanks for your feedback! Please complete the following information: -->
 
-**Maputnik version**:
+**Maputnik version**:<!-- e.g v1.7.0, master -->
 **Browser**:
-**OS (Windows, macOS, Linux)**:
+**OS**:<!-- (Windows, macOS, Linux) -->
 
 **Description of the bug**:
 
@@ -24,4 +24,4 @@ assignees: ''
 <!-- If applicable, attach a style file (zip) or provide a style URL. -->
 
 **Screenshots**:
-<!--  If applicable, add screenshots to help explain your problem. -->
+<!-- If applicable, add screenshots to help explain your problem. -->
diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md
index b3283c6..cc278d0 100644
--- a/.github/ISSUE_TEMPLATE/other-issue.md
+++ b/.github/ISSUE_TEMPLATE/other-issue.md
@@ -7,4 +7,5 @@ assignees: ''
 
 ---
 
+<!-- Thanks for reaching out! If you are having general Maputnik mapping questions, please asking them at https://gis.stackexchange.com/ and read https://gis.stackexchange.com/help/how-to-ask before you do so (please keep in mind that you're asking there in a general GIS forum, not a dedicated support channel) -->