diff --git a/pom.xml b/pom.xml
index 4288c8cab..e8f0f15c0 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.0-RC1</version>
+	<version>8.0.0-RC2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-addons</name>
 	<description>Set of tools I find useful to work with Spring (mostly
@@ -35,7 +35,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.0-RC1</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<distributionManagement>
diff --git a/samples/pom.xml b/samples/pom.xml
index 48a786af5..59d692417 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.0-RC1</version>
+		<version>8.0.0-RC2-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 12aa10a65..445b27c9a 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.0-RC1</version>
+		<version>8.0.0-RC2-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 770eea309..363c3409c 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.0-RC1</version>
+		<version>8.0.0-RC2-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 8044e7840..66e7462ff 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.0-RC1</version>
+		<version>8.0.0-RC2-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 aab64d4e7..878b4e45d 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.0-RC1</version>
+		<version>8.0.0-RC2-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 e2a458fc7..ed3f4ea41 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.0-RC1</version>
+		<version>8.0.0-RC2-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 587b1878a..2d2bd41cc 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.0-RC1</version>
+		<version>8.0.0-RC2-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 f02096842..02e44d946 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.0-RC1</version>
+		<version>8.0.0-RC2-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 7c3b67ef3..a70a32f8d 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.0-RC1</version>
+		<version>8.0.0-RC2-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 913660efe..98911d2d4 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.0-RC1</version>
+		<version>8.0.0-RC2-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 d1d30d659..d829b6ecb 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.0-RC1</version>
+		<version>8.0.0-RC2-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 ebab46969..0cc25863e 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.0-RC1</version>
+		<version>8.0.0-RC2-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 88d12239c..735342064 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webflux-introspecting-oauthentication/pom.xml b/samples/webflux-introspecting-oauthentication/pom.xml
index 8b0199670..f5849e764 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webflux-jwt-default/pom.xml b/samples/webflux-jwt-default/pom.xml
index 6346270c4..1aff4ddb7 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webflux-jwt-oauthentication/pom.xml b/samples/webflux-jwt-oauthentication/pom.xml
index 2cd7d535f..2796a2584 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-introspecting-default/pom.xml b/samples/webmvc-introspecting-default/pom.xml
index c05850b6f..2dc6611f4 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-introspecting-oauthentication/pom.xml b/samples/webmvc-introspecting-oauthentication/pom.xml
index 51d356366..a2d147cc9 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.0-RC1</version>
+		<version>8.0.0-RC2-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 489a50266..07cfb1d01 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-jwt-default/pom.xml b/samples/webmvc-jwt-default/pom.xml
index 03f94a11e..86d051702 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/samples/webmvc-jwt-oauthentication/pom.xml b/samples/webmvc-jwt-oauthentication/pom.xml
index 3d9bade03..2f4258c65 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.0-RC1</version>
+		<version>8.0.0-RC2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-addons-oauth2-test/pom.xml b/spring-addons-oauth2-test/pom.xml
index cbf7fa2df..695b33d06 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.0-RC1</version>
+		<version>8.0.0-RC2-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.0-RC1</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 f4f6a62b6..35e2755b4 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.0-RC1</version>
+        <version>8.0.0-RC2-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.0-RC1</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 cb94f7661..45bda8494 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.0-RC1</version>
+		<version>8.0.0-RC2-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.0-RC1</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 5ae9f1973..fb4c002d8 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.0-RC1</version>
+		<version>8.0.0-RC2-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.0-RC1</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 951091a1b..be3d72015 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.0-RC1</version>
+		<version>8.0.0-RC2-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.0-RC1</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 46e96e152..6eab2e9c9 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.0-RC1</version>
+        <version>8.0.0-RC2-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.0-RC1</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 236294f79..75608cd88 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.0-RC1</version>
+		<version>8.0.0-RC2-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.0-RC1</tag>
+		<tag>spring-addons-7.8.8</tag>
 	</scm>
 
 	<dependencies>