diff --git a/archetypes/buildNumber.properties b/archetypes/buildNumber.properties
index 572c192..3ad75c7 100644
--- a/archetypes/buildNumber.properties
+++ b/archetypes/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:55 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/archetypes/josso2-idvault-archetype/buildNumber.properties b/archetypes/josso2-idvault-archetype/buildNumber.properties
index db80a69..68ba27a 100644
--- a/archetypes/josso2-idvault-archetype/buildNumber.properties
+++ b/archetypes/josso2-idvault-archetype/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:56 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/archetypes/josso2-idvault-archetype/pom.xml b/archetypes/josso2-idvault-archetype/pom.xml
index eae57c3..64c0ca3 100644
--- a/archetypes/josso2-idvault-archetype/pom.xml
+++ b/archetypes/josso2-idvault-archetype/pom.xml
@@ -5,12 +5,12 @@
    <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
   <groupId>org.atricore.josso.archetypes</groupId>
   <artifactId>josso2-idvault-archetype</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
     <name>JOSSO 2 :: Archetypes : Identity Vault</name>
diff --git a/archetypes/josso2-idvault-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/josso2-idvault-archetype/src/main/resources/archetype-resources/pom.xml
index c4a83f1..0a2de64 100644
--- a/archetypes/josso2-idvault-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/josso2-idvault-archetype/src/main/resources/archetype-resources/pom.xml
@@ -11,7 +11,7 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <atricore.idbus.vesion>1.6.0-SNAPSHOT</atricore.idbus.vesion>
+        <atricore.idbus.vesion>1.6.1-SNAPSHOT</atricore.idbus.vesion>
         <felix.plugin.version>2.1.0</felix.plugin.version>
         <felix.osgi.version>1.4.0</felix.osgi.version>
         <slf4j-log4j12.version>1.5.8</slf4j-log4j12.version>
diff --git a/archetypes/josso2-ui-archetype/buildNumber.properties b/archetypes/josso2-ui-archetype/buildNumber.properties
index 572c192..3ad75c7 100644
--- a/archetypes/josso2-ui-archetype/buildNumber.properties
+++ b/archetypes/josso2-ui-archetype/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:55 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/archetypes/josso2-ui-archetype/pom.xml b/archetypes/josso2-ui-archetype/pom.xml
index 7c4ef55..941ace4 100644
--- a/archetypes/josso2-ui-archetype/pom.xml
+++ b/archetypes/josso2-ui-archetype/pom.xml
@@ -5,12 +5,12 @@
    <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
   <groupId>org.atricore.josso.archetypes</groupId>
   <artifactId>josso2-ui-archetype</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
     <name>JOSSO 2 :: Archetypes : UI Branding</name>
diff --git a/archetypes/josso2-ui-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/josso2-ui-archetype/src/main/resources/archetype-resources/pom.xml
index 704ac25..056086a 100644
--- a/archetypes/josso2-ui-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/josso2-ui-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
         <felix.plugin.version>2.1.0</felix.plugin.version>
         <apache-wicket.version>6.7.0</apache-wicket.version>
         <ops4j.paxwicket.version>2.1.1</ops4j.paxwicket.version>
-        <atricore.idbus.vesion>1.6.0-SNAPSHOT</atricore.idbus.vesion>
+        <atricore.idbus.vesion>1.6.1-SNAPSHOT</atricore.idbus.vesion>
     </properties>
 
     <dependencies>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 0c32f92..49c8b7a 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -28,12 +28,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>archetypes</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 :: Archetypes</name>
 
     <modules>
diff --git a/brandings/buildNumber.properties b/brandings/buildNumber.properties
index db80a69..68ba27a 100644
--- a/brandings/buildNumber.properties
+++ b/brandings/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:56 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/brandings/iam-tf-branding/buildNumber.properties b/brandings/iam-tf-branding/buildNumber.properties
index 1eda026..a6779d1 100644
--- a/brandings/iam-tf-branding/buildNumber.properties
+++ b/brandings/iam-tf-branding/buildNumber.properties
@@ -1,3 +1,3 @@
 >#maven.buildNumber.plugin properties file
 #Fri Jul 01 11:17:57 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/brandings/iam-tf-branding/pom.xml b/brandings/iam-tf-branding/pom.xml
