diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
index 2ff568e74..d53f53652 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -7,6 +7,10 @@ labels: ''
 assignees: ''
 
 ---
+<!-- DO NOT DELETE 
+validate_template=false
+template_path=.github/ISSUE_TEMPLATE/---feature-request.md
+-->
 
 <!--
 Thank you for contributing to the Firebase community!
diff --git a/.github/ISSUE_TEMPLATE/---report-a-bug.md b/.github/ISSUE_TEMPLATE/---report-a-bug.md
index 0e0b9499c..4484df5fa 100644
--- a/.github/ISSUE_TEMPLATE/---report-a-bug.md
+++ b/.github/ISSUE_TEMPLATE/---report-a-bug.md
@@ -6,6 +6,11 @@ labels: ''
 assignees: ''
 
 ---
+<!-- DO NOT DELETE 
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/---report-a-bug.md
+-->
+
 ### Related issues
 
 <!-- Are there any related firebase-functions issues that you found on this topic before deciding to open a new issue? Please link them here-->