diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 12ae272..9e9f79a 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -21,14 +21,14 @@ body:
         2. I clicked on ...
         3. ...
     validations:
-      required: true 
+      required: true
   - type: textarea
     id: actual_behavior
     attributes:
       label: "Actual behavior"
       description: "Provide a description of what is currently happening"
     validations:
-      required: true    
+      required: true
   - type: textarea
     id: expected_behavior
     attributes:
@@ -46,8 +46,8 @@ body:
   - type: textarea
     id: about_support
     attributes:
-      label: "Provide a copy of Troubleshooting Information page"
+      label: "Provide a copy of Troubleshooting Information page (optional)"
       description: "To get a copy of the Troubleshooting Information page, type *about:support* in the address bar and click on the *Copy text to clipboard* button."
       render: "plain text"
     validations:
-      required: true 
+      required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 0000000..af80880
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,24 @@
+**Before submitting your pull request**
+
+- [ ] I agree to license my code under the [MPL 2.0 license](https://www.mozilla.org/en-US/MPL/2.0/).
+- [ ] I rebased my work on top of the main branch.
+- [ ] I ran `npm test` and all tests passed.
+- [ ] I added test coverages if relevant.
+
+# Description
+
+*Please include a summary of the changes including relevant motivation and context.*
+
+## Type of change
+
+*Select all that apply.*
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Major change (fix or feature that would cause existing functionality to work differently than in the current version)
+
+Tag issues related to this pull request:
+
+*
+*
+*