diff --git a/generators/entity-server/templates/src/main/resources/config/couchmove/changelog/entity.fts.ejs b/generators/entity-server/templates/src/main/resources/config/couchmove/changelog/entity.fts.ejs
index 2fb841968057..1df2844989de 100644
--- a/generators/entity-server/templates/src/main/resources/config/couchmove/changelog/entity.fts.ejs
+++ b/generators/entity-server/templates/src/main/resources/config/couchmove/changelog/entity.fts.ejs
@@ -8,6 +8,7 @@
             "type_field": "_class"
         },
         "mapping": {
+            "analysis": {}.
             "default_analyzer": "standard",
             "default_datetime_parser": "dateTimeOptional",
             "default_field": "_all",
@@ -29,7 +30,7 @@
         },
         "store": {
             "indexType": "scorch",
-            "kvStoreName": ""
+            "segmentVersion": 15
         }
     },
     "sourceType": "couchbase",
diff --git a/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs
index 400ad88f9be3..f5ad9e5aac3f 100644
--- a/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs
+++ b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs
@@ -1750,7 +1750,7 @@ _%>
         // Wait for the <%= entityInstance %> to be indexed
         // TestUtil.retryUntilNotEmpty(() -> <%= entityInstance %>Repository.search(<%= entityClass %>.PREFIX, "id:" + <%= entityInstance %>.get<%= primaryKey.nameCapitalized %>())<% if (reactive) { %>.collectList().block()<% } %>);
         // <%= entityInstance %>Repository.search(<%= entityClass %>.PREFIX, "id:" + <%= entityInstance %>.get<%= primaryKey.nameCapitalized %>())<% if (reactive) { %>.collectList().block()<% } %>;
-        TimeUnit.SECONDS.sleep(2);
+        TimeUnit.SECONDS.sleep(1);
   <%_ } _%>
 
         // Search the <%= entityInstance %>
diff --git a/generators/server/templates/src/main/java/package/repository/CustomCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/CustomCouchbaseRepository.java.ejs
index 8cc0d4978745..a895411d43ba 100644
--- a/generators/server/templates/src/main/java/package/repository/CustomCouchbaseRepository.java.ejs
+++ b/generators/server/templates/src/main/java/package/repository/CustomCouchbaseRepository.java.ejs
@@ -72,7 +72,7 @@ public class CustomCouchbaseRepository<T, ID extends Serializable> extends Simpl
 <%_ if (searchEngine === 'couchbase') { _%>
 
     public Page<T> search(String indexName, String request, Pageable pageable) {
-        SearchQuery searchQuery = SearchQuery.queryString(request);
+        SearchQuery searchQuery = queryString(request);
         SearchOptions searchOptions = SearchOptions.searchOptions()
             .limit(pageable.getPageSize())
             .skip((int) pageable.getOffset());
@@ -83,7 +83,7 @@ public class CustomCouchbaseRepository<T, ID extends Serializable> extends Simpl
 
     @Override
     public List<T> search(String indexName, String request) {
-        SearchQuery searchQuery = SearchQuery.queryString(request);
+        SearchQuery searchQuery = queryString(request);
         return extractResults(couchbaseOperations.getCouchbaseClientFactory().getCluster().searchQuery(indexName, searchQuery));
     }