diff --git a/.github/ISSUE_TEMPLATE/community-request.yaml b/.github/ISSUE_TEMPLATE/community-request-template.md
similarity index 73%
rename from .github/ISSUE_TEMPLATE/community-request.yaml
rename to .github/ISSUE_TEMPLATE/community-request-template.md
index 1940cfd..b85e2f0 100644
--- a/.github/ISSUE_TEMPLATE/community-request.yaml
+++ b/.github/ISSUE_TEMPLATE/community-request-template.md
@@ -7,23 +7,28 @@ assignees: ''
 
 ---
 
-# Community Note
+## Community Note
+
 * Please vote for this issue by adding a 👍 reaction to the issue. This will help the community and maintainers from the Amazon Chime SDK team to prioritize this request.
 * Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request.
 * Please go through the existing [issues](https://github.com/aws/amazon-chime-sdk-cpp/issues) to see if your request has already been recommended.
 * Please do not use this template for bugs or support.
 * If you are interested in working on this issue or have submitted a pull request, please leave a comment.
 
-# Tell us about your request
-## Is this a request for the Amazon Chime SDK for C++, or with the Amazon Chime SDK for C++ Signaling Client?
+## Tell us about your request
+
+### Is this a request for the Amazon Chime SDK for C++, or with the Amazon Chime SDK for C++ Signaling Client?
+
+### What do you want us to build?
 
-## What do you want us to build?
+### Tell us about the problem you are trying to solve and why is it hard?
 
-## Tell us about the problem you are trying to solve and why is it hard?
 The more details you provide us, the better we will be able to help you.
 
-## How are you currently solving a problem?
+### How are you currently solving a problem?
+
 Are there any workarounds or mitigations you have used? Why is it not working for you?
 
-## Additional context
+### Additional context
+
 Anything else we should know?
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/cpp-sdk-build-issue.yaml b/.github/ISSUE_TEMPLATE/cpp-sdk-build-issue.yaml
index 56dcc05..ae9d3c2 100644
--- a/.github/ISSUE_TEMPLATE/cpp-sdk-build-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/cpp-sdk-build-issue.yaml
@@ -1,5 +1,5 @@
-name: Build Failure Report
-description: Report unexpected build failures with the project
+name:  Amazon Chime SDK for C++ Build Failure Report
+description: Report unexpected build failures with the  Amazon Chime SDK for C++
 body:
   - type: input
     id: subproject
diff --git a/.github/ISSUE_TEMPLATE/documentation-request.yaml b/.github/ISSUE_TEMPLATE/documentation-request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/documentation-request.yaml
rename to .github/ISSUE_TEMPLATE/documentation-request.md
diff --git a/.github/ISSUE_TEMPLATE/signaling-client-build-issue.yaml b/.github/ISSUE_TEMPLATE/signaling-client-build-issue.yaml
index c891fe5..1a27e74 100644
--- a/.github/ISSUE_TEMPLATE/signaling-client-build-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/signaling-client-build-issue.yaml
@@ -1,5 +1,5 @@
-name: Build Failure Report
-description: Report unexpected build failures with the project
+name: Signaling Client Build Failure Report
+description: Report unexpected build failures with the Amazon Chime SDK for C++ Signaling Client
 body:
   - type: input
     id: subproject
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 10d8700..f9d630f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,30 @@
-**Issue #:**
 
-**Description of changes:**
+### Description of changes
 
-**Testing:**
-*Can these tested using the demo CLI? Please provide reproducible step-by-step instructions.*
+<!--- Provide a concise overview of the changes. -->
 
-**Checklist:**
+**Github Issue:**
 
-1. What platforms has this change been built on? What `cmake` commands were used to generate the build files?
+### Testing
 
-2. Does this change risk impacting platforms other then the one tested?
+<!-- Can these tested using the demo CLI? Please provide reproducible step-by-step instructions. -->
+
+### Checklist
+
+*What platforms has this change been built on? What `cmake` commands were used to generate the build files?*
+
+
+
+*Does this change risk impacting platforms other then the one tested?*
+
+
+
+*Do you add, modify, or delete public API definitions? If yes, has that been reviewed and approved?*
+
+
+
+*Do you change the wire protocol, e.g. the request method? If yes, has that been reviewed and approved?*
 
-3. Do you add, modify, or delete public API definitions? If yes, has that been reviewed and approved?
 
-4. Do you change the wire protocol, e.g. the request method? If yes, has that been reviewed and approved?
 
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
\ No newline at end of file