diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_REQUEST.md b/.github/ISSUE_TEMPLATE/SUPPORT_REQUEST.md
new file mode 100644
index 000000000..adf727399
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/SUPPORT_REQUEST.md
@@ -0,0 +1,56 @@
+---
+name: Support Request
+about: Report an issue faced while using Hudi
+title: '[SUPPORT]'
+labels: question
+
+---
+
+**_Tips before filing an issue_**
+
+- Have you gone through our [FAQs](https://cwiki.apache.org/confluence/display/HUDI/FAQ)?
+
+- Join the mailing list to engage in conversations and get faster support at dev-subscribe@hudi.apache.org.
+
+- If you have triaged this as a bug, then file an [issue](https://issues.apache.org/jira/projects/HUDI/issues) directly.
+
+**Describe the problem you faced**
+
+A clear and concise description of the problem.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+
+1.
+2.
+3.
+4.
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Environment Description**
+
+* Hudi version :
+
+* Spark version :
+
+* Hive version :
+
+* Hadoop version :
+
+* Storage (HDFS/S3/GCS..) :
+
+* Running on Docker? (yes/no) :
+
+
+**Additional context**
+
+Add any other context about the problem here.
+
+**Stacktrace**
+
+```Add the stacktrace of the error.```
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..f0cbb38a0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,9 @@
+
+blank_issues_enabled: false
+contact_links:
+  - name: FAQ
+    url: https://cwiki.apache.org/confluence/display/HUDI/FAQ
+    about: Do checkout frequently asked questions before filing an issue.
+  - name: Hudi Issue Tracker
+    url: https://issues.apache.org/jira/projects/HUDI
+    about: If you have triaged this as a bug, then file an issue directly.