diff --git a/pom.xml b/pom.xml
index eb47276cd..34bcdb5c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>com.c4-soft.springaddons</groupId>
 	<artifactId>spring-addons</artifactId>
-	<version>8.0.2</version>
+	<version>8.0.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-addons</name>
 	<description>Make Spring developpers' life easier when OAuth2 / OpenID is involved</description>
@@ -34,7 +34,7 @@
 		<connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
 		<developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
 		<url>https://github.com/ch4mpy/spring-addons</url>
-		<tag>spring-addons-8.0.2</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<distributionManagement>
diff --git a/samples/pom.xml b/samples/pom.xml
index 25471bf4b..f3af1eb9c 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons</groupId>
 		<artifactId>spring-addons</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>com.c4-soft.springaddons.samples</groupId>
diff --git a/samples/tutorials/pom.xml b/samples/tutorials/pom.xml
index 69d942df4..709cec0fd 100644
--- a/samples/tutorials/pom.xml
+++ b/samples/tutorials/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
diff --git a/samples/tutorials/reactive-client/pom.xml b/samples/tutorials/reactive-client/pom.xml
index 9ffd3d554..9490ceefb 100644
--- a/samples/tutorials/reactive-client/pom.xml
+++ b/samples/tutorials/reactive-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>reactive-client</artifactId>
diff --git a/samples/tutorials/reactive-resource-server/pom.xml b/samples/tutorials/reactive-resource-server/pom.xml
index 36b18ba01..f0c3da48b 100644
--- a/samples/tutorials/reactive-resource-server/pom.xml
+++ b/samples/tutorials/reactive-resource-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>reactive-resource-server</artifactId>
diff --git a/samples/tutorials/resource-server_multitenant_dynamic/pom.xml b/samples/tutorials/resource-server_multitenant_dynamic/pom.xml
index fc10a87b1..6080df2ba 100644
--- a/samples/tutorials/resource-server_multitenant_dynamic/pom.xml
+++ b/samples/tutorials/resource-server_multitenant_dynamic/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>resource-server_multitenant_dynamic</artifactId>
diff --git a/samples/tutorials/resource-server_with_additional-header/pom.xml b/samples/tutorials/resource-server_with_additional-header/pom.xml
index bc86bb62c..ffee494d4 100644
--- a/samples/tutorials/resource-server_with_additional-header/pom.xml
+++ b/samples/tutorials/resource-server_with_additional-header/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>resource-server_with_additional-header</artifactId>
diff --git a/samples/tutorials/resource-server_with_introspection/pom.xml b/samples/tutorials/resource-server_with_introspection/pom.xml
index 02e2b2161..0ccd619ea 100644
--- a/samples/tutorials/resource-server_with_introspection/pom.xml
+++ b/samples/tutorials/resource-server_with_introspection/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>resource-server_with_introspection</artifactId>
diff --git a/samples/tutorials/resource-server_with_oauthentication/pom.xml b/samples/tutorials/resource-server_with_oauthentication/pom.xml
index 302fabe49..68fc8660a 100644
--- a/samples/tutorials/resource-server_with_oauthentication/pom.xml
+++ b/samples/tutorials/resource-server_with_oauthentication/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>resource-server_with_oauthentication</artifactId>
diff --git a/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml b/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml
index e55188607..b97eeab48 100644
--- a/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml
+++ b/samples/tutorials/resource-server_with_specialized_oauthentication/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>resource-server_with_specialized_oauthentication</artifactId>
diff --git a/samples/tutorials/resource-server_with_ui/pom.xml b/samples/tutorials/resource-server_with_ui/pom.xml
index f06bfdf8e..e69bed913 100644
--- a/samples/tutorials/resource-server_with_ui/pom.xml
+++ b/samples/tutorials/resource-server_with_ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>resource-server_with_ui</artifactId>
diff --git a/samples/tutorials/servlet-client/pom.xml b/samples/tutorials/servlet-client/pom.xml
index 4f16a14db..2acd48ef1 100644
--- a/samples/tutorials/servlet-client/pom.xml
+++ b/samples/tutorials/servlet-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>servlet-client</artifactId>
diff --git a/samples/tutorials/servlet-resource-server/pom.xml b/samples/tutorials/servlet-resource-server/pom.xml
index c24058a87..d1350dbe1 100644
--- a/samples/tutorials/servlet-resource-server/pom.xml
+++ b/samples/tutorials/servlet-resource-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples.tutorials</groupId>
 		<artifactId>tutorials</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>servlet-resource-server</artifactId>
