diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java
index df81996d2b5..8ab4472ac0d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java
@@ -13,12 +13,14 @@ import static org.openmetadata.service.Entity.DASHBOARD_SERVICE;
 import static org.openmetadata.service.Entity.DATABASE;
 import static org.openmetadata.service.Entity.DATABASE_SCHEMA;
 import static org.openmetadata.service.Entity.DATABASE_SERVICE;
+import static org.openmetadata.service.Entity.DATA_PRODUCT;
 import static org.openmetadata.service.Entity.DOMAIN;
 import static org.openmetadata.service.Entity.ENTITY_REPORT_DATA;
 import static org.openmetadata.service.Entity.GLOSSARY;
 import static org.openmetadata.service.Entity.GLOSSARY_TERM;
 import static org.openmetadata.service.Entity.INGESTION_PIPELINE;
 import static org.openmetadata.service.Entity.MESSAGING_SERVICE;
+import static org.openmetadata.service.Entity.METADATA_SERVICE;
 import static org.openmetadata.service.Entity.METRIC;
 import static org.openmetadata.service.Entity.MLMODEL;
 import static org.openmetadata.service.Entity.MLMODEL_SERVICE;
@@ -125,13 +127,15 @@ public class SearchIndexApp extends AbstractNativeApplication {
           DASHBOARD_SERVICE,
           PIPELINE_SERVICE,
           MLMODEL_SERVICE,
+          STORAGE_SERVICE,
+          METADATA_SERVICE,
           SEARCH_SERVICE,
           ENTITY_REPORT_DATA,
           WEB_ANALYTIC_ENTITY_VIEW_REPORT_DATA,
           WEB_ANALYTIC_USER_ACTIVITY_REPORT_DATA,
           DOMAIN,
           STORED_PROCEDURE,
-          STORAGE_SERVICE,
+          DATA_PRODUCT,
           TEST_CASE_RESOLUTION_STATUS,
           TEST_CASE_RESULT,
           API_SERVICE,
diff --git a/openmetadata-service/src/main/resources/json/data/app/SearchIndexingApplication.json b/openmetadata-service/src/main/resources/json/data/app/SearchIndexingApplication.json
index 295a4fe8ae8..06d5e7cb68a 100644
--- a/openmetadata-service/src/main/resources/json/data/app/SearchIndexingApplication.json
+++ b/openmetadata-service/src/main/resources/json/data/app/SearchIndexingApplication.json
@@ -42,13 +42,14 @@
       "testCaseResult",
       "apiService",
       "apiEndpoint",
-      "apiCollection"
+      "apiCollection",
+      "metric"
     ],
     "recreateIndex": false,
     "batchSize": "100",
     "payLoadSize": 104857600,
-    "producerThreads": 10,
-    "consumerThreads": 10,
+    "producerThreads": 1,
+    "consumerThreads": 1,
     "maxConcurrentRequests": 100,
     "maxRetries": 3,
     "initialBackoff": 1000,
diff --git a/openmetadata-service/src/main/resources/json/data/appMarketPlaceDefinition/SearchIndexingApplication.json b/openmetadata-service/src/main/resources/json/data/appMarketPlaceDefinition/SearchIndexingApplication.json
index e3e3a0c0247..b782599401e 100644
--- a/openmetadata-service/src/main/resources/json/data/appMarketPlaceDefinition/SearchIndexingApplication.json
+++ b/openmetadata-service/src/main/resources/json/data/appMarketPlaceDefinition/SearchIndexingApplication.json
@@ -54,15 +54,17 @@
       "storedProcedure",
       "dataProduct",
       "testCaseResolutionStatus",
+      "testCaseResult",
       "apiService",
       "apiEndpoint",
-      "apiCollection"
+      "apiCollection",
+      "metric"
     ],
     "recreateIndex": false,
     "batchSize": "100",
     "payLoadSize": 104857600,
-    "producerThreads": 10,
-    "consumerThreads": 10,
+    "producerThreads": 1,
+    "consumerThreads": 1,
     "maxConcurrentRequests": 100,
     "maxRetries": 3,
     "initialBackoff": 1000,
diff --git a/openmetadata-spec/src/main/resources/json/schema/system/eventPublisherJob.json b/openmetadata-spec/src/main/resources/json/schema/system/eventPublisherJob.json
index e002fd75ff7..4f69fd38128 100644
--- a/openmetadata-spec/src/main/resources/json/schema/system/eventPublisherJob.json
+++ b/openmetadata-spec/src/main/resources/json/schema/system/eventPublisherJob.json
@@ -112,13 +112,13 @@
       "title": "Number of Producer Threads to use",
       "description": "Number of producer threads to use for reindexing",
       "type": "integer",
-      "default": 10
+      "default": 1
     },
     "consumerThreads": {
       "title": "Number of Consumer Threads to use",
       "description": "Number of consumer threads to use for reindexing",
       "type": "integer",
-      "default": 10
+      "default": 1
     },
     "maxConcurrentRequests": {
       "title": "Max Concurrent Requests",
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationSchemas/SearchIndexingApplication.json b/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationSchemas/SearchIndexingApplication.json
index 08cdfd152c0..d63f57bb188 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationSchemas/SearchIndexingApplication.json
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ApplicationSchemas/SearchIndexingApplication.json
@@ -26,7 +26,7 @@
       "title": "Number of Consumer Threads",
       "description": "Number of threads to use for reindexing",
       "type": "integer",
-      "default": 5
+      "default": 1
     },
     "maxConcurrentRequests": {
       "title": "Max Concurrent Requests",