diff --git a/.gitignore b/.gitignore
index b86fc48..dddc5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ bin/
 target/
 .settings/
 !.mvn/wrapper/maven-wrapper.jar
+/target_test-classes/
 
 ### STS ###
 .apt_generated
@@ -61,4 +62,4 @@ hs_err_pid*
 
 .DS_Store
 
-.vscode*
\ No newline at end of file
+.vscode*
diff --git a/domain/src/test/java/org/folio/spring/domain/controller/JsonSchemasControllerTest.java b/domain/src/test/java/org/folio/spring/domain/controller/JsonSchemasControllerTest.java
index 51e3765..c72305a 100644
--- a/domain/src/test/java/org/folio/spring/domain/controller/JsonSchemasControllerTest.java
+++ b/domain/src/test/java/org/folio/spring/domain/controller/JsonSchemasControllerTest.java
@@ -53,9 +53,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -71,7 +71,7 @@ class JsonSchemasControllerTest {
   @Autowired
   private MockMvc mvc;
 
-  @MockBean
+  @MockitoBean
   private JsonSchemasService jsonSchemasService;
 
   @ParameterizedTest
diff --git a/domain/src/test/java/org/folio/spring/domain/controller/RamlsControllerTest.java b/domain/src/test/java/org/folio/spring/domain/controller/RamlsControllerTest.java
index ac67a95..c7ee4cd 100644
--- a/domain/src/test/java/org/folio/spring/domain/controller/RamlsControllerTest.java
+++ b/domain/src/test/java/org/folio/spring/domain/controller/RamlsControllerTest.java
@@ -53,9 +53,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -71,7 +71,7 @@ class RamlsControllerTest {
   @Autowired
   private MockMvc mvc;
 
-  @MockBean
+  @MockitoBean
   private RamlsService ramlsService;
 
   @ParameterizedTest
diff --git a/domain/src/test/java/org/folio/spring/domain/generator/FolioUUIDGeneratorTest.java b/domain/src/test/java/org/folio/spring/domain/generator/FolioUUIDGeneratorTest.java
index fe73bba..37fb029 100644
--- a/domain/src/test/java/org/folio/spring/domain/generator/FolioUUIDGeneratorTest.java
+++ b/domain/src/test/java/org/folio/spring/domain/generator/FolioUUIDGeneratorTest.java
@@ -8,6 +8,7 @@
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.id.enhanced.AccessCallback;
 import org.hibernate.id.enhanced.DatabaseStructure;
 import org.hibernate.id.enhanced.Optimizer;
@@ -51,7 +52,7 @@ void beforeEach() {
 
   @Test
   void generateWorksTest() {
-    when(persister.getIdentifier(any(), any())).thenReturn(UUID);
+    when(persister.getIdentifier(any(), any(SharedSessionContractImplementor.class))).thenReturn(UUID);
 
     Object result = folioUUIDGenerator.generate(session, folioUUIDGenerator);
 
@@ -60,7 +61,7 @@ void generateWorksTest() {
 
   @Test
   void generateWorksWithNullIdentifierTest() {
-    when(persister.getIdentifier(any(), any())).thenReturn(null);
+    when(persister.getIdentifier(any(), any(SharedSessionContractImplementor.class))).thenReturn(null);
     when(databaseStructure.buildCallback(any())).thenReturn(accessCallback);
     when(optimizer.generate(any())).thenReturn(JSON_OBJECT);
 
diff --git a/pom.xml b/pom.xml
index 4627c96..7b696e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.7</version>
+    <version>3.4.2</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
@@ -37,7 +37,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spring-module-core.version>2.1.0-SNAPSHOT</spring-module-core.version>
-    <springdoc.version>2.3.0</springdoc.version>
+    <springdoc.version>2.8.4</springdoc.version>
   </properties>
 
   <dependencyManagement>
diff --git a/tenant/src/test/java/org/folio/spring/tenant/controller/TenantControllerTest.java b/tenant/src/test/java/org/folio/spring/tenant/controller/TenantControllerTest.java
index 5843c3f..bbd45c0 100644
--- a/tenant/src/test/java/org/folio/spring/tenant/controller/TenantControllerTest.java
+++ b/tenant/src/test/java/org/folio/spring/tenant/controller/TenantControllerTest.java
@@ -42,9 +42,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -60,7 +60,7 @@ class TenantControllerTest {
   @Autowired
   private MockMvc mvc;
 
-  @MockBean
+  @MockitoBean
   private HibernateSchemaService hibernateSchemaService;
 
   @ParameterizedTest
diff --git a/web/src/main/java/org/folio/spring/web/service/HttpService.java b/web/src/main/java/org/folio/spring/web/service/HttpService.java
index 924a295..9843479 100644
--- a/web/src/main/java/org/folio/spring/web/service/HttpService.java
+++ b/web/src/main/java/org/folio/spring/web/service/HttpService.java
@@ -44,8 +44,8 @@ public void setup() {
     messageConverters.add(new ObjectPlainTextConverter(StandardCharsets.UTF_8));
 
     this.restTemplate = restTemplateBuilder
-        .setConnectTimeout(Duration.ofSeconds(connectionTimeout))
-        .setReadTimeout(Duration.ofSeconds(readTimeout))
+        .connectTimeout(Duration.ofSeconds(connectionTimeout))
+        .readTimeout(Duration.ofSeconds(readTimeout))
         .additionalMessageConverters(messageConverters)
         .build();
   }