diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 62897d048d..0935b4a73a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Report a bug encountered while using the Frappe Framework
-
+labels: bug
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4c9b9e6fb5..1ddaa62f05 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea to improve Frappe
-
+labels: feature-request
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/question-about-using-frappe.md b/.github/ISSUE_TEMPLATE/question-about-using-frappe.md
index 74f9c5279f..aedec5c51d 100644
--- a/.github/ISSUE_TEMPLATE/question-about-using-frappe.md
+++ b/.github/ISSUE_TEMPLATE/question-about-using-frappe.md
@@ -1,7 +1,7 @@
 ---
 name: Question about using Frappe/Frappe Apps
 about: This is not the appropriate channel
-
+labels: invalid
 ---
 
 Please post on our forums:
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..1126c8b4da
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+The Frappe team and community take security issues in the Frappe Framework seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
+
+You can help us make Frappe and consequently all Frappe dependent apps like [ERPNext](https://erpnext.com) more secure by following the [Reporting guidelines](https://erpnext.com/security).
+
+We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.
\ No newline at end of file