diff --git a/pom.xml b/pom.xml
index 23a9cf9..dac93ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,12 +103,11 @@
         </jacoco.ut.execution.data.file>
         <logback.version>1.5.5</logback.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
-        <maven.surefire.version>2.18.1</maven.surefire.version>
-        <spring.version>7.0.3</spring.version>
+        <maven.surefire.version>3.5.4</maven.surefire.version>
+        <spring.version>7.0.5</spring.version>
         <mockito.version>3.12.4</mockito.version>
-        <springboot.version>4.0.2</springboot.version>
-        <springboot.aop>3.5.10</springboot.aop>
-        <spring.boot.autoconfigure>4.0.2</spring.boot.autoconfigure>
+        <springboot.version>4.0.3</springboot.version>
+        <spring.boot.autoconfigure>4.0.3</spring.boot.autoconfigure>
         <snakeyaml.version>2.0</snakeyaml.version>
         <sonar.coverage.exclusions>
             src/main/java/org/eclipse/ecsp/utils/logger/IgniteCallerDataConverter.java,
@@ -134,8 +133,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-            <version>${springboot.aop}</version>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
+            <version>${springboot.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -324,8 +323,8 @@
                     <argLine>-Xmx2G
                         ${surefireArgLine}
                     </argLine>
-                    <forkMode>pertest</forkMode>
-                    <childDelegation>true</childDelegation>
+                    <reuseForks>false</reuseForks>
+                    <forkCount>1</forkCount>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java b/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java
index ef2b30b..cc64137 100644
--- a/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java
+++ b/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java
@@ -41,6 +41,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -55,6 +56,7 @@
 @TestPropertySource(
         locations = {"classpath:property-diagnostic-test.properties", "classpath:property-diagnostic-test-2.properties"}
 )
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class PropertyDiagnosticReporterTest {
 
     @Autowired