diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000000..0822e6f29440
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,52 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!-- 
+
+Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
+
+If you have questions or are looking for help/support please see: https://rocket.chat/docs/getting-support
+
+If you are experiencing a bug please search our issues to be sure it is not already present: https://github.com/RocketChat/Rocket.Chat/issues
+
+-->
+
+### Description:
+
+<!-- A clear and concise description of what the bug is. -->
+
+### Steps to reproduce:
+
+1. <!-- Go to '...' -->
+2. <!-- Click on '....' -->
+3. <!-- and so on... -->
+
+### Expected behavior:
+
+<!-- What you expect to happen -->
+
+### Actual behavior:
+
+<!-- What actually happens with SCREENSHOT, if applicable -->
+
+### Server Setup Information:
+
+- Version of Rocket.Chat Server: 
+- Operating System: 
+- Deployment Method: <!-- snap/docker/tar/etc -->
+- Number of Running Instances: 
+- DB Replicaset Oplog: 
+- NodeJS Version: 
+- MongoDB Version: 
+
+### Additional context
+
+<!-- Add any other context about the problem here. -->
+
+### Relevant logs:
+
+<!-- Logs from both SERVER and BROWSER -->
+<!-- For more information about collecting logs please see: https://rocket.chat/docs/contributing/reporting-issues#gathering-logs -->
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 000000000000..99bb9a00975f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,7 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000000..066b2d920a28
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.