diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 802f24814e..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-
-Thank you for contributing to the Firebase community!
-
-Have a usage question?
-=======================
-We get lots of those and we love helping you, but GitHub is not the best place for them and they
-will be closed. Here are some resources to get help:
-
-- Go through the guides: https://firebase.google.com/docs/admin/setup/
-- Read the full API reference: https://firebase.google.com/docs/reference/admin/node/
-
-If the official documentation doesn't help, try asking through our official support channels:
-
-- Firebase Google Group: https://groups.google.com/forum/#!forum/firebase-talk/
-- Other official support channels: https://firebase.google.com/support/
-
-*Please avoid double posting across multiple channels!*
-
-Think you found a bug?
-=======================
-Yeah, we're definitely not perfect! Please use the bug report template below and include a minimal
-repro when opening the issue.
-
-
-Have a feature request?
-========================
-Great, we love hearing how we can improve our products! Share you idea through our
-feature request support channel: https://firebase.google.com/support/contact/bugs-features/.
-
--->
-
-
-### Version info
-
-<!-- What versions of the following libraries are you using? Note that your issue may already
-be fixed in the latest versions. -->
-
-**Firebase Admin Node.js SDK:**
-
-**Node.js:**
-
-**Other (e.g., Cloud Functions for Firebase SDK, npm) (if applicable):**
-
-### Test case
-
-<!-- Provide a minimal, complete, and verifiable example (http://stackoverflow.com/help/mcve). -->
-
-
-### Steps to reproduce
-
-<!-- Provide the steps needed to reproduce the issue given the above test case. -->
-
-
-### Expected behavior
-
-<!-- What is the expected behavior? -->
-
-
-### Actual behavior
-
-<!-- What is the actual behavior? -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 80efa77414..0000000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-
-Thank you for contributing to the Firebase community! Please fill out the pull request form below
-and make note of the following:
-
-Run the linter and test suite
-==============================
-Make sure your changes pass our linter and the tests all pass on your local machine. We've hooked
-up this repo with continuous integration to double check those things for you.
-
-Add tests (if applicable)
-==============================
-Most non-trivial changes should include some extra test coverage. If you aren't sure how to add
-tests, feel free to submit regardless and ask us for some advice.
-
-Sign our CLA
-==============================
-Please sign our Contributor License Agreement (https://cla.developers.google.com/about/google-individual)
-before sending PRs. We cannot accept code without this.
-
--->
-
-
-### Description
-
-<!-- Are you fixing a bug? Updating our documentation? Implementing a new feature? Make sure we
-have the context around your change. Link to other relevant issues or pull requests. -->
-
-### Code sample
-
-<!-- Proposing an API change? Provide code samples showing how the API will be used. -->
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..5de83b2cc9
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,32 @@
+### [READ] Step 1: Are you in the right place?
+
+  * For issues or feature requests related to __the code in this repository__
+    file a Github issue.
+    * If this is a __feature request__ make sure the issue title starts with "FR:".
+  * For general technical questions, post a question on [StackOverflow](http://stackoverflow.com/)
+    with the firebase tag.
+  * For general Firebase discussion, use the [firebase-talk](https://groups.google.com/forum/#!forum/firebase-talk)
+    google group.
+  * For help troubleshooting your application that does not fall under one
+    of the above categories, reach out to the personalized
+    [Firebase support channel](https://firebase.google.com/support/).
+
+### [REQUIRED] Step 2: Describe your environment
+
+  * Operating System version: _____
+  * Firebase SDK version: _____
+  * Library version: _____
+  * Firebase Product: _____ (auth, database, storage, etc)
+
+### [REQUIRED] Step 3: Describe the problem
+
+#### Steps to reproduce:
+
+What happened? How can we make the problem occur?
+This could be a description, log/console output, etc.
+
+#### Relevant Code:
+
+```
+// TODO(you): code here to reproduce the problem
+```
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..3d81fd0c9f
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+Hey there! So you want to contribute to a Firebase SDK? 
+Before you file this pull request, please read these guidelines:
+
+### Discussion
+
+  * Read the contribution guidelines (CONTRIBUTING.md).
+  * If this has been discussed in an issue, make sure to link to the issue here. 
+    If not, go file an issue about this **before creating a pull request** to discuss.
+
+### Testing
+
+  * Make sure all existing tests in the repository pass after your change.
+  * If you fixed a bug or added a feature, add a new test to cover your code.
+
+### API Changes
+
+  * At this time we cannot accept changes that affect the public API.  If you'd like to help 
+    us make Firebase APIs better, please propose your change in an issue so that we 
+    can discuss it together.