diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index d8cb9ae0ddf..110eff91ee5 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -6,16 +6,39 @@ If your issue concerns the CocoaPods error, "...transitive dependencies that inc
 
 If not, please feel free to fill in the following info so we can help faster!
 
-### Details:
-  1. Objective-C or Swift:
-  2. iOS Version (7-9):
-  3. CocoaPods Version (FirebaseUI only officially supports CocoaPods <= 0.39, please make sure this repro's using 0.39 or below):
-  4. Firebase Version:
-
-### Explanation of your issue
-...
-
-### Steps to reproduce
-  1. Step 1
-  2. Step 2
-  3. Step 3
+### Step 1: Are you in the right place?
+
+  * For issues or feature requests related to the code **in this repository** file a GitHub issue.
+  * For general technical questions, post a question on [StackOverflow](http://stackoverflow.com/) tagged appropriately.
+  * For general Firebase discussion, use the [firebase-talk google group](https://groups.google.com/forum/#!forum/firebase-talk)
+  * 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/contact/troubleshooting/)
+
+### Step 2: Describe your environment
+
+  * Objective C or Swift: ____
+  * iOS version: _____
+  * Firebase SDK version: _____
+  * FirebaseUI version: ____
+  * CocoaPods Version: ____
+  
+### Step 3: Describe the problem:
+
+#### Steps to reproduce:
+
+  1. _____
+  2. _____
+  3. _____
+  
+#### Observed Results:
+
+  * What happened?  This could be a description, log output, etc.
+  
+#### Expected Results:
+
+  * What did you expect to happen?
+  
+#### Relevant Code:
+
+  ```
+  // TODO(you): code here to reproduce the problem
+  ```
\ No newline at end of file
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..c1dc579ddc9
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+Hey there! So you want to contribute to FirebaseUI? Before you file this pull request, follow these steps:
+
+  * Read [the contribution guidelines](CONTRIBUTING.md).
+  * If this has been discussed in an issue, make sure to mention the issue number here.  If not, go file an issue about this to make sure this is a desirable change.
+  * If this is a new feature please co-ordinate with someone on [FirebaseUI-Android](https://github.com/firebase/firebaseui-android) to make sure that we can implement this on both platforms and maintain feature parity.