diff --git a/.github/ISSUE_TEMPLATE/bugreport.yml b/.github/ISSUE_TEMPLATE/bugreport.yml
index 29759fac..380bda82 100644
--- a/.github/ISSUE_TEMPLATE/bugreport.yml
+++ b/.github/ISSUE_TEMPLATE/bugreport.yml
@@ -47,7 +47,7 @@ body:
     attributes:
       label: Version
       description: What version of Discord.Net are you using?
-      placeholder: ex. 3.1.0
+      placeholder: ex. 3.12.0
     validations:
       required: true
   - type: input
@@ -62,7 +62,9 @@ body:
     id: logs
     attributes: 
       label: Logs
-      description: Add applicable logs and/or a stack trace here.
+      description: Add applicable logs and/or a stack trace here. See this [docs page](https://discordnet.dev/guides/concepts/logging.html) 
+                    to make sure you have properly setup logging.
+      render: shell
     validations:
       required: true
   - type: textarea
@@ -82,5 +84,16 @@ body:
       label: Packages
       description: Please list all 3rd party packages in use if applicable, including their versions.
       placeholder: Discord.Addons.Hosting V5.1.0, Discord.InteractivityAddon V2.4.0, etc.
+    validations:
+      required: true      
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: Please list your OS name and version, .NET runtime or SDK you're using, host architecture
+      placeholder: |
+        - **OS**: Windows 11 23H2 25915
+        - **Architecture**: x64
+        - **SDK**: .NET sdk 7.0.100
     validations:
       required: true
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bac8eff0..a3013d54 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,25 @@
+<!--
 Thanks in advance for your contribution to Discord.Net!
-
 Before opening a pull request, please consider the following:
-
 Does your changeset adhere to the Contributing Guidelines?
+Does your changeset address a specific issue or idea? If not, please break your changes up into multiple requests.
+Have your changes been previously discussed with other members of the community? We prefer new features to be vetted through an issue or a discussion in our Discord channel first; bug-fixes and other small changes are generally fine without prior vetting. 
+-->
 
-Does your changeset address a specific issue or idea? If not, please
-break your changes up into multiple requests.
+### Description
+<!-- A brief explanation of changes made in this PR. -->
 
-Have your changes been previously discussed with other members
-of the community? We prefer new features to be vetted through
-an issue or a discussion in our Discord channel first; bug-fixes
-and other small changes are generally fine without prior vetting.
+### Changes
+<!--
+List things changed in this pull request.
+Example:
+- Add X entity
+- Update Y method
+-->
 
-Please remove this section, and include a summary of your changes
-below.
----
+### Related Issues
+<!--
+List issues that are related to this PR.
+Example:
+- resolves #6969
+-->