diff --git a/pom.xml b/pom.xml
index 5ab48fc..b935872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,11 @@
 
     <!-- DEPENDENCIES VERSION -->
     <jdk.version>25</jdk.version>
-    <cds.services.version>4.9.0</cds.services.version>
-    <spring.boot.version>3.5.14</spring.boot.version>
+    <cds.services.version>5.0.0-SNAPSHOT</cds.services.version>
+    <spring.boot.version>4.0.3</spring.boot.version>
     <sap.cloud.sdk.version>5.30.0</sap.cloud.sdk.version>
-    <sap.cloud.security.version>3.7.2</sap.cloud.security.version>
-    <sap.cloud.security.ams.version>3.8.1</sap.cloud.security.ams.version>
+    <sap.cloud.security.version>4.0.5</sap.cloud.security.version>
+    <sap.cloud.security.ams.version>4.1.2</sap.cloud.security.ams.version>
 
     <cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/srv/pom.xml b/srv/pom.xml
index 1d5c99c..386709f 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -46,14 +46,14 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sap.cloud.security.ams.client</groupId>
-      <artifactId>jakarta-ams</artifactId>
+      <groupId>com.sap.cloud.security.ams</groupId>
+      <artifactId>spring-boot-starter-cap-ams</artifactId>
       <version>${sap.cloud.security.ams.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.sap.cloud.security.ams.client</groupId>
-      <artifactId>cap-ams-support</artifactId>
+      <groupId>com.sap.cloud.security.ams</groupId>
+      <artifactId>spring-boot-starter-cap-ams-test</artifactId>
       <version>${sap.cloud.security.ams.version}</version>
     </dependency>
 
@@ -86,8 +86,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-test</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -182,21 +188,18 @@
         </executions>
       </plugin>
 
+      <!-- Plugin for DCL -> DCN compilation before tests -->
       <plugin>
-        <groupId>com.sap.cloud.security.ams.client</groupId>
+        <groupId>com.sap.cloud.security.ams.dcl</groupId>
         <artifactId>dcl-compiler-plugin</artifactId>
-        <version>${sap.cloud.security.ams.version}</version>
+        <version>1.3.0</version>
         <executions>
           <execution>
-            <id>dcl.compile</id>
             <goals>
               <goal>compile</goal>
             </goals>
             <configuration>
               <sourceDirectory>${project.basedir}/src/main/resources/ams</sourceDirectory>
-              <dcn>true</dcn>
-              <dcnParameter>pretty</dcnParameter>
-              <compileTestToDcn>true</compileTestToDcn>
             </configuration>
           </execution>
         </executions>
diff --git a/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java b/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java
index 853cc77..9b2fbc2 100644
--- a/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java
+++ b/srv/src/test/java/sap/capire/xtravels/it/TravelServiceIntegrationTest.java
@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.BeforeEach;
 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;