diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java
index 347f01d..0d3adb7 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java
@@ -21,6 +21,7 @@ import com.iqser.red.service.search.v1.model.SearchResult;
 import com.iqser.red.service.search.v1.server.exception.IndexException;
 import com.iqser.red.service.search.v1.server.model.IndexDocument;
 import com.iqser.red.service.search.v1.server.model.Query;
+import com.iqser.red.service.search.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.search.v1.server.service.SearchService;
 import com.iqser.red.service.search.v1.server.utils.QueryStringConverter;
 
@@ -70,7 +71,8 @@ public class SearchServiceImpl implements SearchService {
         highlightFieldMap.put("filename", new HighlightField.Builder().build());
         highlightFieldMap.put("fileAttributes.value", new HighlightField.Builder().build());
 
-        SearchRequest request = new SearchRequest.Builder().query(convertQuery(query,
+        SearchRequest request = new SearchRequest.Builder().index(TenantContext.getTenantId())
+                .query(convertQuery(query,
                         dossierTemplateIds,
                         dossierIds,
                         fileId,
diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java
index 11554f1..c9640b8 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java
@@ -32,6 +32,7 @@ import com.iqser.red.service.search.v1.model.SearchResult;
 import com.iqser.red.service.search.v1.server.exception.IndexException;
 import com.iqser.red.service.search.v1.server.model.IndexDocument;
 import com.iqser.red.service.search.v1.server.model.Query;
+import com.iqser.red.service.search.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.search.v1.server.service.SearchService;
 import com.iqser.red.service.search.v1.server.utils.QueryStringConverter;
 
@@ -71,7 +72,8 @@ public class SearchServiceImpl implements SearchService {
         highlightFieldMap.put("filename", new HighlightField.Builder().build());
         highlightFieldMap.put("fileAttributes.value", new HighlightField.Builder().build());
 
-        SearchRequest request = new SearchRequest.Builder().query(convertQuery(query,
+        SearchRequest request = new SearchRequest.Builder().index(TenantContext.getTenantId())
+                .query(convertQuery(query,
                         dossierTemplateIds,
                         dossierIds,
                         fileId,