index 76ebce0..ce79ce8 100644
--- a/brandings/iam-tf-branding/pom.xml
+++ b/brandings/iam-tf-branding/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>brandings</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.atricore.iamtf.branding</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>IAM.tf :: Server branding</name>
 
     <dependencies>
diff --git a/brandings/josso-ce-branding/buildNumber.properties b/brandings/josso-ce-branding/buildNumber.properties
index db80a69..68ba27a 100644
--- a/brandings/josso-ce-branding/buildNumber.properties
+++ b/brandings/josso-ce-branding/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:56 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/brandings/josso-ce-branding/pom.xml b/brandings/josso-ce-branding/pom.xml
index 454d81c..fe1c042 100644
--- a/brandings/josso-ce-branding/pom.xml
+++ b/brandings/josso-ce-branding/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>brandings</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.atricore.josso.branding</artifactId>
     <packaging>bundle</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: Server branding</name>
 
     <dependencies>
diff --git a/brandings/pom.xml b/brandings/pom.xml
index 6554124..623123f 100644
--- a/brandings/pom.xml
+++ b/brandings/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>brandings</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: Branding</name>
 
     <modules>
diff --git a/buildNumber.properties b/buildNumber.properties
index 7ca2082..7bf5ebd 100644
--- a/buildNumber.properties
+++ b/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:54 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/buildNumber.properties b/distributions/buildNumber.properties
index 32717cd..c8ebd3a 100644
--- a/distributions/buildNumber.properties
+++ b/distributions/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:59 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/iam-tf-cloud/buildNumber.properties b/distributions/iam-tf-cloud/buildNumber.properties
index 60d7200..f91af67 100644
--- a/distributions/iam-tf-cloud/buildNumber.properties
+++ b/distributions/iam-tf-cloud/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:14:05 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/iam-tf-cloud/pom.xml b/distributions/iam-tf-cloud/pom.xml
index 4ddbf4f..7e35620 100644
--- a/distributions/iam-tf-cloud/pom.xml
+++ b/distributions/iam-tf-cloud/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>iam-tf-cloud</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>IAM.tf :: Distribution : Cloud</name>
 
     <build>
diff --git a/distributions/iam-tf/buildNumber.properties b/distributions/iam-tf/buildNumber.properties
index 935030e..4eb0e6e 100644
--- a/distributions/iam-tf/buildNumber.properties
+++ b/distributions/iam-tf/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Fri Jul 01 11:15:16 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/iam-tf/pom.xml b/distributions/iam-tf/pom.xml
index 1027ab0..9bf6bc8 100644
--- a/distributions/iam-tf/pom.xml
+++ b/distributions/iam-tf/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>iam-tf</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>IAM.tf :: Distribution : Standalone </name>
     <properties>
         <staging.dir>${project.build.directory}/staging</staging.dir>
diff --git a/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh b/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh
index bbb35cd..2a52dab 100755
--- a/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh
+++ b/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh
@@ -2,7 +2,7 @@
 
 PROGNAME=`basename $0`
 
