diff --git a/.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml
index 212c4c6d..70c8689f 100644
--- a/.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml
@@ -16,9 +16,9 @@ body:
   - type: input
     id: reprod-url
     attributes:
-      label: "Reproduction URL"
-      description: Please enter your GitHub URL to provide a reproduction of the issue
-      placeholder: ex. https://github.com/USERNAME/REPO-NAME
+      label: "Branch Name"
+      description: Please enter the branch / link to fork
+      placeholder: ex. 'dev' or https://github.com/USERNAME/REPO-NAME
     validations:
       required: false
   - type: textarea
@@ -59,8 +59,11 @@ body:
       description: What is the impacted environment ?
       multiple: true
       options:
-        - Windows
-        - Linux
-        - Mac
+        - Windows (Direct Clone)
+        - Windows (Shared Folders)
+        - Linux (Direct Clone)
+        - Linux (Shared Folders)
+        - Mac (Direct Clone)
+        - Mac (Shared Folders)
     validations:
       required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/2-FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/2-FEATURE_REQUEST.yml
index cf247cc9..76dbe72b 100644
--- a/.github/ISSUE_TEMPLATE/2-FEATURE_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/2-FEATURE_REQUEST.yml
@@ -16,7 +16,7 @@ body:
   - type: textarea
     id: basic_example
     attributes:
-      label: "Basic Example"
+      label: "Use Case"
       description: Indicate here some basic examples of your feature.
       placeholder: A few specific words about your feature request.
     validations:
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
index 4677fc87..d4a6e049 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -1,17 +1,16 @@
 ### All Submissions:
 
-* [ ] Have you followed the guidelines in our Contributing document?
+* [ ] Have you followed the guidelines in our [Contributing](https://github.com/nasa/nos3/blob/main/CONTRIBUTING.md) document?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/nos3/pulls) for the same update/change?
 
-<!-- You can erase any parts of this template not applicable to your Pull Request. -->
-
 ### New Feature Submissions:
 
-1. [ ] Does your submission pass tests?
-2. [ ] Have you lint your code locally prior to submission?
+* [ ] Does your submission pass tests?
 
 ### Changes to Core Features:
 
 * [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-* [ ] Have you written new tests for your core changes, as applicable?
-* [ ] Have you successfully ran tests with your changes locally?
\ No newline at end of file
+
+### How do you test these changes?
+
+<input type="text" id="explain" name="explain"/>
\ No newline at end of file