diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..b3aab568b8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Description**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Details**
+ - Affected Component: [e.g. Sunstone, Scheduler or Storage]
+ - Hypervisor: [e.g. KVM]
+ - Version: [e.g. 5.4.12 or development]
+
+**Additional context**
+Add any other context about the problem here.
+<!--////////////////////////////////////////////-->
+<!-- THIS SECTION IS FOR THE DEVELOPMENT TEAM   -->
+<!-- BOTH FOR BUGS AND ENHANCEMENT REQUESTS     -->
+<!-- PROGRESS WILL BE REFLECTED HERE            -->
+<!--////////////////////////////////////////////-->
+
+## Progress Status
+- [ ] Branch created 
+- [ ] Code committed to development branch
+- [ ] Testing - QA
+- [ ] Documentation 
+- [ ] Release notes - resolved issues, compatibility, known issues
+- [ ] Code committed to upstream release/hotfix branches
+- [ ] Documentation committed to upstream release/hotfix branches
diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md
new file mode 100644
index 0000000000..915162a588
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement-request.md
@@ -0,0 +1,32 @@
+---
+name: Enhancement request
+about: Suggest an idea to improve OpenNebula
+
+---
+
+**Description**
+Brief description of the new functionality
+
+**Use case**
+How are you going to use this new feature? Why do you need it? 
+
+**Interface Changes**
+Describe any changed you'd like to see to current interfaces incluing Sunstone, CLI or/and API  
+
+**Additional Context**
+Add any other context or screenshots about the feature request here. Or any other alternative you have considered to addressed this new feature.
+
+<!--////////////////////////////////////////////-->
+<!-- THIS SECTION IS FOR THE DEVELOPMENT TEAM   -->
+<!-- BOTH FOR BUGS AND ENHANCEMENT REQUESTS     -->
+<!-- PROGRESS WILL BE REFLECTED HERE            -->
+<!--////////////////////////////////////////////-->
+
+## Progress Status
+- [ ] Branch created 
+- [ ] Code committed to development branch
+- [ ] Testing - QA
+- [ ] Documentation 
+- [ ] Release notes - resolved issues, compatibility, known issues
+- [ ] Code committed to upstream release/hotfix branches
+- [ ] Documentation committed to upstream release/hotfix branches