diff --git a/.github/workflows/boot-strategy-plugin.yml b/.github/workflows/boot-strategy-plugin.yml
index fc78e1448..ec0c33595 100644
--- a/.github/workflows/boot-strategy-plugin.yml
+++ b/.github/workflows/boot-strategy-plugin.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: graalvm/setup-graalvm@v1
         with:
           distribution: 'graalvm'
-          java-version: 21
+          java-version: 25
           cache: "maven"
   
       - name: Printing versions
diff --git a/.vscode/launch.json b/.vscode/launch.json
index fd5cad552..e756bc90e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -292,6 +292,16 @@
             "projectName": "boot-scheduler-quartz",
             "args": "--spring.profiles.active=local",
             "envFile": "${workspaceFolder}/.env"
+        },
+        {
+            "type": "java",
+            "name": "Spring Boot-StrategyPluginApplication<boot-strategy-plugin>",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "com.example.plugin.strategyplugin.StrategyPluginApplication",
+            "projectName": "boot-strategy-plugin",
+            "args": "",
+            "envFile": "${workspaceFolder}/.env"
         }
     ]
 }
diff --git a/boot-strategy-plugin/ReadMe.md b/boot-strategy-plugin/ReadMe.md
index 2ad33a631..c69b85f41 100644
--- a/boot-strategy-plugin/ReadMe.md
+++ b/boot-strategy-plugin/ReadMe.md
@@ -25,5 +25,5 @@ docker-compose -f docker/docker-compose.yml up -d
 * Swagger UI: http://localhost:8080/swagger-ui.html
 * Actuator Endpoint: http://localhost:8080/actuator
 * Prometheus: http://localhost:9090/graph
-* Grafana: http://localhost:3000/ (user/password)
+* Grafana: http://localhost:3000/ (admin/admin)
 * Navigate to http://localhost:3100/metrics to view the metrics and http://localhost:3100/ready for readiness.
diff --git a/boot-strategy-plugin/platform/grafana/provisioning/datasources/datasource.yml b/boot-strategy-plugin/platform/grafana/provisioning/datasources/datasource.yml
index 685a81883..7b343d620 100644
--- a/boot-strategy-plugin/platform/grafana/provisioning/datasources/datasource.yml
+++ b/boot-strategy-plugin/platform/grafana/provisioning/datasources/datasource.yml
@@ -52,8 +52,8 @@ datasources:
       editable: true
       apiVersion: 1
       jsonData:
-          derivedFields:
-              -   datasourceUid: tempo
-                  matcherRegex: \[.+,(.+?),
-                  name: TraceID
-                  url: $${__value.raw}
\ No newline at end of file
+        derivedFields:
+          - datasourceUid: tempo
+            matcherRegex: \[.+,(.+?),
+            name: TraceID
+            url: $${__value.raw}
\ No newline at end of file
diff --git a/boot-strategy-plugin/pom.xml b/boot-strategy-plugin/pom.xml
index d3f64a99a..8cba71d5d 100644
--- a/boot-strategy-plugin/pom.xml
+++ b/boot-strategy-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.6</version>
+        <version>4.0.0-M3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.strategy.plugin</groupId>
@@ -13,7 +13,7 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <java.version>21</java.version>
+        <java.version>25</java.version>
         <spring.plugin.version>3.0.0</spring.plugin.version>
         <springdoc-openapi.version>2.8.13</springdoc-openapi.version>
         <spotless.version>3.0.0</spotless.version>
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
 
         <!-- swagger-->
@@ -53,6 +53,11 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc-openapi.version}</version>
         </dependency>
+        <!-- to be removed when SB4 is supported -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+        </dependency>
 
         <!-- For Tracing -->
         <!-- OpenTelemetry version -->
@@ -61,6 +66,10 @@
             <artifactId>micrometer-tracing-bridge-otel</artifactId>
         </dependency>
         <!-- For Latency Visualization -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-opentelemetry</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-exporter-otlp</artifactId>
@@ -120,7 +129,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.27.0</version>
+                            <version>1.28.0</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                         <importOrder />
diff --git a/boot-strategy-plugin/src/test/java/com/example/plugin/strategyplugin/StrategyPluginApplicationTests.java b/boot-strategy-plugin/src/test/java/com/example/plugin/strategyplugin/StrategyPluginApplicationTests.java
index 09c3fcbf1..be6e36307 100644
--- a/boot-strategy-plugin/src/test/java/com/example/plugin/strategyplugin/StrategyPluginApplicationTests.java
+++ b/boot-strategy-plugin/src/test/java/com/example/plugin/strategyplugin/StrategyPluginApplicationTests.java
@@ -5,7 +5,6 @@
 
 import com.example.plugin.strategyplugin.common.AbstractIntegrationTest;
 import com.example.plugin.strategyplugin.domain.GenericDTO;
-import com.fasterxml.jackson.databind.JsonNode;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -14,6 +13,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ProblemDetail;
 import org.springframework.web.client.RestClient;
+import tools.jackson.databind.JsonNode;
 
 class StrategyPluginApplicationTests extends AbstractIntegrationTest {