diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..e32e0c2f68
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Command line '...'
+2. See error **Please provide your error message**
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**System (please complete the following information):**
+ - Hardware: [e.g. HPC, Desktop, Cloud...]
+ - Executor: [e.g. slurm, local, awsbatch...]
+ - OS: [e.g. CentOS Linux, macOS, Linux Mint...]
+ - Version [e.g. 7, 10.13.6, 18.3...]
+
+**Nextflow (please complete the following information):**
+ - Version: [e.g. 0.31.0]
+
+**Container engine (please complete the following information):**
+ - Engine: [e.g. Conda, Docker or Singularity]
+ - version: [e.g. 1.0.0]
+
+**Container (please complete the following information):**
+ - tag: [e.g. 1.0.0]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..c005d12b95
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+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 about the feature request here.