diff --git a/eclipse-trgt-platform/pom-first.xml b/eclipse-trgt-platform/pom-first.xml
index 5272968..ea0169f 100644
--- a/eclipse-trgt-platform/pom-first.xml
+++ b/eclipse-trgt-platform/pom-first.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.setup-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/eclipse-trgt-platform/pom.xml b/eclipse-trgt-platform/pom.xml
index 5dc7e88..2a4cf32 100644
--- a/eclipse-trgt-platform/pom.xml
+++ b/eclipse-trgt-platform/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/features/apacheds.feature/feature.xml b/features/apacheds.feature/feature.xml
index be17f2a..d7e69f9 100644
--- a/features/apacheds.feature/feature.xml
+++ b/features/apacheds.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.apacheds.feature"
       label="Apache Directory Studio ApacheDS"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.apacheds.configuration"
       image="studio.png">
diff --git a/features/apacheds.feature/pom.xml b/features/apacheds.feature/pom.xml
index 7dffae0..1881b49 100644
--- a/features/apacheds.feature/pom.xml
+++ b/features/apacheds.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/features/ldapbrowser.feature/feature.xml b/features/ldapbrowser.feature/feature.xml
index df9c94a..10d8d44 100644
--- a/features/ldapbrowser.feature/feature.xml
+++ b/features/ldapbrowser.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.ldapbrowser.feature"
       label="Apache Directory Studio LDAP Browser"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.ldapbrowser.ui"
       image="studio.png">
diff --git a/features/ldapbrowser.feature/pom.xml b/features/ldapbrowser.feature/pom.xml
index 50e3f42..0a09b12 100644
--- a/features/ldapbrowser.feature/pom.xml
+++ b/features/ldapbrowser.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/features/ldifeditor.feature/feature.xml b/features/ldifeditor.feature/feature.xml
index 331ed9b..439a61f 100644
--- a/features/ldifeditor.feature/feature.xml
+++ b/features/ldifeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.ldifeditor.feature"
       label="Apache Directory Studio LDIF Editor"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.ldifeditor"
       image="studio.png">
diff --git a/features/ldifeditor.feature/pom.xml b/features/ldifeditor.feature/pom.xml
index f3d557f..6180e8e 100644
--- a/features/ldifeditor.feature/pom.xml
+++ b/features/ldifeditor.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/features/nls.feature/feature.xml b/features/nls.feature/feature.xml
index de0808d..6e93310 100644
--- a/features/nls.feature/feature.xml
+++ b/features/nls.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.nls.feature"
       label="Apache Directory Studio National Language Support"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       image="studio.png">
 
diff --git a/features/nls.feature/pom.xml b/features/nls.feature/pom.xml
index 5325962..28cae50 100644
--- a/features/nls.feature/pom.xml
+++ b/features/nls.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/features/openldap.feature/feature.xml b/features/openldap.feature/feature.xml
index 2caa415..727becb 100644
--- a/features/openldap.feature/feature.xml
+++ b/features/openldap.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.openldap.feature"
       label="Apache Directory Studio OpenLDAP"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       image="studio.png">
 
diff --git a/features/openldap.feature/pom.xml b/features/openldap.feature/pom.xml
index b8bb25e..4acc487 100644
--- a/features/openldap.feature/pom.xml
+++ b/features/openldap.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/features/pom.xml b/features/pom.xml
index bea1695..2d51652 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
   </parent>
   
   <artifactId>org.apache.directory.studio.features-parent</artifactId>
diff --git a/features/rcp.feature/feature.xml b/features/rcp.feature/feature.xml
index def333d..49bda23 100644
--- a/features/rcp.feature/feature.xml
+++ b/features/rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.rcp.feature"
       label="Apache Directory Studio RCP"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.rcp"
       image="studio.png">
diff --git a/features/rcp.feature/pom.xml b/features/rcp.feature/pom.xml
index 4cd2b5e..8d6cd69 100644
--- a/features/rcp.feature/pom.xml
+++ b/features/rcp.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/features/schemaeditor.feature/feature.xml b/features/schemaeditor.feature/feature.xml
index e8d3fa1..f5041ce 100644
--- a/features/schemaeditor.feature/feature.xml
+++ b/features/schemaeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.apache.directory.studio.schemaeditor.feature"
       label="Apache Directory Studio Schema Editor"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20210213-M16"
       provider-name="Apache Software Foundation"
       plugin="org.apache.directory.studio.schemaeditor"
       image="studio.png">
