diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.md b/.github/ISSUE_TEMPLATE/01_bug_report.md
index 8ec635b0..74122c05 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.md
@@ -14,11 +14,22 @@ label: 'Bug'
 
 ## Repro steps
 
-<!-- Please provide us steps (in points) how we can reproduce the issue. -->
+<!--
+  - Please provide step-by-step instructions on how to reproduce the issue.
+  - Better yet, provide a repo/branch where the issue is easily reproducible.
+-->
 
 ## Environment
 
-- **Async Storage version**: <!-- @react-native-async-storage/async-storage version set in package.json -->
-- **React-Native version**: <!-- React Native version set in package.json -->
-- **Platform tested**: <!--  iOS / Android -->
-- **Logs/Error that are relevant**: <!-- link to your CI logs or semantic-release logs -->
+- **Platforms tested**:
+  - [ ] Android
+  - [ ] iOS
+  - [ ] macOS
+  - [ ] Windows
+- **AsyncStorage version**: <!-- @react-native-async-storage/async-storage version set in package.json -->
+- **Environment**:
+  <!--
+    After running `npm install` or `yarn` in your repo, run `npx react-native info`
+    and paste the output here.
+  -->
+- **Logs/Errors that may be relevant**: <!-- link to your CI logs or semantic-release logs -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e493ef7e..faa67307 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,18 @@
-Summary:
----------
+## Summary
 
-<!-- Thank you for sending the PR!
-Help us understand more of your work - you can explain what you did, post a link to an issue etc. Anything helps! -->
+<!--
+  Thank you for submitting a PR!
 
+  Help us understand more of your work - you can explain what you did, post a
+  link to an issue, screenshots etc. Anything helps!
+-->
 
-Test Plan:
-----------
+## Test Plan
 
-<!-- Help us test your work (**REQUIRED**). If you changed the code, please provide us with instructions of how we can try it out ourselves, so we can confirm it's working. You can also post screenshots/gifts.  -->
\ No newline at end of file
+<!--
+    Help us test your work (**REQUIRED**).
+
+    If you changed the code, please provide us with instructions of how we can
+    try it out ourselves, so we can confirm it's working. You can also post
+    screenshots/gifts.
+-->