diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 29eddb95..4dceb58b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.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 6198f338..e7a0a49c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,8 @@
 ---
 name: 🎆 Feature request
 about: Request a feature in this project
-title: '[FEATURE]'
-labels: 'enhancement, untriaged'
+title: ''
+labels: ["type/enhancement", "level/task"]
 assignees: ''
 ---
 **Is your feature request related to a problem?**
diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/scheduler/ReportDefinitionJobRunner.kt b/src/main/kotlin/org/opensearch/reportsscheduler/scheduler/ReportDefinitionJobRunner.kt
index b1f6624d..f2331e28 100644
--- a/src/main/kotlin/org/opensearch/reportsscheduler/scheduler/ReportDefinitionJobRunner.kt
+++ b/src/main/kotlin/org/opensearch/reportsscheduler/scheduler/ReportDefinitionJobRunner.kt
@@ -23,7 +23,6 @@ import org.opensearch.reportsscheduler.index.ReportInstancesIndex
 import org.opensearch.reportsscheduler.model.ReportDefinitionDetails
 import org.opensearch.reportsscheduler.model.ReportInstance
 import org.opensearch.reportsscheduler.util.NotificationApiUtils.getNotificationConfigInfo
-import org.opensearch.reportsscheduler.util.SecureIndexClient
 import org.opensearch.reportsscheduler.util.buildReportLink
 import org.opensearch.reportsscheduler.util.logger
 import org.opensearch.reportsscheduler.util.sendNotificationWithHTML
@@ -43,7 +42,7 @@ internal object ReportDefinitionJobRunner : ScheduledJobRunner {
      * @param clusterService The ES cluster service
      */
     fun initialize(client: Client, clusterService: ClusterService) {
-        this.client = SecureIndexClient(client)
+        this.client = client
         this.clusterService = clusterService
     }
 
@@ -65,7 +64,7 @@ internal object ReportDefinitionJobRunner : ScheduledJobRunner {
         val htmlWithURL: String? =
             htmlMessage?.replace("{{urlDefinition}}", urlDefinition)?.replace("{{hits}}", hits.toString())
 
-        log.info("esto es el mensaje html $htmlMessage")
+        log.debug("HTML message: $htmlMessage") // TODO remove
         configInfo.sendNotificationWithHTML(
             this.client,
             title,