diff --git a/features/schemaeditor.feature/pom.xml b/features/schemaeditor.feature/pom.xml
index e3662b0..3482e9c 100644
--- a/features/schemaeditor.feature/pom.xml
+++ b/features/schemaeditor.feature/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.features-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/helps/apacheds.help/pom-first.xml b/helps/apacheds.help/pom-first.xml
index f20b3f4..7f06642 100644
--- a/helps/apacheds.help/pom-first.xml
+++ b/helps/apacheds.help/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/helps/apacheds.help/pom.xml b/helps/apacheds.help/pom.xml
index 167d698..69e5402 100644
--- a/helps/apacheds.help/pom.xml
+++ b/helps/apacheds.help/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/helps/ldapbrowser.help/pom-first.xml b/helps/ldapbrowser.help/pom-first.xml
index 6dd7d90..1020c71 100644
--- a/helps/ldapbrowser.help/pom-first.xml
+++ b/helps/ldapbrowser.help/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/helps/ldapbrowser.help/pom.xml b/helps/ldapbrowser.help/pom.xml
index d768c64..cedd114 100644
--- a/helps/ldapbrowser.help/pom.xml
+++ b/helps/ldapbrowser.help/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/helps/ldifeditor.help/pom-first.xml b/helps/ldifeditor.help/pom-first.xml
index e914b0d..7c574c9 100644
--- a/helps/ldifeditor.help/pom-first.xml
+++ b/helps/ldifeditor.help/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/helps/ldifeditor.help/pom.xml b/helps/ldifeditor.help/pom.xml
index b803848..2fc3929 100644
--- a/helps/ldifeditor.help/pom.xml
+++ b/helps/ldifeditor.help/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/helps/pom-first.xml b/helps/pom-first.xml
index 2790f7b..e8c3336 100644
--- a/helps/pom-first.xml
+++ b/helps/pom-first.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.setup-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
   <artifactId>org.apache.directory.studio.helps-parent</artifactId>
   <name>Apache Directory Studio Help Plugins Parent</name>
-  <version>2.0.0.qualifier</version>
+  <version>2.0.0.v20210213-M16</version>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/helps/pom.xml b/helps/pom.xml
index 354ea94..8693a4f 100644
--- a/helps/pom.xml
+++ b/helps/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/helps/rcp.help/pom-first.xml b/helps/rcp.help/pom-first.xml
index 17e2d71..a237f49 100644
--- a/helps/rcp.help/pom-first.xml
+++ b/helps/rcp.help/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/helps/rcp.help/pom.xml b/helps/rcp.help/pom.xml
index 9bf384b..e68b32b 100644
--- a/helps/rcp.help/pom.xml
+++ b/helps/rcp.help/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/helps/schemaeditor.help/pom-first.xml b/helps/schemaeditor.help/pom-first.xml
index 84c46b6..9839b2e 100644
--- a/helps/schemaeditor.help/pom-first.xml
+++ b/helps/schemaeditor.help/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/helps/schemaeditor.help/pom.xml b/helps/schemaeditor.help/pom.xml
index d18db57..da214c9 100644
--- a/helps/schemaeditor.help/pom.xml
+++ b/helps/schemaeditor.help/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.helps-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/installers/macos/pom.xml b/installers/macos/pom.xml
index 04fe74a..5f898ed 100644
--- a/installers/macos/pom.xml
+++ b/installers/macos/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.installers</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/installers/pom.xml b/installers/pom.xml
index 76e35da..7eb99a5 100644
--- a/installers/pom.xml
+++ b/installers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/installers/windows/64bit/pom.xml b/installers/windows/64bit/pom.xml
index 6feed97..6774190 100644
--- a/installers/windows/64bit/pom.xml
+++ b/installers/windows/64bit/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.installers.windows</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/installers/windows/pom.xml b/installers/windows/pom.xml
index be709ae..c790c76 100644
--- a/installers/windows/pom.xml
+++ b/installers/windows/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.installers</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/p2repositories/dependencies/pom.xml b/p2repositories/dependencies/pom.xml
index fb25813..9af9cbd 100644
--- a/p2repositories/dependencies/pom.xml
+++ b/p2repositories/dependencies/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.p2repositories-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/p2repositories/eclipse/category.xml b/p2repositories/eclipse/category.xml
index a086462..f50a364 100644
--- a/p2repositories/eclipse/category.xml
+++ b/p2repositories/eclipse/category.xml
@@ -16,19 +16,19 @@
   limitations under the License.
 -->
 <site>
