diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index f10701b4..0e5f4c72 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -35,10 +35,15 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-test</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/src/test/java/my/bookshop/it/FeatureTogglesIT.java b/integration-tests/src/test/java/my/bookshop/it/FeatureTogglesIT.java
index e266e334..936c9802 100644
--- a/integration-tests/src/test/java/my/bookshop/it/FeatureTogglesIT.java
+++ b/integration-tests/src/test/java/my/bookshop/it/FeatureTogglesIT.java
@@ -7,8 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 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.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/pom.xml b/pom.xml
index e547a030..2c2cc1c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,11 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
+<<<<<<< HEAD
+    <version>4.0.2</version>
+=======
     <version>3.5.10</version>
+>>>>>>> origin/main
     <relativePath/>
     <!-- lookup parent from repository -->
   </parent>
@@ -28,7 +32,7 @@
 
     <!-- DEPENDENCIES VERSION -->
     <jdk.version>21</jdk.version>
-    <cds.services.version>4.6.1</cds.services.version>
+    <cds.services.version>4.7.0-SNAPSHOT</cds.services.version>
     <cloud.sdk.version>5.26.0</cloud.sdk.version>
     <xsuaa.version>3.6.5</xsuaa.version>
     <cf-java-logging-support.version>3.8.6</cf-java-logging-support.version>
diff --git a/srv/pom.xml b/srv/pom.xml
index ef4135d6..c0ed15cc 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -110,6 +110,11 @@
       <artifactId>spring-boot-starter-security</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
@@ -122,14 +127,26 @@
     </dependency>
 
     <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-test</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webclient</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-webtestclient</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-webflux</artifactId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/srv/src/main/java/my/bookshop/health/CustomHealthIndicator.java b/srv/src/main/java/my/bookshop/health/CustomHealthIndicator.java
index 4ecd1295..c8abcec6 100644
--- a/srv/src/main/java/my/bookshop/health/CustomHealthIndicator.java
+++ b/srv/src/main/java/my/bookshop/health/CustomHealthIndicator.java
@@ -1,8 +1,8 @@
 package my.bookshop.health;
 
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
+import org.springframework.boot.health.contributor.Health;
+import org.springframework.boot.health.contributor.HealthIndicator;
 import org.springframework.stereotype.Component;
 
 /** Custom health indicator implementation. */
diff --git a/srv/src/test/java/my/bookshop/AdminServiceAddress_default_ITest.java b/srv/src/test/java/my/bookshop/AdminServiceAddress_default_ITest.java
index 63eef15f..90f4a4b9 100644
--- a/srv/src/test/java/my/bookshop/AdminServiceAddress_default_ITest.java
+++ b/srv/src/test/java/my/bookshop/AdminServiceAddress_default_ITest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
 import org.springframework.test.context.ActiveProfiles;
 
 /**
@@ -12,6 +13,7 @@
  */
 @ActiveProfiles("default")
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@AutoConfigureWebTestClient
 class AdminServiceAddress_default_ITest extends AdminServiceAddressITestBase {
 
   @Test
diff --git a/srv/src/test/java/my/bookshop/AdminServiceAddress_mocked_ITest.java b/srv/src/test/java/my/bookshop/AdminServiceAddress_mocked_ITest.java
index bd43bb1b..c2f63def 100644
--- a/srv/src/test/java/my/bookshop/AdminServiceAddress_mocked_ITest.java
+++ b/srv/src/test/java/my/bookshop/AdminServiceAddress_mocked_ITest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
 import org.springframework.test.context.ActiveProfiles;
 
 /**
@@ -16,6 +17,7 @@
     webEnvironment = WebEnvironment.RANDOM_PORT,
     properties =
         "cds.remote.services.'[API_BUSINESS_PARTNER]'.destination.name=myself-AdminServiceAddressITest")
+@AutoConfigureWebTestClient
 class AdminServiceAddress_mocked_ITest extends AdminServiceAddressITestBase {
 
   @Test
diff --git a/srv/src/test/java/my/bookshop/CatalogServiceITest.java b/srv/src/test/java/my/bookshop/CatalogServiceITest.java
index ee71ea3e..6aa6862e 100644
--- a/srv/src/test/java/my/bookshop/CatalogServiceITest.java
+++ b/srv/src/test/java/my/bookshop/CatalogServiceITest.java
@@ -14,8 +14,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 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.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/srv/src/test/java/my/bookshop/GenreHierarchyTest.java b/srv/src/test/java/my/bookshop/GenreHierarchyTest.java
index d6d374bb..193436ef 100644
--- a/srv/src/test/java/my/bookshop/GenreHierarchyTest.java
+++ b/srv/src/test/java/my/bookshop/GenreHierarchyTest.java
@@ -7,8 +7,8 @@
 import java.net.URI;
 import org.junit.jupiter.api.Test;
 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.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.util.UriComponentsBuilder;
diff --git a/srv/src/test/java/my/bookshop/NotesServiceITest.java b/srv/src/test/java/my/bookshop/NotesServiceITest.java
index cc6c68b2..b4179bf9 100644
--- a/srv/src/test/java/my/bookshop/NotesServiceITest.java
+++ b/srv/src/test/java/my/bookshop/NotesServiceITest.java
@@ -4,6 +4,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -12,6 +13,7 @@
     webEnvironment = WebEnvironment.RANDOM_PORT,
     properties =
         "cds.remote.services.'[API_BUSINESS_PARTNER]'.destination.name=myself-NotesServiceITest")
+@AutoConfigureWebTestClient
 @ActiveProfiles({"default", "mocked"})
 class NotesServiceITest {