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 44897e00..00000000
--- a/.github/ISSUE_TEMPLATE/firebase-cpp-sdk-issue.md
+++ /dev/null
@@ -1,23 +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:
-Firebase C++ SDK version: 
-Firebase plugins in use (Auth, Database, etc.):
-Additional SDKs you are using (Facebook, AdMob, etc.): 
-Platform you are using the 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, 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 (this GitHub project)?
-
-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 00000000..94c20889
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.md
@@ -0,0 +1,35 @@
+---
+name: Firebase C++ Sample issue
+about: Report issues with the Firebase C++ Sample.
+labels: new
+---
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/issue.md
+-->
+
+### [READ] For Firebase C++ SDK issues, please report to [Firebase C++ open-source](https://github.com/firebase/firebase-cpp-sdk/issues/new/choose)
+
+Once you've read this section and determined that your issue is appropriate for this repository, please delete this section.
+
+### [REQUIRED] Please fill in the following fields:
+
+  * Which Firebase Sample: _____ (Auth, Database, etc.)
+  * Firebase C++ SDK version: _____
+  * Additional SDKs you are using: _____ (Facebook, AdMob, etc.)
+  * Platform you are using the 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, and stack traces if available.)
+
+#### Steps to reproduce:
+
+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.
diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
new file mode 100644
index 00000000..b606cea0
--- /dev/null
+++ b/.github/workflows/desktop.yml
@@ -0,0 +1,14 @@
+name: Desktop builds
+
+on:
+  workflow_dispatch:
+    inputs:
+      apis:
+        description: 'CSV of apis whose quickstart examples we should build'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: noop
+        run: true