diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md
index 3d2078474f..e9df0d9280 100644
--- a/.github/ISSUE_TEMPLATE/enhancement-request.md
+++ b/.github/ISSUE_TEMPLATE/enhancement-request.md
@@ -1,5 +1,5 @@
 ---
-name: Enhancement request
+name: New Feature request
 about: Suggest an idea to improve OpenNebula
 
 ---
@@ -8,10 +8,10 @@ about: Suggest an idea to improve OpenNebula
 Brief description of the new functionality
 
 **Use case**
-How are you going to use this new feature? Why do you need it? 
+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 including Sunstone, CLI or/and API  
+Describe any changed you'd like to see to current interfaces including 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.
@@ -23,10 +23,10 @@ Add any other context or screenshots about the feature request here. Or any othe
 <!--////////////////////////////////////////////-->
 
 ## Progress Status
-- [ ] Branch created 
+- [ ] Branch created
 - [ ] Code committed to development branch
 - [ ] Testing - QA
-- [ ] Documentation 
+- [ ] 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/security_bug_report.md b/.github/ISSUE_TEMPLATE/security_bug_report.md
deleted file mode 100644
index d696313ae2..0000000000
--- a/.github/ISSUE_TEMPLATE/security_bug_report.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Security bug report
-about: Create a report to tell us about a security problem
-labels: Security
----
-
-**Vulnerability Details**
-Please provide a brief explanation of the security issue.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Version**
-Completed for affected components
- - Affected Component: [e.g. Sunstone, Scheduler or Storage]
- - Hypervisor: [e.g. KVM]
- - OpenNebula Version: [e.g. 5.4.12 or development]
- - Browser: [e.g. chrome, firefox]
-
-**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