diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b01238f082..7d584256a1 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -6,10 +6,8 @@ If possible, please provide clear steps for reproducing the problem.
 
 ### What did you expect to happen?
 
-
 ### What happened instead?
 
-
 ### Configuration (**MUST** fill this out):
 
 #### vim-go version:
@@ -20,10 +18,13 @@ If possible, please provide clear steps for reproducing the problem.
 </pre></details>
 
 #### Vim version (first three lines from `:version`):
+<!-- :version -->
 
-####  Go version (`go version`):
+#### Go version (`go version`):
+<!-- go version -->
 
 #### Go environment
 <details><summary><code>go env</code> Output:</summary><br><pre>
+<!-- go env -->
 
 </pre></details>
diff --git a/autoload/go/issue.vim b/autoload/go/issue.vim
index 65db9d8083..56cd6e8f10 100644
--- a/autoload/go/issue.vim
+++ b/autoload/go/issue.vim
@@ -18,15 +18,15 @@ function! s:issuebody() abort
   for l in lines
     let body = add(body, l)
 
-    if l =~ '^\* Vim version'
+    if l =~ '^<!-- :version'
       redir => out
         silent version
       redir END
       let body = extend(body, split(out, "\n")[0:2])
-    elseif l =~ '^\* Go version'
+    elseif l =~ '^<!-- go version -->'
       let [out, err] = go#util#Exec(['go', 'version'])
       let body = add(body, substitute(l:out, rtrimpat, '', ''))
-    elseif l =~ '^\* Go environment'
+    elseif l =~ '^<!-- go env -->'
       let [out, err] = go#util#Exec(['go', 'env'])
       let body = add(body, substitute(l:out, rtrimpat, '', ''))
     endif