diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index eef007724..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-General questions should be asked on the mailing list ray-dev@googlegroups.com.
-Questions about how to use Ray should be asked on
-[StackOverflow](https://stackoverflow.com/questions/tagged/ray).
-
-Before submitting an issue, please fill out the following form.
--->
-
-### System information
-- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
-- **Ray installed from (source or binary)**:
-- **Ray version**:
-- **Python version**:
-- **Exact command to reproduce**:
-
-<!--
-You can obtain the Ray version with
-
-python -c "import ray; print(ray.__version__)"
--->
-
-### Describe the problem
-<!-- Describe the problem clearly here. -->
-
-### Source code / logs
-<!-- Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Try to provide a reproducible test case that is the bare minimum necessary to generate the problem. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..088ef3479
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Report a bug on the latest version of Ray.
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--Please include [tune], [rllib], [autoscaler] etc. in the issue title if relevant-->
+
+### What is the problem?
+
+*Ray version and other system information (Python version, TensorFlow version, OS):*
+
+*Does the problem occur on the [latest wheels](https://ray.readthedocs.io/en/latest/installation.html)?*
+
+
+
+### Reproduction
+Please provide a script that can be run to reproduce the issue. The script should have **no external library dependencies** (i.e., use fake or mock data / environments):
+
+If we cannot run your script, we cannot fix your issue.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..43cd83d5b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,12 @@
+---
+name: Feature request
+about: Suggest an idea for Ray, Tune, RLlib, etc.
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!--Please include [tune], [rllib], [autoscaler] etc. in the issue title if relevant-->
+
+### Describe your feature request
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..a06068e22
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,14 @@
+---
+name: Question
+about: 'Ask a question about Ray usage. '
+title: ''
+labels: question
+assignees: ''
+
+---
+
+<!--Please include [tune], [rllib], [autoscaler] etc. in the issue title if relevant-->
+
+### What is your question?
+
+*Ray version and other system information (Python version, TensorFlow version, OS):*