diff --git a/pom.xml b/pom.xml
index 66d442d72..309b209b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,9 +62,9 @@
 
 		<sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
 
-		<spring-boot.version>3.1.3</spring-boot.version>
+		<spring-boot.version>3.1.4</spring-boot.version>
 
-		<hibernate.version>6.2.7.Final</hibernate.version>
+		<hibernate.version>6.3.1.Final</hibernate.version>
 		<hibernate-enhance-maven-plugin.version>6.2.7.Final</hibernate-enhance-maven-plugin.version>
 
 		<lombok.version>1.18.28</lombok.version>
diff --git a/samples/webmvc-jwt-default/src/test/java/com/c4_soft/springaddons/samples/webmvc_jwtauthenticationtoken/SampleApiIntegrationTest.java b/samples/webmvc-jwt-default/src/test/java/com/c4_soft/springaddons/samples/webmvc_jwtauthenticationtoken/SampleApiIntegrationTest.java
index b94fd4ea8..25ff0bb9e 100644
--- a/samples/webmvc-jwt-default/src/test/java/com/c4_soft/springaddons/samples/webmvc_jwtauthenticationtoken/SampleApiIntegrationTest.java
+++ b/samples/webmvc-jwt-default/src/test/java/com/c4_soft/springaddons/samples/webmvc_jwtauthenticationtoken/SampleApiIntegrationTest.java
@@ -9,6 +9,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.c4_soft.springaddons.security.oauth2.test.annotations.WithJwt;
@@ -29,13 +30,14 @@ class SampleApiIntegrationTest {
 	MockMvc api;
 
 	@Test
+	@WithAnonymousUser
 	void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
 		api.perform(get("/greet")).andExpect(status().isUnauthorized());
 	}
 
 	@Test
 	@WithJwt("ch4mp.json")
-	void givenUserIsCh4mpy_whenGetGreet_thenOk() throws Exception {
+	void givenUserIsCh4mp_whenGetGreet_thenOk() throws Exception {
 		api.perform(get("/greet")).andExpect(content().string("Hello ch4mp! You are granted with [USER_ROLES_EDITOR, ROLE_AUTHORIZED_PERSONNEL]."));
 	}
 
diff --git a/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webflux/AddonsWebfluxComponentTest.java b/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webflux/AddonsWebfluxComponentTest.java
index db77a2bf3..6b80cd74d 100644
--- a/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webflux/AddonsWebfluxComponentTest.java
+++ b/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webflux/AddonsWebfluxComponentTest.java
@@ -8,10 +8,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
 import com.c4_soft.springaddons.security.oauth2.test.webmvc.AutoConfigureAddonsWebmvcResourceServerSecurity;
-import com.c4_soft.springaddons.security.oidc.starter.reactive.client.ReactiveSpringAddonsOidcClientBeans;
-import com.c4_soft.springaddons.security.oidc.starter.reactive.resourceserver.ReactiveSpringAddonsOidcResourceServerBeans;
-import com.c4_soft.springaddons.security.oidc.starter.synchronised.client.SpringAddonsOidcClientBeans;
-import com.c4_soft.springaddons.security.oidc.starter.synchronised.resourceserver.SpringAddonsOidcResourceServerBeans;
 
 /**
  * To be used when testing secured components which are not controllers
@@ -22,12 +18,7 @@
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@EnableAutoConfiguration(
-		exclude = {
-				ReactiveSpringAddonsOidcResourceServerBeans.class,
-				ReactiveSpringAddonsOidcClientBeans.class,
-				SpringAddonsOidcResourceServerBeans.class,
-				SpringAddonsOidcClientBeans.class })
+@EnableAutoConfiguration()
 @AutoConfigureAddonsWebfluxMinimalSecurity
 public @interface AddonsWebfluxComponentTest {
 
diff --git a/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webmvc/AddonsWebmvcComponentTest.java b/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webmvc/AddonsWebmvcComponentTest.java
index 6b310ff43..d32fba43e 100644
--- a/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webmvc/AddonsWebmvcComponentTest.java
+++ b/spring-addons-starter-oidc-test/src/main/java/com/c4_soft/springaddons/security/oauth2/test/webmvc/AddonsWebmvcComponentTest.java
@@ -8,10 +8,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
 import com.c4_soft.springaddons.security.oauth2.test.webflux.AutoConfigureAddonsWebfluxClientSecurity;
-import com.c4_soft.springaddons.security.oidc.starter.reactive.client.ReactiveSpringAddonsOidcClientBeans;
-import com.c4_soft.springaddons.security.oidc.starter.reactive.resourceserver.ReactiveSpringAddonsOidcResourceServerBeans;
-import com.c4_soft.springaddons.security.oidc.starter.synchronised.client.SpringAddonsOidcClientBeans;
-import com.c4_soft.springaddons.security.oidc.starter.synchronised.resourceserver.SpringAddonsOidcResourceServerBeans;
 
 /**
  * To be used when testing secured components which are not controllers
@@ -22,12 +18,7 @@
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@EnableAutoConfiguration(
-		exclude = {
-				ReactiveSpringAddonsOidcResourceServerBeans.class,
-				ReactiveSpringAddonsOidcClientBeans.class,
-				SpringAddonsOidcResourceServerBeans.class,
-				SpringAddonsOidcClientBeans.class })
+@EnableAutoConfiguration()
 @AutoConfigureAddonsWebmvcMinimalSecurity
 public @interface AddonsWebmvcComponentTest {
 
diff --git a/spring-addons-starter-oidc-test/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-addons-starter-oidc-test/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index c6c8c0f67..000000000
--- a/spring-addons-starter-oidc-test/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-com.c4_soft.springaddons.security.oauth2.test.webmvc.AddonsWebmvcTestConf
-com.c4_soft.springaddons.security.oauth2.test.webflux.AddonsWebfluxTestConf
diff --git a/spring-addons-starter-oidc-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker b/spring-addons-starter-oidc-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
deleted file mode 100644
index ca6ee9cea..000000000
--- a/spring-addons-starter-oidc-test/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ /dev/null
@@ -1 +0,0 @@
-mock-maker-inline
\ No newline at end of file