diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 489a6be5377..7e4d4f737c5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,6 +4,7 @@ about: Report an issue that you've encountered.
 title: ''
 labels: 'Type: Bug'
 assignees: ''
+type: 'Bug'
 
 ---
 
@@ -15,14 +16,14 @@ assignees: ''
 
 <!--- Please provide detailed steps for reproducing this issue. -->
 
-### Expected Behaviour
-
-<!--- Explain how the program should behave once the issue has been resolved. -->
-
 ### Current Behaviour
 
 <!--- Please provide information about the undesired current behaviour. -->
 
+### Expected Behaviour
+
+<!--- Explain how the program should behave once the issue has been resolved. -->
+
 ### Context
 
 <!--- Please provide any relevant information about your system setup. Mantid Imaging version can be obtained by running `conda list mantidimaging` and system information can be obtained by running `uname -a`. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index a1f258592d9..9bb97aac846 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,13 +4,26 @@ about: Request an improvement or a new feature.
 title: ''
 labels: 'Type: Improvement'
 assignees: ''
+type: 'Feature'
 
 ---
 
+### Current Behaviour
+
+<!--- Please provide information about the undesired current behaviour. -->
+
 ### Desired Behaviour
 
 <!--- Explain how the program should behave once the issue has been resolved. -->
 
-### Current Behaviour
+### Undesired Behaviour
 
-<!--- Please provide information about the undesired current behaviour. -->
+<!--- Please provide information about undesired behaviour that should be avoided. -->
+
+### Importance of Feature
+
+<!--- Please provide a brief description of why this feature is important. This will help us prioritize the feature. -->
+
+### Additional Context
+
+<!--- Please provide any additional context or screenshots about the feature request here if applicable -->
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index c8dc15a162f..b18f17466bd 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,19 +1,31 @@
-### Issue
-
-*Close or ref the associated ticket, e.g. Closes #84*
+<!-- Close or ref the associated ticket, e.g.  -->
+## Issue Closes #<ISSUE>
 
 ### Description
 
-*Add a description of the changes made*.
+<!-- Add a description of the changes made. -->
+
+### Developer Testing 
+
+<!-- Describe the tests that were used to verify your changes -->
+- I have verified unit tests pass locally: `python -m pytest -vs`
+- ...
 
-### Testing 
+### Acceptance Criteria and Reviewer Testing
 
-*Describe the tests that were used to verify your changes*.
+<!-- Validation checks the reviewer should make and step by step instructions for how the reviewer should test including any necessary environment setup (Reviewer should tick off each check. Reviewer may also perform additional tests-->
+- [ ] Unit tests pass locally: `python -m pytest -vs`
+- [ ] ...
 
-### Acceptance Criteria 
+### Documentation and Additional Notes
 
-*How should the reviewer test your changes*?
+<!-- Please un-comment any of the below checkboxes applicable for your PR. This could be updated release notes, sphinx documentation, or screenshot tests.
+Please also add any additional notes that may be helpful to the reviewer here including screenshots if necessary -->
 
-### Documentation
+<!-- - [ ] Release Notes have been updated
+- [ ] Sphinx documentation has been updated
+- [ ] Screenshot tests have been updated
+  - [ ] **Before merge for developer:** Resolve the change on applitools by, creating a new baseline for test and verify that the tests pass.
+  - [ ] **After merge for reviewer:** Go to [Applitools compare and merge page](https://eyes.applitools.com/app/merge/), select all changes and merge dev branch to default branch
+  - [ ] **After merge for reviewer:** Verify that other PR's screenshot tests do not start to fail (See [Applitools baselines](https://eyes.applitools.com/app/baselines) for more info) -->
 
-*How have you changed the documentation to reflect your changes? All changes should be noted in the appropriate file in docs/release_notes*