diff --git a/.github/ISSUE_TEMPLATE/firebase-cpp-sdk-issue.md b/.github/ISSUE_TEMPLATE/firebase-cpp-sdk-issue.md
deleted file mode 100644
index 916a4ce47f..0000000000
--- a/.github/ISSUE_TEMPLATE/firebase-cpp-sdk-issue.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Firebase C++ SDK issue
-about: Please use this template to report issues with the Firebase C++ SDK.
-title: ''
-labels: new
-assignees: ''
-
----
-
-### Please fill in the following fields:
-Pre-built SDK from the [website](https://firebase.google.com/download/cpp) or open-source from this repo:
-Firebase C++ SDK version: 
-Firebase plugins in use (Auth, Database, etc.):
-Additional SDKs you are using (Facebook, AdMob, etc.): 
-Platform you are using the C++ SDK on (Mac, Windows, or Linux): 
-Platform you are targeting (iOS, Android, and/or desktop): 
-
-### Please describe the issue here:
-(Please list the full steps to reproduce the issue. Include device logs, Unity logs, and stack traces if available.)
-
-### Please answer the following, if applicable:
-Have you been able to reproduce this issue with just the [Firebase C++ quickstarts](https://github.com/firebase/quickstart-cpp) ?
-
-What's the issue repro rate? (eg 100%, 1/5 etc)
diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md
new file mode 100644
index 0000000000..7dfa8f4233
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,39 @@
+---
+name: 🐞 Bug report
+about: Please use this template to report bugs with the Firebase C++ SDK.
+labels: new
+---
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/issue.md
+-->
+
+### [REQUIRED] Please fill in the following fields:
+
+  * Pre-built SDK from the [website](https://firebase.google.com/download/cpp) or open-source from this repo: _____
+  * Firebase C++ SDK version: _____
+  * Problematic Firebase Component (Auth, Database, etc.): _____
+  * Other Firebase Components in use (Auth, Database, etc.): _____
+  * Platform you are using the C++ SDK on (Mac, Windows, or Linux): _____
+  * Platform you are targeting (iOS, Android, and/or desktop): _____
+
+### [REQUIRED] Please describe the issue here:
+
+(Please list the full steps to reproduce the issue. Include device logs, Unity logs, and stack traces if available.)
+
+#### Steps to reproduce:
+
+Have you been able to reproduce this issue with just the [Firebase C++ quickstarts](https://github.com/firebase/quickstart-cpp) ?
+What's the issue repro rate? (eg 100%, 1/5 etc)
+
+What happened? How can we make the problem occur?
+This could be a description, log/console output, etc.
+
+If you have a downloadable sample project that reproduces the bug you're reporting, you will
+likely receive a faster response on your issue.
+
+#### Relevant Code:
+
+```
+// TODO(you): code here to reproduce the problem
+```