-   <feature url="features/org.apache.directory.studio.apacheds.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.apacheds.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.apacheds.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.apacheds.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.ldifeditor.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.ldifeditor.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.ldifeditor.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.ldifeditor.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.ldapbrowser.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.ldapbrowser.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.ldapbrowser.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.ldapbrowser.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.schemaeditor.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.schemaeditor.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.schemaeditor.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.schemaeditor.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <bundle id="org.apache.directory.studio.slf4j-eclipselog" version="2.0.0.qualifier">
+   <bundle id="org.apache.directory.studio.slf4j-eclipselog" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </bundle>
    <category-def name="org.apache.directory.studio" label="Apache Directory Studio">
diff --git a/p2repositories/eclipse/pom.xml b/p2repositories/eclipse/pom.xml
index bfc3f89..b57eb05 100644
--- a/p2repositories/eclipse/pom.xml
+++ b/p2repositories/eclipse/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.p2repositories-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/p2repositories/pom.xml b/p2repositories/pom.xml
index 2abfd4a..cf7ba4b 100644
--- a/p2repositories/pom.xml
+++ b/p2repositories/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/aciitemeditor/pom-first.xml b/plugins/aciitemeditor/pom-first.xml
index e8afae6..650fcda 100644
--- a/plugins/aciitemeditor/pom-first.xml
+++ b/plugins/aciitemeditor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/aciitemeditor/pom.xml b/plugins/aciitemeditor/pom.xml
index 16b9d96..a5ffb1b 100644
--- a/plugins/aciitemeditor/pom.xml
+++ b/plugins/aciitemeditor/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/apacheds.configuration/pom-first.xml b/plugins/apacheds.configuration/pom-first.xml
index c457dff..7f744ee 100644
--- a/plugins/apacheds.configuration/pom-first.xml
+++ b/plugins/apacheds.configuration/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/apacheds.configuration/pom.xml b/plugins/apacheds.configuration/pom.xml
index 9aefc26..4e770e4 100644
--- a/plugins/apacheds.configuration/pom.xml
+++ b/plugins/apacheds.configuration/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/combinededitor/pom-first.xml b/plugins/combinededitor/pom-first.xml
index f00b6cf..d5c34fb 100644
--- a/plugins/combinededitor/pom-first.xml
+++ b/plugins/combinededitor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/combinededitor/pom.xml b/plugins/combinededitor/pom.xml
index 972bfc5..1a3a3cf 100644
--- a/plugins/combinededitor/pom.xml
+++ b/plugins/combinededitor/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/common.core/pom-first.xml b/plugins/common.core/pom-first.xml
index b7eaea7..2512e60 100644
--- a/plugins/common.core/pom-first.xml
+++ b/plugins/common.core/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/common.core/pom.xml b/plugins/common.core/pom.xml
index a4a5e1a..05d7e48 100644
--- a/plugins/common.core/pom.xml
+++ b/plugins/common.core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/common.ui/pom-first.xml b/plugins/common.ui/pom-first.xml
index 42f19c1..ee73950 100644
--- a/plugins/common.ui/pom-first.xml
+++ b/plugins/common.ui/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/common.ui/pom.xml b/plugins/common.ui/pom.xml
index 57c5936..e52a1d7 100644
--- a/plugins/common.ui/pom.xml
+++ b/plugins/common.ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/connection.core/pom-first.xml b/plugins/connection.core/pom-first.xml
index 91cd68c..214d991 100644
--- a/plugins/connection.core/pom-first.xml
+++ b/plugins/connection.core/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/connection.core/pom.xml b/plugins/connection.core/pom.xml
index 14812dd..974981a 100644
--- a/plugins/connection.core/pom.xml
+++ b/plugins/connection.core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/connection.ui/pom-first.xml b/plugins/connection.ui/pom-first.xml
index 8011ae7..00feebe 100644
--- a/plugins/connection.ui/pom-first.xml
+++ b/plugins/connection.ui/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/connection.ui/pom.xml b/plugins/connection.ui/pom.xml
index 9d87608..4711ce2 100644
--- a/plugins/connection.ui/pom.xml
+++ b/plugins/connection.ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/edirectory/pom-first.xml b/plugins/edirectory/pom-first.xml
index 28a1829..2351647 100644
--- a/plugins/edirectory/pom-first.xml
+++ b/plugins/edirectory/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/edirectory/pom.xml b/plugins/edirectory/pom.xml
index 96ee680..f5d748c 100644
--- a/plugins/edirectory/pom.xml
+++ b/plugins/edirectory/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/ldapbrowser.common/pom-first.xml b/plugins/ldapbrowser.common/pom-first.xml
index 7a367e2..bbacae4 100644
--- a/plugins/ldapbrowser.common/pom-first.xml
+++ b/plugins/ldapbrowser.common/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldapbrowser.common/pom.xml b/plugins/ldapbrowser.common/pom.xml
index e3a3eff..1df4437 100644
--- a/plugins/ldapbrowser.common/pom.xml
+++ b/plugins/ldapbrowser.common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/ldapbrowser.core/pom-first.xml b/plugins/ldapbrowser.core/pom-first.xml
index cece9ab..00a6542 100644
--- a/plugins/ldapbrowser.core/pom-first.xml
+++ b/plugins/ldapbrowser.core/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldapbrowser.core/pom.xml b/plugins/ldapbrowser.core/pom.xml
index e04519d..1b0f2d7 100644
--- a/plugins/ldapbrowser.core/pom.xml
+++ b/plugins/ldapbrowser.core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/ldapbrowser.ui/pom-first.xml b/plugins/ldapbrowser.ui/pom-first.xml
index 4b46973..9b10c04 100644
--- a/plugins/ldapbrowser.ui/pom-first.xml
+++ b/plugins/ldapbrowser.ui/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldapbrowser.ui/pom.xml b/plugins/ldapbrowser.ui/pom.xml
index ba7fac1..8ec77f3 100644
--- a/plugins/ldapbrowser.ui/pom.xml
+++ b/plugins/ldapbrowser.ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/ldapservers.apacheds/pom-first.xml b/plugins/ldapservers.apacheds/pom-first.xml
index 7801a4b..78c0e33 100644
--- a/plugins/ldapservers.apacheds/pom-first.xml
+++ b/plugins/ldapservers.apacheds/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldapservers.apacheds/pom.xml b/plugins/ldapservers.apacheds/pom.xml
index 4573ab5..e3f50f0 100644
--- a/plugins/ldapservers.apacheds/pom.xml
+++ b/plugins/ldapservers.apacheds/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/ldapservers/pom-first.xml b/plugins/ldapservers/pom-first.xml
index 5de21f9..bd25e77 100644
--- a/plugins/ldapservers/pom-first.xml
+++ b/plugins/ldapservers/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldapservers/pom.xml b/plugins/ldapservers/pom.xml
index fa34aba..a652a81 100644
--- a/plugins/ldapservers/pom.xml
+++ b/plugins/ldapservers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/ldifeditor/pom-first.xml b/plugins/ldifeditor/pom-first.xml
index 60ebb33..4cda272 100644
--- a/plugins/ldifeditor/pom-first.xml
+++ b/plugins/ldifeditor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldifeditor/pom.xml b/plugins/ldifeditor/pom.xml
index 0a3676a..4de73f3 100644
--- a/plugins/ldifeditor/pom.xml
+++ b/plugins/ldifeditor/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/ldifparser/pom-first.xml b/plugins/ldifparser/pom-first.xml
index 5e1885b..4a4ca21 100644
--- a/plugins/ldifparser/pom-first.xml
+++ b/plugins/ldifparser/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/ldifparser/pom.xml b/plugins/ldifparser/pom.xml
index 72a4e4c..58f3db5 100644
--- a/plugins/ldifparser/pom.xml
+++ b/plugins/ldifparser/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/openldap.acl.editor/pom-first.xml b/plugins/openldap.acl.editor/pom-first.xml
index 31a6d0d..7a1e443 100644
--- a/plugins/openldap.acl.editor/pom-first.xml
+++ b/plugins/openldap.acl.editor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/openldap.acl.editor/pom.xml b/plugins/openldap.acl.editor/pom.xml
index a6ead75..1983a14 100644
--- a/plugins/openldap.acl.editor/pom.xml
+++ b/plugins/openldap.acl.editor/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/openldap.common.ui/pom-first.xml b/plugins/openldap.common.ui/pom-first.xml
index a6e9d92..7505fab 100644
--- a/plugins/openldap.common.ui/pom-first.xml
+++ b/plugins/openldap.common.ui/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/openldap.common.ui/pom.xml b/plugins/openldap.common.ui/pom.xml
index fb5e511..ff0a601 100644
--- a/plugins/openldap.common.ui/pom.xml
+++ b/plugins/openldap.common.ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/openldap.config.editor/pom-first.xml b/plugins/openldap.config.editor/pom-first.xml
index 87a0044..3c50f83 100644
--- a/plugins/openldap.config.editor/pom-first.xml
+++ b/plugins/openldap.config.editor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/openldap.config.editor/pom.xml b/plugins/openldap.config.editor/pom.xml
index ac18307..7fe43b7 100644
--- a/plugins/openldap.config.editor/pom.xml
+++ b/plugins/openldap.config.editor/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/openldap.syncrepl/pom-first.xml b/plugins/openldap.syncrepl/pom-first.xml
index 732b0f7..9fedf39 100644
--- a/plugins/openldap.syncrepl/pom-first.xml
+++ b/plugins/openldap.syncrepl/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/openldap.syncrepl/pom.xml b/plugins/openldap.syncrepl/pom.xml
index a8e953f..ab08512 100644
--- a/plugins/openldap.syncrepl/pom.xml
+++ b/plugins/openldap.syncrepl/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/pom-first.xml b/plugins/pom-first.xml
index da527bc..aacf1fe 100644
--- a/plugins/pom-first.xml
+++ b/plugins/pom-first.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.setup-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
   <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
   <name>Apache Directory Studio Plugins Parent</name>
