diff --git a/all/pom.xml b/all/pom.xml
index 5b3e35a..f40acdd 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-all</artifactId>
diff --git a/asn1/api/pom.xml b/asn1/api/pom.xml
index c26f3fd..110f85b 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-asn1-api</artifactId>
diff --git a/asn1/ber/pom.xml b/asn1/ber/pom.xml
index da901f4..7919434 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-asn1-ber</artifactId>
diff --git a/asn1/pom.xml b/asn1/pom.xml
index c0eac26..e96d20d 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-asn1-parent</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 13f55cb..8a9c7da 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>apache-ldap-api</artifactId>
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index 090dc78..bf9e59d 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
 
   <artifactId>api-dsml-engine</artifactId>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index 6d10b2a..3b6e178 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
 
   <artifactId>api-dsml-parser</artifactId>
diff --git a/dsml/pom.xml b/dsml/pom.xml
index 80edf56..39e72aa 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-dsml-parent</artifactId>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index f82754e..e5e4eba 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-i18n</artifactId>
diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index 839de27..801e1ec 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
 
   <artifactId>api-integ-osgi</artifactId>
diff --git a/integ/pom.xml b/integ/pom.xml
index 65c2532..d533c21 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-integ</artifactId>
diff --git a/ldap/client/all/pom.xml b/ldap/client/all/pom.xml
index ffb34ee..f367e45 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-client-all</artifactId>
diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
index 48e52bd..2dbdbbf 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
 
   <artifactId>api-ldap-client-api</artifactId>
@@ -41,7 +41,7 @@
     <connection>scm:svn:https://svn.apache.org/repos/asf/directory/clients/ldap/trunk/ldap-client-api</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/clients/ldap/trunk/ldap-client-api</developerConnection>
     <url>https://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api</url>
-    <tag>HEAD</tag>
+    <tag>2.0.0.AM4</tag>
   </scm>
 
   <description>
diff --git a/ldap/client/pom.xml b/ldap/client/pom.xml
index 1f67146..51ff347 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-client-parent</artifactId>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index e27df31..d0067bf 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-codec-core</artifactId>
diff --git a/ldap/codec/pom.xml b/ldap/codec/pom.xml
index f571cba..eccb490 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-codec-parent</artifactId>
diff --git a/ldap/codec/standalone/pom.xml b/ldap/codec/standalone/pom.xml
index 6d10d94..d4c47db 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-codec-standalone</artifactId>
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index a28205d..e97772f 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</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 b53f5de..caa7029 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec-api</artifactId>
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index 17023ea..29cd960 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec</artifactId>
diff --git a/ldap/extras/pom.xml b/ldap/extras/pom.xml
index bfcf49e..48ca2bc 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-extras-parent</artifactId>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index df952ed..fa14f38 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-extras-sp</artifactId>
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index e8177e6..6135968 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-extras-trigger</artifactId>
diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
index 1b28466..eea97f3 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-extras-util</artifactId>
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 4b6a4d1..1c1a936 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-model</artifactId>
diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
index c25decb..43188a1 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-net-mina</artifactId>
diff --git a/ldap/net/pom.xml b/ldap/net/pom.xml
index 2c445fc..0e72d5b 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-net-parent</artifactId>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index f27999a..05df9f8 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-parent</artifactId>
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index 609e61f..41d0c6b 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-schema-converter</artifactId>
diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
index 3d5e584..0a848de 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-schema-data</artifactId>
diff --git a/ldap/schema/pom.xml b/ldap/schema/pom.xml
index a3e128c..e1295b1 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-ldap-schema-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 80f4dda..c4fdc2a 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.AM4-SNAPSHOT</version>
+  <version>2.0.0.AM4</version>
 
   <properties>
     <projectName>ApacheDS-LDAP-API</projectName>
@@ -644,7 +644,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.AM4</tag>
   </scm>
 
   <reporting>
diff --git a/util/pom.xml b/util/pom.xml
index 7cc49f5..4f02ad0 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.AM4-SNAPSHOT</version>
+    <version>2.0.0.AM4</version>
   </parent>
   
   <artifactId>api-util</artifactId>