diff --git a/all/pom.xml b/all/pom.xml
index a0daa6d..57eab29 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-all</artifactId>
diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index 37b930a..9d342c6 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-annotations</artifactId>
diff --git a/core-api/pom.xml b/core-api/pom.xml
index 7083462..fdee2c6 100644
--- a/core-api/pom.xml
+++ b/core-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-api</artifactId>
diff --git a/core-avl/pom.xml b/core-avl/pom.xml
index a57e27f..3556cab 100644
--- a/core-avl/pom.xml
+++ b/core-avl/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-avl</artifactId>
diff --git a/core-constants/pom.xml b/core-constants/pom.xml
index 45787a8..5a80b81 100644
--- a/core-constants/pom.xml
+++ b/core-constants/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-constants</artifactId>
diff --git a/core-integ/pom.xml b/core-integ/pom.xml
index a191fc6..825db1f 100644
--- a/core-integ/pom.xml
+++ b/core-integ/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-integ</artifactId>
diff --git a/core-jndi/pom.xml b/core-jndi/pom.xml
index 30d67a3..e0f1c9c 100644
--- a/core-jndi/pom.xml
+++ b/core-jndi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-jndi</artifactId>
diff --git a/core-shared/pom.xml b/core-shared/pom.xml
index ca47185..b8268eb 100644
--- a/core-shared/pom.xml
+++ b/core-shared/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core-shared</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index dafef30..5990d37 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-core</artifactId>
diff --git a/http-directory-bridge/pom.xml b/http-directory-bridge/pom.xml
index 4dc5bd1..c3b260d 100644
--- a/http-directory-bridge/pom.xml
+++ b/http-directory-bridge/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
 
   <artifactId>apacheds-http-directory-bridge</artifactId>
diff --git a/http-integration/pom.xml b/http-integration/pom.xml
index a1e11c3..443d5b4 100644
--- a/http-integration/pom.xml
+++ b/http-integration/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-http-integration</artifactId>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index f9c68f9..f7e8dc3 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-i18n</artifactId>
diff --git a/installers-maven-plugin/pom.xml b/installers-maven-plugin/pom.xml
index 789de0c..159673a 100644
--- a/installers-maven-plugin/pom.xml
+++ b/installers-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-installers-maven-plugin</artifactId>
diff --git a/installers/pom.xml b/installers/pom.xml
index aef1c30..7874c9f 100644
--- a/installers/pom.xml
+++ b/installers/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-installers</artifactId>
diff --git a/interceptor-kerberos/pom.xml b/interceptor-kerberos/pom.xml
index 64133fa..201b585 100644
--- a/interceptor-kerberos/pom.xml
+++ b/interceptor-kerberos/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptor-kerberos</artifactId>
diff --git a/interceptors/admin/pom.xml b/interceptors/admin/pom.xml
index ad5958d..3f439f9 100644
--- a/interceptors/admin/pom.xml
+++ b/interceptors/admin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-admin</artifactId>
diff --git a/interceptors/authn/pom.xml b/interceptors/authn/pom.xml
index 14df834..b195c40 100644
--- a/interceptors/authn/pom.xml
+++ b/interceptors/authn/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-authn</artifactId>
diff --git a/interceptors/authz/pom.xml b/interceptors/authz/pom.xml
index 33d1d4d..bf4254b 100644
--- a/interceptors/authz/pom.xml
+++ b/interceptors/authz/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-authz</artifactId>
diff --git a/interceptors/changelog/pom.xml b/interceptors/changelog/pom.xml
index b3ffd41..8c39453 100644
--- a/interceptors/changelog/pom.xml
+++ b/interceptors/changelog/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-changelog</artifactId>
diff --git a/interceptors/collective/pom.xml b/interceptors/collective/pom.xml
index ec922b8..715a14a 100644
--- a/interceptors/collective/pom.xml
+++ b/interceptors/collective/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-collective</artifactId>
diff --git a/interceptors/event/pom.xml b/interceptors/event/pom.xml
index 068cc07..0a1f7c2 100644
--- a/interceptors/event/pom.xml
+++ b/interceptors/event/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-event</artifactId>
diff --git a/interceptors/exception/pom.xml b/interceptors/exception/pom.xml
index 47df2b3..594d054 100644
--- a/interceptors/exception/pom.xml
+++ b/interceptors/exception/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-exception</artifactId>
diff --git a/interceptors/hash/pom.xml b/interceptors/hash/pom.xml
index 7177dd2..c4a6621 100644
--- a/interceptors/hash/pom.xml
+++ b/interceptors/hash/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-hash</artifactId>
diff --git a/interceptors/journal/pom.xml b/interceptors/journal/pom.xml
index ef173d7..13bb432 100644
--- a/interceptors/journal/pom.xml
+++ b/interceptors/journal/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-journal</artifactId>
diff --git a/interceptors/logger/pom.xml b/interceptors/logger/pom.xml
index 7a42fbc..9e1b6cb 100644
--- a/interceptors/logger/pom.xml
+++ b/interceptors/logger/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-logger</artifactId>
diff --git a/interceptors/normalization/pom.xml b/interceptors/normalization/pom.xml
index b6ef762..4347b5d 100644
--- a/interceptors/normalization/pom.xml
+++ b/interceptors/normalization/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-normalization</artifactId>
diff --git a/interceptors/number/pom.xml b/interceptors/number/pom.xml
index 7a9a0f9..5e68244 100644
--- a/interceptors/number/pom.xml
+++ b/interceptors/number/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-number</artifactId>
diff --git a/interceptors/operational/pom.xml b/interceptors/operational/pom.xml
index 7f428ff..3ef391f 100644
--- a/interceptors/operational/pom.xml
+++ b/interceptors/operational/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-operational</artifactId>
diff --git a/interceptors/pom.xml b/interceptors/pom.xml
index 9c75aa9..524a4ed 100644
--- a/interceptors/pom.xml
+++ b/interceptors/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
 
   <artifactId>apacheds-interceptors</artifactId>
diff --git a/interceptors/referral/pom.xml b/interceptors/referral/pom.xml
index d546274..a5d5aca 100644
--- a/interceptors/referral/pom.xml
+++ b/interceptors/referral/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-referral</artifactId>
diff --git a/interceptors/schema/pom.xml b/interceptors/schema/pom.xml
index 0845de5..70e242a 100644
--- a/interceptors/schema/pom.xml
+++ b/interceptors/schema/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-schema</artifactId>
diff --git a/interceptors/subtree/pom.xml b/interceptors/subtree/pom.xml
index a98e6b2..5aea967 100644
--- a/interceptors/subtree/pom.xml
+++ b/interceptors/subtree/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-subtree</artifactId>
diff --git a/interceptors/trigger/pom.xml b/interceptors/trigger/pom.xml
index ec2637a..b610eb6 100644
--- a/interceptors/trigger/pom.xml
+++ b/interceptors/trigger/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-interceptors-trigger</artifactId>
diff --git a/jdbm-partition/pom.xml b/jdbm-partition/pom.xml
index 9652ccb..440b682 100644
--- a/jdbm-partition/pom.xml
+++ b/jdbm-partition/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-jdbm-partition</artifactId>
diff --git a/kerberos-client/pom.xml b/kerberos-client/pom.xml
index 937906e..05c02c1 100644
--- a/kerberos-client/pom.xml
+++ b/kerberos-client/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   <artifactId>kerberos-client</artifactId>
   <name>kerberos-client</name>
diff --git a/kerberos-codec/pom.xml b/kerberos-codec/pom.xml
index c973618..18111ed 100644
--- a/kerberos-codec/pom.xml
+++ b/kerberos-codec/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-kerberos-codec</artifactId>
diff --git a/kerberos-test/pom.xml b/kerberos-test/pom.xml
index d3b746a..abdab5a 100644
--- a/kerberos-test/pom.xml
+++ b/kerberos-test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-kerberos-test</artifactId>
diff --git a/ldap-client-test/pom.xml b/ldap-client-test/pom.xml
index 4382c8d..f1a61f8 100644
--- a/ldap-client-test/pom.xml
+++ b/ldap-client-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
 
   <artifactId>ldap-client-test</artifactId>
diff --git a/ldif-partition/pom.xml b/ldif-partition/pom.xml
index a340e08..a1a801c 100644
--- a/ldif-partition/pom.xml
+++ b/ldif-partition/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-ldif-partition</artifactId>
diff --git a/mavibot-partition/pom.xml b/mavibot-partition/pom.xml
index b62aa1b..ff8b8eb 100644
--- a/mavibot-partition/pom.xml
+++ b/mavibot-partition/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   <artifactId>apacheds-mavibot-partition</artifactId>
   <name>ApacheDS Mavibot Partition</name>
