diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 122d2cde47ad0..fbc238be3520e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @AlexRuiz7 @gdiazlo
+*   @wazuh/indexer 
diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
index be3ae51b237ee..68b901cf8888e 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_template.md
@@ -2,7 +2,7 @@
 name: 🐛 Bug report
 about: Create a report to help us improve
 title: "[BUG]"
-labels: 'bug, untriaged'
+labels: ["type/bug", "level/task"]
 assignees: ''
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 53b3614a34342..156e627041b39 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: 🎆 Feature request
 about: Suggest an idea for this project
 title: ''
-labels: 'enhancement, untriaged'
+labels: ["type/enhancement", "level/task"]
 assignees: ''
 ---