-  <version>2.0.0.qualifier</version>
+  <version>2.0.0.v20210213-M16</version>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2eee716..920629c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/rcp/pom-first.xml b/plugins/rcp/pom-first.xml
index fe60e17..52c0116 100644
--- a/plugins/rcp/pom-first.xml
+++ b/plugins/rcp/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/rcp/pom.xml b/plugins/rcp/pom.xml
index 0519594..f9a8075 100644
--- a/plugins/rcp/pom.xml
+++ b/plugins/rcp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/plugins/schemaeditor/pom-first.xml b/plugins/schemaeditor/pom-first.xml
index d32627b..e553b01 100644
--- a/plugins/schemaeditor/pom-first.xml
+++ b/plugins/schemaeditor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/schemaeditor/pom.xml b/plugins/schemaeditor/pom.xml
index 8925c25..83d11ab 100644
--- a/plugins/schemaeditor/pom.xml
+++ b/plugins/schemaeditor/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
   </parent>
   
   <artifactId>org.apache.directory.studio.schemaeditor</artifactId>
diff --git a/plugins/slf4j-eclipselog/pom-first.xml b/plugins/slf4j-eclipselog/pom-first.xml
index 10bd197..7d12460 100644
--- a/plugins/slf4j-eclipselog/pom-first.xml
+++ b/plugins/slf4j-eclipselog/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/slf4j-eclipselog/pom.xml b/plugins/slf4j-eclipselog/pom.xml
index 5d1618a..b0cc83a 100644
--- a/plugins/slf4j-eclipselog/pom.xml
+++ b/plugins/slf4j-eclipselog/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/templateeditor/pom-first.xml b/plugins/templateeditor/pom-first.xml
index e33be2d..f92da0f 100644
--- a/plugins/templateeditor/pom-first.xml
+++ b/plugins/templateeditor/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/templateeditor/pom.xml b/plugins/templateeditor/pom.xml
index 416bceb..cae4062 100644
--- a/plugins/templateeditor/pom.xml
+++ b/plugins/templateeditor/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/plugins/valueeditors/pom-first.xml b/plugins/valueeditors/pom-first.xml
index 95338de..c8ddc12 100644
--- a/plugins/valueeditors/pom-first.xml
+++ b/plugins/valueeditors/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/plugins/valueeditors/pom.xml b/plugins/valueeditors/pom.xml
index fb5424f..9053c05 100644
--- a/plugins/valueeditors/pom.xml
+++ b/plugins/valueeditors/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.plugins-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/pom-first.xml b/pom-first.xml
index 3719615..653b360 100644
--- a/pom-first.xml
+++ b/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>./pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index a7f6755..0251b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.directory.studio</groupId>
   <artifactId>org.apache.directory.studio.parent</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.v20210213-M16</version>
   <name>Apache Directory Studio Parent</name>
   <description>Apache Directory Studio is a complete directory tooling platform intended to be used with any LDAP server however it is particularly designed for use with the Apache Directory Server.</description>
   <packaging>pom</packaging>
