diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
index ef8c5101cd9..47c0c84c390 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: "\U0001F41E  Bug report"
 about: Report an issue with ESLint or rules bundled with ESLint
 
 ---
@@ -51,4 +51,4 @@ about: Report an issue with ESLint or rules bundled with ESLint
 
 **What did you expect to happen?**
 
-**What actually happened? Please include the actual, raw output from ESLint.**
\ No newline at end of file
+**What actually happened? Please include the actual, raw output from ESLint.**
diff --git a/.github/ISSUE_TEMPLATE/CHANGE.md b/.github/ISSUE_TEMPLATE/CHANGE.md
index 14cff91b0e0..b5ae2ae832d 100644
--- a/.github/ISSUE_TEMPLATE/CHANGE.md
+++ b/.github/ISSUE_TEMPLATE/CHANGE.md
@@ -1,5 +1,5 @@
 ---
-name: Non-rule change request
+name: "\U0001F4DD Non-rule change request"
 about: Request a change that is not a bug fix, rule change, or new rule
 
 ---
@@ -22,4 +22,3 @@ about: Request a change that is not a bug fix, rule change, or new rule
 **The problem you want to solve.**
 
 **Your take on the correct solution to problem.**
-
diff --git a/.github/ISSUE_TEMPLATE/NEW_RULE.md b/.github/ISSUE_TEMPLATE/NEW_RULE.md
index 454b28e4090..3a04dc58a8a 100644
--- a/.github/ISSUE_TEMPLATE/NEW_RULE.md
+++ b/.github/ISSUE_TEMPLATE/NEW_RULE.md
@@ -1,5 +1,5 @@
 ---
-name: New rule proposal
+/name: "\U0001F680 New rule proposal"
 about: Propose a new rule to be added to ESLint
 
 ---
@@ -34,4 +34,3 @@ about: Propose a new rule to be added to ESLint
 ```
 
 **Why should this rule be included in ESLint (instead of a plugin)?**
-
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md
new file mode 100644
index 00000000000..ba96b41044c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/QUESTION.md
@@ -0,0 +1,22 @@
+---
+name: "⛔ Question"
+about: Please go to https://gitter.im/eslint/eslint
+
+---
+
+<!--
+    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+
+
+    Please do not use GitHub for asking questions. Instead,
+    please visit our chatroom:
+
+        https://gitter.im/eslint/eslint
+
+    Or our mailing list:
+
+        https://groups.google.com/group/eslint
+
+    Thanks in advance for helping us keep the issue tracker
+    clean!
+-->
diff --git a/.github/ISSUE_TEMPLATE/RULE_CHANGE.md b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
index 7b0c6537971..cc57bf53267 100644
--- a/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
+++ b/.github/ISSUE_TEMPLATE/RULE_CHANGE.md
@@ -1,5 +1,5 @@
 ---
-name: Rule change request
+name: "\U0001F4DD Rule change request"
 about: Request a change to an existing rule
 
 ---
@@ -33,4 +33,3 @@ about: Request a change to an existing rule
 **What does the rule currently do for this code?**
 
 **What will the rule do after it's changed?**
-
diff --git a/.github/ISSUE_TEMPLATE/SECURITY.md b/.github/ISSUE_TEMPLATE/SECURITY.md
new file mode 100644
index 00000000000..8cc33ec6eca
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/SECURITY.md
@@ -0,0 +1,19 @@
+---
+name: "⛔ Security issue"
+about: Please file security issues at https://hackerone.com/eslint
+
+---
+
+<!--
+    ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+
+
+    STOP! Please do not use GitHub for filing security issues.
+    Doing so is insecure and may put other ESLint users at risk.
+    To securely notify us of a security issue, please go to:
+        
+        https://hackerone.com/eslint
+
+    Thanks in advance for helping us keep the ESLint community
+    safe and secure.
+-->