-JOSSO2_VERSION=3.0.0-SNAPSHOT
+JOSSO2_VERSION=3.1.0-SNAPSHOT
 JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 warn() {
diff --git a/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-ui-project.sh b/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-ui-project.sh
index 2722ea6..912cb9b 100755
--- a/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-ui-project.sh
+++ b/distributions/iam-tf/src/main/distribution/unix-text/bin/tools/create-ui-project.sh
@@ -2,7 +2,7 @@
 
 PROGNAME=`basename $0`
 
-JOSSO2_VERSION=3.0.0-SNAPSHOT
+JOSSO2_VERSION=3.1.0-SNAPSHOT
 JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 warn() {
diff --git a/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat b/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat
index fa4eaeb..c760c7f 100644
--- a/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat
+++ b/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat
@@ -9,7 +9,7 @@ setlocal
 set DIRNAME=%~dp0%
 set PROGNAME=%~nx0%
 set ARGS=%*
-set JOSSO2_VERSION=3.0.0-SNAPSHOT
+set JOSSO2_VERSION=3.1.0-SNAPSHOT
 set JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 goto :BEGIN
diff --git a/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-ui-project.bat b/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-ui-project.bat
index 3b840eb..ffc6e11 100644
--- a/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-ui-project.bat
+++ b/distributions/iam-tf/src/main/distribution/windows-text/bin/tools/create-ui-project.bat
@@ -9,7 +9,7 @@ setlocal
 set DIRNAME=%~dp0%
 set PROGNAME=%~nx0%
 set ARGS=%*
-set JOSSO2_VERSION=3.0.0-SNAPSHOT
+set JOSSO2_VERSION=3.1.0-SNAPSHOT
 set JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 goto :BEGIN
diff --git a/distributions/josso-ce-cloud/buildNumber.properties b/distributions/josso-ce-cloud/buildNumber.properties
index 60d7200..f91af67 100644
--- a/distributions/josso-ce-cloud/buildNumber.properties
+++ b/distributions/josso-ce-cloud/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:14:05 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/josso-ce-cloud/pom.xml b/distributions/josso-ce-cloud/pom.xml
index 488cea7..fd7dc97 100644
--- a/distributions/josso-ce-cloud/pom.xml
+++ b/distributions/josso-ce-cloud/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>josso-ce-cloud</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: Distribution : Cloud</name>
 
     <build>
diff --git a/distributions/josso-ce-repo/buildNumber.properties b/distributions/josso-ce-repo/buildNumber.properties
index 32717cd..c8ebd3a 100644
--- a/distributions/josso-ce-repo/buildNumber.properties
+++ b/distributions/josso-ce-repo/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:59 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/josso-ce-repo/pom.xml b/distributions/josso-ce-repo/pom.xml
index 92629dd..d6d6922 100644
--- a/distributions/josso-ce-repo/pom.xml
+++ b/distributions/josso-ce-repo/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>josso-ce-repo</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: Distribution : M2 Repository artifacts</name>
 
     <build>
diff --git a/distributions/josso-ce/buildNumber.properties b/distributions/josso-ce/buildNumber.properties
index e726370..6504f8f 100644
--- a/distributions/josso-ce/buildNumber.properties
+++ b/distributions/josso-ce/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:10:38 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/distributions/josso-ce/pom.xml b/distributions/josso-ce/pom.xml
index 5fed6b1..3d49c06 100644
--- a/distributions/josso-ce/pom.xml
+++ b/distributions/josso-ce/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>josso-ce</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: Distribution : Standalone </name>
     <properties>
         <staging.dir>${project.build.directory}/staging</staging.dir>
diff --git a/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh b/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh
index bbb35cd..2a52dab 100755
--- a/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh
+++ b/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-idvault-project.sh
@@ -2,7 +2,7 @@
 
 PROGNAME=`basename $0`
 
-JOSSO2_VERSION=3.0.0-SNAPSHOT
+JOSSO2_VERSION=3.1.0-SNAPSHOT
 JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 warn() {
diff --git a/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-ui-project.sh b/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-ui-project.sh
index 2722ea6..912cb9b 100755
--- a/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-ui-project.sh
+++ b/distributions/josso-ce/src/main/distribution/unix-text/bin/tools/create-ui-project.sh
@@ -2,7 +2,7 @@
 
 PROGNAME=`basename $0`
 
-JOSSO2_VERSION=3.0.0-SNAPSHOT
+JOSSO2_VERSION=3.1.0-SNAPSHOT
 JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 warn() {
diff --git a/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat b/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat
index fa4eaeb..c760c7f 100644
--- a/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat
+++ b/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-idvault-project.bat
@@ -9,7 +9,7 @@ setlocal
 set DIRNAME=%~dp0%
 set PROGNAME=%~nx0%
 set ARGS=%*
-set JOSSO2_VERSION=3.0.0-SNAPSHOT
+set JOSSO2_VERSION=3.1.0-SNAPSHOT
 set JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 goto :BEGIN
diff --git a/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-ui-project.bat b/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-ui-project.bat
index 3b840eb..ffc6e11 100644
--- a/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-ui-project.bat
+++ b/distributions/josso-ce/src/main/distribution/windows-text/bin/tools/create-ui-project.bat
@@ -9,7 +9,7 @@ setlocal
 set DIRNAME=%~dp0%
 set PROGNAME=%~nx0%
 set ARGS=%*
-set JOSSO2_VERSION=3.0.0-SNAPSHOT
+set JOSSO2_VERSION=3.1.0-SNAPSHOT
 set JOSSO2_REPO=http://repository.josso.org/m2-release-repository,http://repository.josso.org/m2-snapshot-repository
 
 goto :BEGIN
diff --git a/distributions/pom.xml b/distributions/pom.xml
index 91a1467..0743244 100644
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distributions</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: Distributions</name>
 
     <modules>
diff --git a/pom.xml b/pom.xml
index d24bfd7..69d9e95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>josso-ce-all</artifactId>
     <packaging>pom</packaging>
 
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>JOSSO 2 CE :: All POM</name>
     <inceptionYear>2009</inceptionYear>
 
@@ -39,9 +39,9 @@
 
     <properties>
 
-        <josso.family.version>3.0</josso.family.version>
-        <josso2dist.version>3.0.0</josso2dist.version>
-        <iamtfdist.version>1.0.0</iamtfdist.version>
+        <josso.family.version>3.1</josso.family.version>
+        <josso2dist.version>3.1.0</josso2dist.version>
+        <iamtfdist.version>1.1.0</iamtfdist.version>
 
 
         <derby.version>10.5.3.0_1</derby.version>
@@ -53,12 +53,12 @@
         <commons-logging.version>1.1.1</commons-logging.version>
 
         <!-- Atricore -->
-        <atricore.idbus.version>1.6.0-SNAPSHOT</atricore.idbus.version>
-        <atricore.console.version>1.5.0-SNAPSHOT</atricore.console.version>
+        <atricore.idbus.version>1.6.1-SNAPSHOT</atricore.idbus.version>
+        <atricore.console.version>1.5.1-SNAPSHOT</atricore.console.version>
 
         <josso1.version>1.8.14-SNAPSHOT</josso1.version>
-        <josso2.version>3.0.0-SNAPSHOT</josso2.version>
-        <iamtf.version>1.0.0-SNAPSHOT</iamtf.version>
+        <josso2.version>3.1.0-SNAPSHOT</josso2.version>
+        <iamtf.version>1.1.0-SNAPSHOT</iamtf.version>
 
         <bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
         <compiler.fork>true</compiler.fork>
diff --git a/samples/sample-branding/buildNumber.properties b/samples/sample-branding/buildNumber.properties
index 77b51fb..3b6e289 100644
--- a/samples/sample-branding/buildNumber.properties
+++ b/samples/sample-branding/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:14:38 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/samples/sample-branding/pom.xml b/samples/sample-branding/pom.xml
index 7509028..3a3b653 100644
--- a/samples/sample-branding/pom.xml
+++ b/samples/sample-branding/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/services/josso-services/buildNumber.properties b/services/josso-services/buildNumber.properties
index 32717cd..c8ebd3a 100644
--- a/services/josso-services/buildNumber.properties
+++ b/services/josso-services/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:59 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/services/josso-services/pom.xml b/services/josso-services/pom.xml
index 847021b..1c25d31 100644
--- a/services/josso-services/pom.xml
+++ b/services/josso-services/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/tooling/buildNumber.properties b/tooling/buildNumber.properties
index 064e818..2399e1c 100644
--- a/tooling/buildNumber.properties
+++ b/tooling/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:57 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/tooling/josso-izpack/buildNumber.properties b/tooling/josso-izpack/buildNumber.properties
index 46bc67a..54e9ca8 100644
--- a/tooling/josso-izpack/buildNumber.properties
+++ b/tooling/josso-izpack/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:58 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/tooling/josso-izpack/pom.xml b/tooling/josso-izpack/pom.xml
index bc3e892..695f2a6 100644
--- a/tooling/josso-izpack/pom.xml
+++ b/tooling/josso-izpack/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/tooling/josso-wrapper/buildNumber.properties b/tooling/josso-wrapper/buildNumber.properties
index 064e818..2399e1c 100644
--- a/tooling/josso-wrapper/buildNumber.properties
+++ b/tooling/josso-wrapper/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
 #Thu Jun 30 10:09:57 EDT 2022
-buildNumber=8
+buildNumber=1
diff --git a/tooling/josso-wrapper/pom.xml b/tooling/josso-wrapper/pom.xml
index 7585648..0601852 100644
--- a/tooling/josso-wrapper/pom.xml
+++ b/tooling/josso-wrapper/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>org.atricore.josso.tooling</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.atricore.josso.tooling.wrapper</artifactId>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 8f4f728..a1eb429 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.atricore.josso</groupId>
         <artifactId>josso-ce-all</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.atricore.josso</groupId>