diff --git a/product/category.xml b/product/category.xml
index 6366fb3..1b4ac98 100644
--- a/product/category.xml
+++ b/product/category.xml
@@ -16,19 +16,19 @@
   limitations under the License.
 -->
 <site>
-   <feature url="features/org.apache.directory.studio.apacheds.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.apacheds.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.apacheds.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.apacheds.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.ldapbrowser.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.ldapbrowser.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.ldapbrowser.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.ldapbrowser.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.ldifeditor.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.ldifeditor.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.ldifeditor.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.ldifeditor.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.rcp.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.rcp.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.rcp.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.rcp.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
-   <feature url="features/org.apache.directory.studio.schemaeditor.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.schemaeditor.feature" version="2.0.0.qualifier">
+   <feature url="features/org.apache.directory.studio.schemaeditor.feature_2.0.0.v20210213-M16.jar" id="org.apache.directory.studio.schemaeditor.feature" version="2.0.0.v20210213-M16">
       <category name="org.apache.directory.studio"/>
    </feature>
    <category-def name="org.apache.directory.studio" label="Apache Directory Studio">
diff --git a/product/org.apache.directory.studio.product b/product/org.apache.directory.studio.product
index ce25151..6c13dcf 100644
--- a/product/org.apache.directory.studio.product
+++ b/product/org.apache.directory.studio.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Apache Directory Studio" uid="org.apache.directory.studio.product" id="org.apache.directory.studio.rcp.product" application="org.apache.directory.studio.rcp.application" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Apache Directory Studio" uid="org.apache.directory.studio.product" id="org.apache.directory.studio.rcp.product" application="org.apache.directory.studio.rcp.application" version="2.0.0.v20210213-M16" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.apache.directory.studio.rcp/resources/pictures/product_lg.gif"/>
diff --git a/product/pom.xml b/product/pom.xml
index 35856f8..f580cc5 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/tests/pom-first.xml b/tests/pom-first.xml
index 8d11387..5e7709d 100644
--- a/tests/pom-first.xml
+++ b/tests/pom-first.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.setup-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
   <artifactId>org.apache.directory.studio.tests-parent</artifactId>
   <name>Apache Directory Studio Test Plugins</name>
-  <version>2.0.0.qualifier</version>
+  <version>2.0.0.v20210213-M16</version>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/tests/pom.xml b/tests/pom.xml
index ffc3915..ade98ce 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/tests/test.integration.core/pom-first.xml b/tests/test.integration.core/pom-first.xml
index 9a1a9ad..4756116 100644
--- a/tests/test.integration.core/pom-first.xml
+++ b/tests/test.integration.core/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.tests-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/tests/test.integration.core/pom.xml b/tests/test.integration.core/pom.xml
index 5c9d85b..6795beb 100644
--- a/tests/test.integration.core/pom.xml
+++ b/tests/test.integration.core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.tests-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>
   
diff --git a/tests/test.integration.ui/pom-first.xml b/tests/test.integration.ui/pom-first.xml
index 9079550..b40ef44 100644
--- a/tests/test.integration.ui/pom-first.xml
+++ b/tests/test.integration.ui/pom-first.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.tests-parent</artifactId>
-    <version>2.0.0.qualifier</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../pom-first.xml</relativePath>
   </parent>
 
diff --git a/tests/test.integration.ui/pom.xml b/tests/test.integration.ui/pom.xml
index 604201c..fa646ea 100644
--- a/tests/test.integration.ui/pom.xml
+++ b/tests/test.integration.ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>org.apache.directory.studio.tests-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20210213-M16</version>
     <relativePath>../</relativePath>
   </parent>