diff --git a/osgi-integ/pom.xml b/osgi-integ/pom.xml
index 82261a4..fe998b1 100644
--- a/osgi-integ/pom.xml
+++ b/osgi-integ/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
 
   <artifactId>apacheds-osgi-integ</artifactId>
diff --git a/pom.xml b/pom.xml
index 9790307..3c3ff58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-parent</artifactId>
-  <version>2.0.0.AM25-SNAPSHOT</version>
+  <version>2.0.0.AM25</version>
   <packaging>pom</packaging>
 
   <name>ApacheDS</name>
@@ -1269,6 +1269,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/directory-server.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/directory-server.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=directory-server.git;a=tag;h=refs/tags/${project.scm.tag}</url>
+    <tag>2.0.0.AM25</tag>
   </scm>
 
   <repositories>
diff --git a/protocol-dhcp/pom.xml b/protocol-dhcp/pom.xml
index 015ebca..aa68cc4 100644
--- a/protocol-dhcp/pom.xml
+++ b/protocol-dhcp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-protocol-dhcp</artifactId>
diff --git a/protocol-dns/pom.xml b/protocol-dns/pom.xml
index 64f79eb..9c4df2b 100644
--- a/protocol-dns/pom.xml
+++ b/protocol-dns/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-protocol-dns</artifactId>
diff --git a/protocol-kerberos/pom.xml b/protocol-kerberos/pom.xml
index 0cecbea..941d1da 100644
--- a/protocol-kerberos/pom.xml
+++ b/protocol-kerberos/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-protocol-kerberos</artifactId>
diff --git a/protocol-ldap/pom.xml b/protocol-ldap/pom.xml
index a61ca69..3fe356e 100644
--- a/protocol-ldap/pom.xml
+++ b/protocol-ldap/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-protocol-ldap</artifactId>
diff --git a/protocol-ntp/pom.xml b/protocol-ntp/pom.xml
index bafae62..3a6b279 100644
--- a/protocol-ntp/pom.xml
+++ b/protocol-ntp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-protocol-ntp</artifactId>
diff --git a/protocol-shared/pom.xml b/protocol-shared/pom.xml
index bcaa92d..a8ffb0f 100644
--- a/protocol-shared/pom.xml
+++ b/protocol-shared/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <name>ApacheDS Protocol Shared</name>
diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
index eb618c9..9609271 100644
--- a/server-annotations/pom.xml
+++ b/server-annotations/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-server-annotations</artifactId>
diff --git a/server-config/pom.xml b/server-config/pom.xml
index 8e24aa3..da09520 100644
--- a/server-config/pom.xml
+++ b/server-config/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
 
   <artifactId>apacheds-server-config</artifactId>
diff --git a/server-integ/pom.xml b/server-integ/pom.xml
index 00f198c..aab688a 100644
--- a/server-integ/pom.xml
+++ b/server-integ/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-server-integ</artifactId>
diff --git a/server-jndi/pom.xml b/server-jndi/pom.xml
index 44608d7..0bd3e1b 100644
--- a/server-jndi/pom.xml
+++ b/server-jndi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-server-jndi</artifactId>
diff --git a/service-builder/pom.xml b/service-builder/pom.xml
index 47f169e..34132f8 100644
--- a/service-builder/pom.xml
+++ b/service-builder/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
 
   <artifactId>apacheds-service-builder</artifactId>
diff --git a/service/pom.xml b/service/pom.xml
index 93166fe..6bf0112 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-service</artifactId>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 4e99859..eb761f1 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -23,7 +23,7 @@
     <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-test-framework</artifactId>
diff --git a/wrapper/pom.xml b/wrapper/pom.xml
index 1b3a5fa..d7c2981 100644
--- a/wrapper/pom.xml
+++ b/wrapper/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-wrapper</artifactId>
diff --git a/xdbm-partition/pom.xml b/xdbm-partition/pom.xml
index ecadda8..8b42ff6 100644
--- a/xdbm-partition/pom.xml
+++ b/xdbm-partition/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0.AM25-SNAPSHOT</version>
+    <version>2.0.0.AM25</version>
   </parent>
   
   <artifactId>apacheds-xdbm-partition</artifactId>