diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5f4a35ba..9c12ccce 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,10 +1,38 @@
+<!---
+  - BEFORE YOU MAKE AN ISSUE -
+-->
+
+<!---
+1) If you're trying to request a feature then please do so via our request board:
+    https://react-native-firebase.canny.io/admin/board/feature-requests/invite
+--->
+
+<!---
+2) If this is a setup issue then please make sure you've correctly followed the setup guides, most setup issues such as 'duplicate dex files', 'default app has not been initialized' etc are all down to an incorrect setup as the guides haven't been correctly followed.
+-->
+
+### Issue
+
+<!--- Please write your issue here, provide as much detail as you can, code snippets, key files which will help us to debug such as your `Podfile` and/or `app/build.gradle` file). -->
+
 
-(Please write your issue here along with the environment details below. Include any key files which will help us to debug, such as your `Podfile` and/or `app/build.gradle` file).
 
 ### Environment
 
-1. Target Platform (e.g. iOS, Android):
-2. Development Operating System (e.g. macOS Sierra, Windows 10):
-3. Build tools (Xcode or Android Studio version, iOS or Android SDK version, if relevant):
-4. React Native version (e.g. 0.45.1):
-5. RNFirebase Version (e.g. 2.0.2):
+<!--- (e.g. iOS, Android, Both) --->
+1. Application Target Platform: 
+
+<!--- (e.g. macOS Sierra, Windows 10) --->
+2. Development Operating System: 
+
+<!--- (Xcode or Android Studio version, iOS or Android SDK version - if relevant) --->
+3. Build Tools: 
+
+<!--- (e.g. 0.45.1) --->
+4. React Native version: 
+
+<!--- (e.g. 2.1.3) --->
+5. RNFirebase Version: 
+
+<!--- (e.g. database, auth, messaging, analytics etc - or N/A if not applicable) --->
+6. Firebase Module: