diff --git a/pom.xml b/pom.xml
index bcf7f455752f8f39933c1a42bcb3e33a6abddd09..48e943e8eae0ef2f2c97cb0ac196099bfc1e8dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <groupId>ch.unige.solidify</groupId>
     <artifactId>solidify-parent</artifactId>
     <name>Solidify Parent</name>
-    <version>2.5.7</version>
+    <version>2.5.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>Solidify Parent project. Manage dependencies and version for Solidify framework</description>
     <inceptionYear>2017</inceptionYear>
@@ -51,7 +51,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!--Solidify properties -->
-        <solidify.version>2.5.7</solidify.version>
+        <solidify.version>2.5.8-SNAPSHOT</solidify.version>
         <solidify.license>gpl_v2</solidify.license>
         <!--Libraries properties -->
         <spring-cloud-config-client.version>3.1.0</spring-cloud-config-client.version>
@@ -427,7 +427,7 @@
 
     <scm>
         <connection>scm:git:git@gitlab.unige.ch:solidify/solidify-backend.git</connection>
-        <tag>solidify-2.5.7</tag>
+        <tag>2.5-maintenance</tag>
         <url>https://gitlab.unige.ch/solidify/solidify-backend</url>
     </scm>
 
diff --git a/solidify-authorization-model/pom.xml b/solidify-authorization-model/pom.xml
index de96fec47fe457f57e87f744a859ae1fcb252e95..231a1643f0bb638e8e9796715d197cb92fed8c13 100644
--- a/solidify-authorization-model/pom.xml
+++ b/solidify-authorization-model/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-authorization-model</artifactId>
diff --git a/solidify-bagit/pom.xml b/solidify-bagit/pom.xml
index 7b5029942cf84df50d98aff62cb3ca629fa4738a..8d9673e3421640fb40236239a1533f5f07706f40 100644
--- a/solidify-bagit/pom.xml
+++ b/solidify-bagit/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-bagit</artifactId>
diff --git a/solidify-citation-model/pom.xml b/solidify-citation-model/pom.xml
index 54caba65c2e36285410de797dff2e96cd7ba3a3e..cc51b7ec453eef2bca4ae3691f66120c578dadec 100644
--- a/solidify-citation-model/pom.xml
+++ b/solidify-citation-model/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>solidify-parent</artifactId>
         <groupId>ch.unige.solidify</groupId>
-        <version>2.5.7</version>
+        <version>2.5.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/solidify-citation/pom.xml b/solidify-citation/pom.xml
index 37191d7c68484e2c41f864cf1c61c1a77ab26294..315f641870793832f119bbf9d86e8a7571584e3e 100644
--- a/solidify-citation/pom.xml
+++ b/solidify-citation/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>ch.unige.solidify</groupId>
         <artifactId>solidify-parent</artifactId>
-        <version>2.5.7</version>
+        <version>2.5.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/solidify-client/pom.xml b/solidify-client/pom.xml
index 2967dc2141d54e95e8e6337c42bf882978783f00..ec678a841be021ffdda23d21af1deaad8b351c71 100644
--- a/solidify-client/pom.xml
+++ b/solidify-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>solidify-parent</artifactId>
         <groupId>ch.unige.solidify</groupId>
-        <version>2.5.7</version>
+        <version>2.5.8-SNAPSHOT</version>
     </parent>
 
 
diff --git a/solidify-controller/pom.xml b/solidify-controller/pom.xml
index 7215b847c4e4d169bf951b3def95048fe0fdac7d..3cc96b5d4edd48b57faa969ffc9766c3fdb5a419 100644
--- a/solidify-controller/pom.xml
+++ b/solidify-controller/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-controller</artifactId>
diff --git a/solidify-datacite-model/pom.xml b/solidify-datacite-model/pom.xml
index 6ed55027a4f04fd2e9928db61e0fef3568701acd..dacd1ce5ed47e8ce9c926ebc895234066cb4ff0d 100644
--- a/solidify-datacite-model/pom.xml
+++ b/solidify-datacite-model/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-datacite-model</artifactId>
diff --git a/solidify-doc/pom.xml b/solidify-doc/pom.xml
index 0705f61d035a9970602b6aaa43f2aedcce950574..be832a73f79e9cb3604839bb5e5d77a520091ffd 100644
--- a/solidify-doc/pom.xml
+++ b/solidify-doc/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-doc</artifactId>
diff --git a/solidify-email/pom.xml b/solidify-email/pom.xml
index ba991e7a1cbc269e4c1d23ac40dfa9ecc5b8bb08..297d6da1576b405122176320cad70b61edab9cbb 100644
--- a/solidify-email/pom.xml
+++ b/solidify-email/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-email</artifactId>
diff --git a/solidify-html-model/pom.xml b/solidify-html-model/pom.xml
index 34d92e52424a0278e69e5e480fa3195364ead786..c94c6a2169fd611dfc880c4c7dfeef356c847dd9 100644
--- a/solidify-html-model/pom.xml
+++ b/solidify-html-model/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
         <groupId>ch.unige.solidify</groupId>
         <artifactId>solidify-parent</artifactId>
-        <version>2.5.7</version>
+        <version>2.5.8-SNAPSHOT</version>
     </parent>
 
 	<artifactId>solidify-html-model</artifactId>
diff --git a/solidify-index-controller/pom.xml b/solidify-index-controller/pom.xml
index 171862aa05f2c5b7fcca74a224979bdbc1f685ab..d2fb7845aafea1909bd1b98591b6dae1b1d2fe11 100644
--- a/solidify-index-controller/pom.xml
+++ b/solidify-index-controller/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-index-controller</artifactId>
diff --git a/solidify-index-model/pom.xml b/solidify-index-model/pom.xml
index 05e17dcbe0e45b7addefc6f3fb6b8194d16b8bec..6ead00124cf6d4687527f9a75c66641dd7cc2164 100644
--- a/solidify-index-model/pom.xml
+++ b/solidify-index-model/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-index-model</artifactId>
diff --git a/solidify-index/pom.xml b/solidify-index/pom.xml
index 5c4efdc05edc66a46153352991e2d60df927833e..0923a795fab55927d466c2dd5fe275c0631ca849 100644
--- a/solidify-index/pom.xml
+++ b/solidify-index/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-index</artifactId>
diff --git a/solidify-model/pom.xml b/solidify-model/pom.xml
index 06c8d550004f2860e6e2a523338b5c4a91f1a404..fdfc85947235d9177ca9c93f0c811417470d4de5 100644
--- a/solidify-model/pom.xml
+++ b/solidify-model/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-model</artifactId>
diff --git a/solidify-oai-model/pom.xml b/solidify-oai-model/pom.xml
index 394648e4017e9e333f1469a6960d7dbba5fc12f6..0adb71f01d8597190484f784050ed860b3bd5a2f 100644
--- a/solidify-oai-model/pom.xml
+++ b/solidify-oai-model/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-oai-model</artifactId>
diff --git a/solidify-oai-pmh/pom.xml b/solidify-oai-pmh/pom.xml
index eec9169f29f5f89274336b63dd1fec43bcd00093..dea2eeb365e1b54410721d0a5d2564b95b658296 100644
--- a/solidify-oai-pmh/pom.xml
+++ b/solidify-oai-pmh/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-oai-pmh</artifactId>
diff --git a/solidify-util/pom.xml b/solidify-util/pom.xml
index 638dea4f33737d4d8391e0817b81296e4bc3b574..0ca3534c2fbf04044d8dea875d7b9f18331428e7 100644
--- a/solidify-util/pom.xml
+++ b/solidify-util/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-util</artifactId>
diff --git a/solidify-xml/pom.xml b/solidify-xml/pom.xml
index 789161110b61f58524cfd5201d7b9f093df0a22e..0b861b9bd9b3d5c9662ca5488f9df9f628a61ece 100644
--- a/solidify-xml/pom.xml
+++ b/solidify-xml/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ch.unige.solidify</groupId>
 		<artifactId>solidify-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.5.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>solidify-xml</artifactId>