diff --git a/docs/release_notes.md b/docs/release_notes.md
index f1c726585..e5c4933b3 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -22,6 +22,7 @@
 - [OpenAI] You can now add multiple custom headers to an `OpenAiClient` at once via `.withHeaders()`.
 - [Orchestration] Added `GEMINI_3_1_PRO_PREVIEW_EA` and `MISTRAL_MEDIUM` to model list in `OrchestrationAiModel`.
 - [Orchestration] Reasoning content is now supported for users through `OrchestrationChatResponse.getReasoningText()` and `OrchestrationChatCompletionDelta.getDeltaReasoningText()` to see the thinking processes when using the reasoning models.
+- [spring-app] The `spring-app` is now updated to Spring 7 Spring Boot 4.
 
 ### 📈 Improvements
 
diff --git a/sample-code/spring-app/pom.xml b/sample-code/spring-app/pom.xml
index 78c5b57ac..0df0c182a 100644
--- a/sample-code/spring-app/pom.xml
+++ b/sample-code/spring-app/pom.xml
@@ -33,7 +33,7 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <spring-boot.version>3.5.16</spring-boot.version>
+    <spring-boot.version>4.1.0</spring-boot.version>
     <cf-logging.version>4.2.0</cf-logging.version>
     <apache-tomcat-embed.version>11.0.24</apache-tomcat-embed.version>
     <mcp-core.version>2.0.0</mcp-core.version>
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
index 0f4ed8348..bd66ca7fe 100644
--- a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
+++ b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/Application.java
@@ -8,7 +8,6 @@
 import javax.annotation.Nonnull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Primary;
@@ -16,7 +15,6 @@
 /** Main class to start the Spring Boot application. */
 @SpringBootApplication
 @ComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
-@ServletComponentScan({"com.sap.cloud.sdk", "com.sap.ai.sdk.app"})
 public class Application {
 
   /**