diff --git a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/CreateDataForComplexFilter.p.json b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/CreateDataForComplexFilter.p.json
index 7222428a860..fae0e0fbb23 100644
--- a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/CreateDataForComplexFilter.p.json	
+++ b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/CreateDataForComplexFilter.p.json	
@@ -30,9 +30,13 @@
       "config" : {
         "output" : {
           "code" : [
-            "import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
-            "import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
-            "import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
+            "import ch.ivyteam.ivy.searchengine.ISearchEngineManager;",
+            "import ch.ivyteam.ivy.searchengine.client.IndexName;",
+            "import ch.ivyteam.ivy.searchengine.index.IndexInfo;",
+            "",
+            "//import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
+            "//import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
+            "//import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
             "// via APi change that triggers the sync, e.g. CustomField",
             "// also applies to tasks ",
             "",
@@ -40,11 +44,11 @@
             "",
             "//Alternativ is via api with which to trigger reindexing. ",
             "",
-            "for (int i = 0; i < IElasticsearchManager.instance().indicesCount(); i++) {",
+            "for (int i = 0; i < ISearchEngineManager.instance().indicesCount(); i++) {",
             "  ",
-            "  IndexInfo indexInfo = IElasticsearchManager.instance().indices(0, 1000).get(i);",
+            "  IndexInfo indexInfo = ISearchEngineManager.instance().indices(0, 1000).get(i);",
             "  ivy.log.info(\"Reindexing STARTED for: \" + indexInfo.indexName().toString());",
-            "  IElasticsearchManager.instance().reindexSync(indexInfo.indexName());",
+            "  ISearchEngineManager.instance().reindexSync(indexInfo.indexName());",
             "  ivy.log.info(\"Reindexing DONE for: \" + indexInfo.indexName().toString());",
             "  ",
             "}",
@@ -1897,9 +1901,12 @@
       "config" : {
         "output" : {
           "code" : [
-            "import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
-            "import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
-            "import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
+            "import ch.ivyteam.ivy.searchengine.ISearchEngineManager;",
+            "import ch.ivyteam.ivy.searchengine.client.IndexName;",
+            "import ch.ivyteam.ivy.searchengine.index.IndexInfo;",
+            "//import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
+            "//import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
+            "//import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
             "// via APi change that triggers the sync, e.g. CustomField",
             "// also applies to tasks ",
             "",
@@ -1907,11 +1914,11 @@
             "",
             "//Alternativ is via api with which to trigger reindexing. ",
             "",
-            "for (int i = 0; i < IElasticsearchManager.instance().indicesCount(); i++) {",
+            "for (int i = 0; i < ISearchEngineManager.instance().indicesCount(); i++) {",
             "  ",
-            "  IndexInfo indexInfo = IElasticsearchManager.instance().indices(0, 1000).get(i);",
+            "  IndexInfo indexInfo = ISearchEngineManager.instance().indices(0, 1000).get(i);",
             "  ivy.log.info(\"Reindexing STARTED for: \" + indexInfo.indexName().toString());",
-            "  IElasticsearchManager.instance().reindexSync(indexInfo.indexName());",
+            "  ISearchEngineManager.instance().reindexSync(indexInfo.indexName());",
             "  ivy.log.info(\"Reindexing DONE for: \" + indexInfo.indexName().toString());",
             "  ",
             "}",
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/ClientStatisticResponse.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/ClientStatisticResponse.java
index e0e1b00802d..77a62386875 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/ClientStatisticResponse.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/ClientStatisticResponse.java
@@ -2,7 +2,7 @@
 
 import com.axonivy.portal.bo.ClientStatistic;
 
-import ch.ivyteam.ivy.elasticsearch.client.agg.AggregationResult;
+import ch.ivyteam.ivy.searchengine.client.agg.AggregationResult;
 
 public class ClientStatisticResponse {
   private AggregationResult result;
diff --git a/AxonIvyPortal/portal/src/com/axonivy/portal/rest/ClientStatisticRestService.java b/AxonIvyPortal/portal/src/com/axonivy/portal/rest/ClientStatisticRestService.java
index ffa5d6b2959..7e76706e681 100644
--- a/AxonIvyPortal/portal/src/com/axonivy/portal/rest/ClientStatisticRestService.java
+++ b/AxonIvyPortal/portal/src/com/axonivy/portal/rest/ClientStatisticRestService.java
@@ -16,7 +16,7 @@
 import com.axonivy.portal.service.ClientStatisticService;
 
 import ch.ivy.addon.portalkit.statistics.ClientStatisticResponse;
-import ch.ivyteam.ivy.elasticsearch.client.agg.AggregationResult;
+import ch.ivyteam.ivy.searchengine.client.agg.AggregationResult;
 import ch.ivyteam.ivy.security.ISecurityConstants;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java b/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java
index 3e89b6d197d..74edb3d9279 100644
--- a/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java
+++ b/AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java
@@ -20,8 +20,8 @@
 import ch.ivy.addon.portalkit.enums.PortalVariable;
 import ch.ivy.addon.portalkit.service.JsonConfigurationService;
 import ch.ivy.addon.portalkit.statistics.ClientStatisticResponse;
-import ch.ivyteam.ivy.elasticsearch.client.agg.AggregationResult;
 import ch.ivyteam.ivy.environment.Ivy;
+import ch.ivyteam.ivy.searchengine.client.agg.AggregationResult;
 import ch.ivyteam.ivy.workflow.stats.WorkflowStats;
 
 public class ClientStatisticService extends JsonConfigurationService<ClientStatistic> {