diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
index 9c78e94ed..982e1cb8a 100644
--- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
+++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
         exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1")
     }
     api("com.knecon.fforesight:jobs-commons:0.10.0")
-    api("com.knecon.fforesight:mongo-database-commons:maverick-mongo4")
+    api("com.knecon.fforesight:mongo-database-commons:maverick-mongo6")
     api("com.knecon.fforesight:database-tenant-commons:maverick-mongo")
     api("com.knecon.fforesight:keycloak-commons:maverick-mongo")
     api("com.knecon.fforesight:tracing-commons:0.5.0")
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml
index 6e0590039..0ed1f0749 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/mongo.changelog-tenant.xml
@@ -2,6 +2,6 @@
         xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.20.xsd">
-    <include file="/mongo/liquibase/changelog/tenant/1-initial-database.changelog.xml"/>
-    <include file="/mongo/liquibase/changelog/tenant/2-create-indices-for-entries.xml"/>
+    <include file="/mongo/changelog/tenant/1-initial-database.changelog.xml"/>
+    <include file="/mongo/changelog/tenant/2-create-indices-for-entries.xml"/>
 </databaseChangeLog>
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml
index 5fe9ed7cf..65a215858 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/mongo/changelog/tenant/2-create-indices-for-entries.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.20.xsd
         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
-    <changeSet id="createEntityLogEntryCollection" author="maverick">
+    <changeSet id="createIndicesForEntries" author="maverick">
 
         <ext:createIndex collectionName="entity-log-entries">
             <ext:keys>
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java
index c448ad01e..89cb8ac92 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java
@@ -12,8 +12,10 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
@@ -66,7 +68,7 @@ import lombok.extern.slf4j.Slf4j;
 @EnableConfigurationProperties({FileManagementServiceSettings.class})
 @EnableMongoRepositories(basePackages = "com.iqser.red.service.persistence")
 @ImportAutoConfiguration({StorageAutoConfiguration.class, JobsAutoConfiguration.class, DatabaseTenantCommonsAutoConfiguration.class, MultiTenancyAutoConfiguration.class, SpringDocAutoConfiguration.class, DefaultKeyCloakCommonsAutoConfiguration.class, MongoDatabaseCommonsAutoConfiguration.class})
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, CassandraAutoConfiguration.class, DataSourceAutoConfiguration.class, LiquibaseAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, CassandraAutoConfiguration.class, DataSourceAutoConfiguration.class, LiquibaseAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
 @Import({PersistenceServiceExternalApiConfigurationV2.class, PersistenceServiceExternalApiConfiguration.class, PersistenceServiceInternalApiConfiguration.class, PersistenceServiceExternalApiCacheConfiguration.class, MultiTenancyWebConfiguration.class, PersistenceServiceProcessorConfiguration.class, MessagingConfiguration.class, MultiTenancyMessagingConfiguration.class})
 public class Application implements ApplicationContextAware {