diff --git a/.github/issue_template.md b/.github/issue_template.md
index 3398f49..772d98b 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -8,16 +8,17 @@
 ## Bug
 
 **OS**  
-linux|windows|??
+mbed-OS|linux|windows|
 
 **mbed TLS build:**  
 Version: x.x.x or git commit id  
-Configuration: please attach config.h file  
+OS version: x.x.x  
+Configuration: please attach config.h file where possible  
 Compiler and options (if you used a pre-built binary, please indicate how you obtained it):  
 Additional environment information:  
 
 **peer device TLS stack and version**  
-openSSL | GnuTls | other  
+openSSL|GnuTls|Chrome|NSS(Firefox)|SEcureChannel (IIS/Internet Explorer/Edge)|Other  
 version:  
 
 **Expected behavior**   
@@ -29,7 +30,7 @@
 ----------------------------------------------------------------
 ## Enhancement\Feature Request
 
-**Incentive for change**  
+**Justification - why does the library need this feature?**  
 
 **Suggested enhancement**  
 
@@ -37,4 +38,4 @@
 
 ## Question
 
-**Please first check for answers in the [mbed TLS knowledge Base](https://tls.mbed.org/kb), and preferebly file an issue in the [mbed TLS support forum](https://tls.mbed.org/discussions)**  
\ No newline at end of file
+**Please first check for answers in the [mbed TLS knowledge Base](https://tls.mbed.org/kb), and preferebly file an issue in the [mbed TLS support forum](https://tls.mbed.org/discussions)**  
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index dac8bde..fa0c7e9 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 Notes:
-* Pull requests will not be accepted until:
+* Pull requests cannot be accepted until:
 -  The submitter has [accepted the online agreement here with a click through](https://developer.mbed.org/contributor_agreement/) 
-   or those that do not wish to create an mbed account, a slightly different agreement can be found [here](https://www.mbed.com/en/about-mbed/contributor-license-agreements/)
+   or for companies or those that do not wish to create an mbed account, a slightly different agreement can be found [here](https://www.mbed.com/en/about-mbed/contributor-license-agreements/)
 - The PR follows the [mbed TLS coding standards](https://tls.mbed.org/kb/development/mbedtls-coding-standards)
 * This is just a template, so feel free to use/remove the unnecessary things
 ## Description
@@ -18,7 +18,7 @@
 - This PR contains changes in the API. If this is true, and there is a need for the fix to be backported, the fix should be handled differently in the legacy branch
 
 Yes | NO  
-What branch?
+Which branch?
 
 ## Migrations
 If there is any API change, what's the incentive and logic for it.
@@ -36,4 +36,4 @@
 
 
 ## Steps to test or reproduce
-Outline the steps to test or reproduce the PR here.
\ No newline at end of file
+Outline the steps to test or reproduce the PR here.