diff --git a/lib/ansible/modules/extras/ISSUE_TEMPLATE.md b/lib/ansible/modules/extras/ISSUE_TEMPLATE.md
index 0dcb075b7d..5870836fcc 100644
--- a/lib/ansible/modules/extras/ISSUE_TEMPLATE.md
+++ b/lib/ansible/modules/extras/ISSUE_TEMPLATE.md
@@ -1,53 +1,53 @@
 ##### Issue Type:
 
-Please pick one and delete the rest:
+<!-- Please pick one and delete the rest: -->
  - Bug Report
  - Feature Idea
  - Documentation Report
 
 ##### Plugin Name:
 
-Name of the plugin/module/task
+<!-- Name of the plugin/module/task -->
 
 ##### Ansible Version:
 
 ```
-(Paste verbatim output from “ansible --version” here)
+<!-- (Paste verbatim output from “ansible --version” here) -->
 ```
 
 ##### Ansible Configuration:
 
-Please mention any settings you've changed/added/removed in ansible.cfg
-(or using the ANSIBLE_* environment variables).
+<!-- Please mention any settings you've changed/added/removed in ansible.cfg
+(or using the ANSIBLE_* environment variables). -->
 
 ##### Environment:
 
-Please mention the OS you are running Ansible from, and the OS you are
-managing, or say “N/A” for anything that isn't platform-specific.
+<!-- Please mention the OS you are running Ansible from, and the OS you are managing,
+or say “N/A” for anything that isn't platform-specific. -->
 
 ##### Summary:
 
-Please explain the problem briefly.
+<!-- Please explain the problem briefly.  -->
 
 ##### Steps To Reproduce:
 
-For bugs, please show exactly how to reproduce the problem. For new
-features, show how the feature would be used.
+<!-- For bugs, please show exactly how to reproduce the problem.
+For new features, show how the feature would be used.  -->
 
 ```
-(Paste example playbooks or commands here)
+<!-- (Paste example playbooks or commands here)  -->
 ```
 
-You can also paste gist.github.com links for larger files.
+<!-- You can also paste gist.github.com links for larger files.  -->
 
 ##### Expected Results:
 
-What did you expect to happen when running the steps above?
+<!-- What did you expect to happen when running the steps above?  -->
 
 ##### Actual Results:
 
-What actually happened?
+<!-- What actually happened? If possible run with high verbosity (-vvvv) -->
 
 ```
-(Paste verbatim command output here)
+<!-- (Paste verbatim command output here)  -->
 ```
diff --git a/lib/ansible/modules/extras/PULL_REQUEST_TEMPLATE.md b/lib/ansible/modules/extras/PULL_REQUEST_TEMPLATE.md
index 8f3791f3c9..f821123acd 100644
--- a/lib/ansible/modules/extras/PULL_REQUEST_TEMPLATE.md
+++ b/lib/ansible/modules/extras/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 ##### Issue Type:
 
-Please pick one and delete the rest:
+<!-- Please pick one and delete the rest: -->
  - Feature Pull Request
  - New Module Pull Request
  - Bugfix Pull Request
@@ -8,24 +8,18 @@ Please pick one and delete the rest:
 
 ##### Plugin Name:
 
-Name of the plugin/module/task
-
-##### Ansible Version:
-
-```
-(Paste verbatim output from “ansible --version” here)
-```
+<!-- Name of the plugin/module/task  -->
 
 ##### Summary:
 
-Please describe the change and the reason for it.
+<!-- Please describe the change and the reason for it. -->
 
-(If you're fixing an existing issue, please include "Fixes #nnn" in your
+<!-- If you're fixing an existing issue, please include "Fixes #nnn" in your
 commit message and your description; but you should still explain what
-the change does.)
+the change does. -->
 
-##### Example output:
+##### Example:
 
 ```
-(Paste verbatim command output here if necessary)
+<!-- (Paste example execution or output here if necessary) -->
 ```