diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 1b58fec917e..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,20 +0,0 @@
-(Please take the time and describe the problem you're having before you propose a solution.)
-
-### What I'm trying to achieve
-
-...
-
-### Steps to reproduce the problem
-
-1.
-2.
-
-### What I expected to happen
-
-...
-
-### What happened instead/how it failed
-
-...
-
-(Please include a stack trace if this problem results in a crash.)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000000..536ecfbc8a8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+### What I'm trying to achieve
+…
+
+### Steps to reproduce the problem
+1. 
+2. 
+
+### What I expected to happen
+…
+
+### Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**System information**
+Operating system: 
+Browser:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..c2a5d72bf93
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+### What I'm trying to achieve
+…
+
+### Describe a proposed solution
+...
+
+### Other solutions I've tried and won't work
+…
+
+### Screenshots or mockups
+<!-- Please provide any illustrations that could help others understand the problem or the proposed solution. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6ed34d986e1..15c857e50a4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,15 @@
 I want to merge this change because...
 
-(Please mention all relevant issue numbers.)
+<!-- Please mention all relevant issue numbers. -->
 
-(If your changes affect the UI, providing "before" and "after" screenshots will
-greatly reduce the amount of work needed to review your work.)
+### Screenshots
+
+<!-- If your changes affect the UI, providing "before" and "after" screenshots will
+greatly reduce the amount of work needed to review your work. -->
 
 ### Pull Request Checklist
 
-(Please keep this section. It will make maintainer's life easier.)
+<!-- Please keep this section. It will make maintainer's life easier. -->
 
 1. [ ] Privileged views and APIs are guarded by proper permission checks.
 1. [ ] All visible strings are translated with proper context.
@@ -15,5 +17,3 @@ greatly reduce the amount of work needed to review your work.)
 1. [ ] Database queries are optimized and the number of queries is constant.
 1. [ ] The changes are tested.
 1. [ ] The code is documented (docstrings, project documentation).
-1. [ ] Python code quality checks pass: `pycodestyle`, `pydocstyle`, `pylint`.
-1. [ ] JavaScript code quality checks pass: `eslint`.