diff --git a/broker/pom.xml b/broker/pom.xml
index e925ec84..75a3129e 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../</relativePath>
-        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.eclipse.moquette</groupId>
         <version>0.8-SNAPSHOT</version>
@@ -12,7 +11,6 @@
 
     <artifactId>moquette-broker</artifactId>
     <packaging>jar</packaging>
-    <!--<version>${moquette-version}</version>-->
     <name>Moquette - broker</name>
 
     <properties>
@@ -24,13 +22,13 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>moquette-netty-parser</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         
         <!--<dependency>-->
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b8684468..43cb9af3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -18,19 +18,19 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>moquette-broker</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>moquette-netty-parser</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
          <dependency>
diff --git a/embedding_moquette/pom.xml b/embedding_moquette/pom.xml
index 5c26210d..6ae53f47 100644
--- a/embedding_moquette/pom.xml
+++ b/embedding_moquette/pom.xml
@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../</relativePath>
-        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.eclipse.moquette</groupId>
         <version>0.8-SNAPSHOT</version>
@@ -12,14 +11,13 @@
 
     <artifactId>moquette-embedded-test</artifactId>
     <packaging>jar</packaging>
-    <!--<version>${moquette-version}</version>-->
     <name>Moquette - Embedded test</name>
 
     <dependencies>
         <dependency>
             <groupId>org.eclipse.moquette</groupId>
             <artifactId>moquette-broker</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!--<dependency>-->
diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml
index c998a57d..0aa374e8 100644
--- a/netty_parser/pom.xml
+++ b/netty_parser/pom.xml
@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../</relativePath>
-        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.eclipse.moquette</groupId>
         <version>0.8-SNAPSHOT</version>
@@ -12,7 +11,6 @@
 
     <artifactId>moquette-netty-parser</artifactId>
     <packaging>jar</packaging>
-    <!--<version>${moquette-version}</version>-->
     <name>Moquette - Netty Parser</name>
 
     <properties>
@@ -24,7 +22,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
-            <version>0.8-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
index bf40ced9..c6a88c52 100644
--- a/parser_commons/pom.xml
+++ b/parser_commons/pom.xml
@@ -4,7 +4,6 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../</relativePath>
-        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.eclipse.moquette</groupId>
         <version>0.8-SNAPSHOT</version>
@@ -12,7 +11,6 @@
 
     <artifactId>moquette-parser-commons</artifactId>
     <packaging>jar</packaging>
-    <!--<version>${moquette-version}</version>-->
     <name>Moquette - Parser Commons</name>
 
     <properties>