diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 1c07fd244..3065d8f3d 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,17 +1,23 @@
-Submit feature requests to http://www.mattermost.org/feature-requests/.
-File non-security related bugs here in the following format: 
+Submit feature requests to http://www.mattermost.org/feature-requests/. File non-security related bugs here in the following format: 
 
 #### Summary
-Issue in one concise sentence
+Issue in one concise sentence.
+
+#### Environment Information
+
+- Device Name: 
+- OS Version: 
+- Mattermost App Version: 
+- Mattermost Server Version:
 
 #### Steps to reproduce
-How can we reproduce the issue (what version are you using?)
+How can we reproduce the issue?
 
 #### Expected behavior
-Describe your issue in detail
+Describe your issue in detail.
 
 #### Observed behavior
 What did you see happen? Please include relevant error messages and/or screenshots.
 
 #### Possible fixes
-If you can, link to the line of code that might be responsible for the problem
+If you can, link to the line of code that might be responsible for the problem.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 8455239dc..67dd1ffe9 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -14,3 +14,9 @@ When filling in a section please remove the help text and the above text.
 - [ ] All new/modified APIs include changes to the drivers
 - [ ] Has UI changes
 - [ ] Includes text changes and localization file updates
+
+#### Device Information
+This PR was tested on: [Device name(s), OS version(s)] 
+
+#### Screenshots
+[If the PR includes UI changes, include screenshots (for both iOS and Android if possible).]