diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 76f6792060c..1a1c648b735 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,8 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-labels: 'Type: Bug'
+labels: 'Status: Pending'
+type: 'Bug'
 ---
 
 /!\ To report a **security issue** please follow this procedure:
diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md
index c1a7c952af4..44f2464e25a 100644
--- a/.github/ISSUE_TEMPLATE/enhancement-request.md
+++ b/.github/ISSUE_TEMPLATE/enhancement-request.md
@@ -1,7 +1,8 @@
 ---
 name: New Feature request
 about: Suggest an idea to improve OpenNebula
-labels: 'Type: Feature'
+labels: 'Status: Pending'
+type: 'Feature'
 ---
 
 **Description**