diff --git a/all/pom.xml b/all/pom.xml
index 4925b65..033011f 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-all</artifactId>
diff --git a/asn1/api/pom.xml b/asn1/api/pom.xml
index da320c8..a57cda8 100644
--- a/asn1/api/pom.xml
+++ b/asn1/api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-asn1-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-asn1-api</artifactId>
diff --git a/asn1/ber/pom.xml b/asn1/ber/pom.xml
index f2b4e60..dc122dc 100644
--- a/asn1/ber/pom.xml
+++ b/asn1/ber/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-asn1-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-asn1-ber</artifactId>
diff --git a/asn1/pom.xml b/asn1/pom.xml
index 496adee..27bf986 100644
--- a/asn1/pom.xml
+++ b/asn1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-asn1-parent</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9fc7dd2..a0983af 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>apache-ldap-api</artifactId>
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index 65a2aea..95fde02 100644
--- a/dsml/engine/pom.xml
+++ b/dsml/engine/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-dsml-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>api-dsml-engine</artifactId>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index 1f6932e..c228fb4 100644
--- a/dsml/parser/pom.xml
+++ b/dsml/parser/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-dsml-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>api-dsml-parser</artifactId>
diff --git a/dsml/pom.xml b/dsml/pom.xml
index 03aab19..f269fd8 100644
--- a/dsml/pom.xml
+++ b/dsml/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-dsml-parent</artifactId>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 0a09405..cbdc2a7 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-i18n</artifactId>
diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index 9f40471..6aeed77 100644
--- a/integ-osgi/pom.xml
+++ b/integ-osgi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>api-integ-osgi</artifactId>
diff --git a/integ/pom.xml b/integ/pom.xml
index 141246d..4e47d39 100644
--- a/integ/pom.xml
+++ b/integ/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-integ</artifactId>
diff --git a/ldap/client/all/pom.xml b/ldap/client/all/pom.xml
index af9531e..b9a7b43 100644
--- a/ldap/client/all/pom.xml
+++ b/ldap/client/all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-client-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-client-all</artifactId>
diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
index e67ff73..b2d77c4 100644
--- a/ldap/client/api/pom.xml
+++ b/ldap/client/api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-client-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>api-ldap-client-api</artifactId>
diff --git a/ldap/client/pom.xml b/ldap/client/pom.xml
index 2a29cf8..6067ffe 100644
--- a/ldap/client/pom.xml
+++ b/ldap/client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-client-parent</artifactId>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index 1581545..f6d2bc8 100644
--- a/ldap/codec/core/pom.xml
+++ b/ldap/codec/core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-codec-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-codec-core</artifactId>
diff --git a/ldap/codec/pom.xml b/ldap/codec/pom.xml
index 4d07ce2..f610302 100644
--- a/ldap/codec/pom.xml
+++ b/ldap/codec/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-codec-parent</artifactId>
diff --git a/ldap/codec/standalone/pom.xml b/ldap/codec/standalone/pom.xml
index 712ce04..c966850 100644
--- a/ldap/codec/standalone/pom.xml
+++ b/ldap/codec/standalone/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-codec-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-codec-standalone</artifactId>
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index 7cef546..29fa4bb 100644
--- a/ldap/extras/aci/pom.xml
+++ b/ldap/extras/aci/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-aci</artifactId>
diff --git a/ldap/extras/codec-api/pom.xml b/ldap/extras/codec-api/pom.xml
index ed44820..29ad9df 100644
--- a/ldap/extras/codec-api/pom.xml
+++ b/ldap/extras/codec-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec-api</artifactId>
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index 2796a86..11512fe 100644
--- a/ldap/extras/codec/pom.xml
+++ b/ldap/extras/codec/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec</artifactId>
diff --git a/ldap/extras/pom.xml b/ldap/extras/pom.xml
index 7ad7f44..5cff5fe 100644
--- a/ldap/extras/pom.xml
+++ b/ldap/extras/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-parent</artifactId>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index b4db623..88b16fc 100644
--- a/ldap/extras/sp/pom.xml
+++ b/ldap/extras/sp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-sp</artifactId>
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index 6ed529c..78247f1 100644
--- a/ldap/extras/trigger/pom.xml
+++ b/ldap/extras/trigger/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-trigger</artifactId>
diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
index 3de1b8d..bcf7d80 100644
--- a/ldap/extras/util/pom.xml
+++ b/ldap/extras/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-util</artifactId>
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 20894c2..0b582f2 100644
--- a/ldap/model/pom.xml
+++ b/ldap/model/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-model</artifactId>
diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
index 8e66ed1..31a3a6f 100644
--- a/ldap/net/mina/pom.xml
+++ b/ldap/net/mina/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-net-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-net-mina</artifactId>
diff --git a/ldap/net/pom.xml b/ldap/net/pom.xml
index d046446..290d886 100644
--- a/ldap/net/pom.xml
+++ b/ldap/net/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-net-parent</artifactId>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 9a6b3ce..facc726 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-parent</artifactId>
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index 1aca83a..35d1522 100644
--- a/ldap/schema/converter/pom.xml
+++ b/ldap/schema/converter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-schema-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-schema-converter</artifactId>
diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
index b686602..c408384 100644
--- a/ldap/schema/data/pom.xml
+++ b/ldap/schema/data/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-schema-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-schema-data</artifactId>
diff --git a/ldap/schema/pom.xml b/ldap/schema/pom.xml
index e02ec6f..6d882e8 100644
--- a/ldap/schema/pom.xml
+++ b/ldap/schema/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-ldap-schema-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 80f66f6..3b0ff1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
   <artifactId>api-parent</artifactId>
   <name>Apache Directory LDAP API</name>
   <packaging>pom</packaging>
-  <version>2.0.0.AM5-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <properties>
     <projectName>ApacheDS-LDAP-API</projectName>
@@ -652,7 +652,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/directory-ldap-api.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/directory-ldap-api.git</developerConnection>
     <url>https://github.com/apache/directory-ldap-api/tree/${project.scm.tag}</url>
-    <tag>master</tag>
+    <tag>2.0.0</tag>
   </scm>
 
   <reporting>
diff --git a/util/pom.xml b/util/pom.xml
index 9139ee2..9c37f2b 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.0.0.AM5-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   
   <artifactId>api-util</artifactId>