diff --git a/samples/webflux-introspecting-default/pom.xml b/samples/webflux-introspecting-default/pom.xml
index 52b56dd1f..26e32a685 100644
--- a/samples/webflux-introspecting-default/pom.xml
+++ b/samples/webflux-introspecting-default/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webflux-introspecting-oauthentication/pom.xml b/samples/webflux-introspecting-oauthentication/pom.xml
index e825fe141..a66262464 100644
--- a/samples/webflux-introspecting-oauthentication/pom.xml
+++ b/samples/webflux-introspecting-oauthentication/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webflux-jwt-default/pom.xml b/samples/webflux-jwt-default/pom.xml
index 2248dc3d4..bd0b3f650 100644
--- a/samples/webflux-jwt-default/pom.xml
+++ b/samples/webflux-jwt-default/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webflux-jwt-oauthentication/pom.xml b/samples/webflux-jwt-oauthentication/pom.xml
index 9a557b9c3..5973dc929 100644
--- a/samples/webflux-jwt-oauthentication/pom.xml
+++ b/samples/webflux-jwt-oauthentication/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-introspecting-default/pom.xml b/samples/webmvc-introspecting-default/pom.xml
index 40874a5f7..a9b4cf6d5 100644
--- a/samples/webmvc-introspecting-default/pom.xml
+++ b/samples/webmvc-introspecting-default/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-introspecting-oauthentication/pom.xml b/samples/webmvc-introspecting-oauthentication/pom.xml
index 1af72d000..f9908661a 100644
--- a/samples/webmvc-introspecting-oauthentication/pom.xml
+++ b/samples/webmvc-introspecting-oauthentication/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-jwt-default-jpa-authorities/pom.xml b/samples/webmvc-jwt-default-jpa-authorities/pom.xml
index 9b7d33d53..baadfec6f 100644
--- a/samples/webmvc-jwt-default-jpa-authorities/pom.xml
+++ b/samples/webmvc-jwt-default-jpa-authorities/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-jwt-default/pom.xml b/samples/webmvc-jwt-default/pom.xml
index 75bc77233..14c50ab23 100644
--- a/samples/webmvc-jwt-default/pom.xml
+++ b/samples/webmvc-jwt-default/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-jwt-oauthentication/pom.xml b/samples/webmvc-jwt-oauthentication/pom.xml
index b16b46aff..4ec9f77e4 100644
--- a/samples/webmvc-jwt-oauthentication/pom.xml
+++ b/samples/webmvc-jwt-oauthentication/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons.samples</groupId>
 		<artifactId>spring-addons-samples</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-addons-oauth2-test/pom.xml b/spring-addons-oauth2-test/pom.xml
index 6b084e67b..625d4862f 100644
--- a/spring-addons-oauth2-test/pom.xml
+++ b/spring-addons-oauth2-test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons</groupId>
 		<artifactId>spring-addons</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-addons-oauth2-test</artifactId>
@@ -15,7 +15,7 @@
 		<connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
 		<developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
 		<url>https://github.com/ch4mpy/spring-addons</url>
-		<tag>spring-addons-8.0.2</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<dependencies>
diff --git a/spring-addons-oauth2/pom.xml b/spring-addons-oauth2/pom.xml
index 59020d598..9ee5d2a9b 100644
--- a/spring-addons-oauth2/pom.xml
+++ b/spring-addons-oauth2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.c4-soft.springaddons</groupId>
         <artifactId>spring-addons</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>spring-addons-oauth2</artifactId>
@@ -14,7 +14,7 @@
         <connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
         <developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
         <url>https://github.com/ch4mpy/spring-addons</url>
-        <tag>spring-addons-8.0.2</tag>
+        <tag>spring-addons-7.8.8</tag>
     </scm>
 
     <dependencies>
diff --git a/spring-addons-starter-oidc-test/pom.xml b/spring-addons-starter-oidc-test/pom.xml
index 8f8736697..670a7cdf0 100644
--- a/spring-addons-starter-oidc-test/pom.xml
+++ b/spring-addons-starter-oidc-test/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons</groupId>
 		<artifactId>spring-addons</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-addons-starter-oidc-test</artifactId>
@@ -13,7 +13,7 @@
 		<connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
 		<developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
 		<url>https://github.com/ch4mpy/spring-addons</url>
-		<tag>spring-addons-8.0.2</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<dependencies>
diff --git a/spring-addons-starter-oidc/pom.xml b/spring-addons-starter-oidc/pom.xml
index 617028d87..7c43604f7 100644
--- a/spring-addons-starter-oidc/pom.xml
+++ b/spring-addons-starter-oidc/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons</groupId>
 		<artifactId>spring-addons</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-addons-starter-oidc</artifactId>
@@ -13,7 +13,7 @@
 		<connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
 		<developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
 		<url>https://github.com/ch4mpy/spring-addons</url>
-		<tag>spring-addons-8.0.2</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<dependencies>
diff --git a/spring-addons-starter-openapi/pom.xml b/spring-addons-starter-openapi/pom.xml
index cf4d24db0..bc04ffe8d 100644
--- a/spring-addons-starter-openapi/pom.xml
+++ b/spring-addons-starter-openapi/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons</groupId>
 		<artifactId>spring-addons</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-addons-starter-openapi</artifactId>
@@ -13,7 +13,7 @@
 		<connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
 		<developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
 		<url>https://github.com/ch4mpy/spring-addons</url>
-		<tag>spring-addons-8.0.2</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<dependencies>
diff --git a/spring-addons-starter-recaptcha/pom.xml b/spring-addons-starter-recaptcha/pom.xml
index 8f93173d6..a2c583105 100644
--- a/spring-addons-starter-recaptcha/pom.xml
+++ b/spring-addons-starter-recaptcha/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.c4-soft.springaddons</groupId>
         <artifactId>spring-addons</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>spring-addons-starter-recaptcha</artifactId>
@@ -15,7 +15,7 @@
         <connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
         <developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
         <url>https://github.com/ch4mpy/spring-addons</url>
-        <tag>spring-addons-8.0.2</tag>
+        <tag>spring-addons-7.8.8</tag>
     </scm>
 
     <dependencies>
diff --git a/spring-addons-starter-rest/pom.xml b/spring-addons-starter-rest/pom.xml
index 4ff7a1022..59aa0362e 100644
--- a/spring-addons-starter-rest/pom.xml
+++ b/spring-addons-starter-rest/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.c4-soft.springaddons</groupId>
 		<artifactId>spring-addons</artifactId>
-		<version>8.0.2</version>
+		<version>8.0.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-addons-starter-rest</artifactId>
@@ -15,7 +15,7 @@
 		<connection>scm:git:git://github.com/ch4mpy/spring-addons.git</connection>
 		<developerConnection>scm:git:git@github.com:ch4mpy/spring-addons.git</developerConnection>
 		<url>https://github.com/ch4mpy/spring-addons</url>
-		<tag>spring-addons-8.0.2</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<dependencies>