diff --git a/addon-manager/addon/pom.xml b/addon-manager/addon/pom.xml
index 2369257df6..b095dde146 100644
--- a/addon-manager/addon/pom.xml
+++ b/addon-manager/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/addon-manager/api/pom.xml b/addon-manager/api/pom.xml
index 3d10a4ea7e..eed947eb3e 100644
--- a/addon-manager/api/pom.xml
+++ b/addon-manager/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>addon-manager-api</artifactId>
    <name>Forge - Addon Manager API</name>
diff --git a/addon-manager/impl/pom.xml b/addon-manager/impl/pom.xml
index 1451b25d44..e23d9dabf6 100644
--- a/addon-manager/impl/pom.xml
+++ b/addon-manager/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/addon-manager/pom.xml b/addon-manager/pom.xml
index 61162b3038..c09a0a9597 100644
--- a/addon-manager/pom.xml
+++ b/addon-manager/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/addon-manager/spi/pom.xml b/addon-manager/spi/pom.xml
index 44ede92a94..fbdd163fed 100644
--- a/addon-manager/spi/pom.xml
+++ b/addon-manager/spi/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>addon-manager-spi</artifactId>
    <name>Forge - Addon Manager SPI</name>
diff --git a/addon-manager/tests/pom.xml b/addon-manager/tests/pom.xml
index 658d64d023..b763e90010 100644
--- a/addon-manager/tests/pom.xml
+++ b/addon-manager/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/addons/addon/pom.xml b/addons/addon/pom.xml
index 32d99f13f2..a2155c65e2 100644
--- a/addons/addon/pom.xml
+++ b/addons/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/addons/api/pom.xml b/addons/api/pom.xml
index b8c92bebbf..d6df4892c1 100644
--- a/addons/api/pom.xml
+++ b/addons/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>addons-api</artifactId>
    <name>Forge - Addon Development Addon API</name>
diff --git a/addons/impl/pom.xml b/addons/impl/pom.xml
index 8ad754f1d8..6be88ad3a7 100644
--- a/addons/impl/pom.xml
+++ b/addons/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>addons-impl</artifactId>
    <name>Forge - Addon Development Addon Impl</name>
diff --git a/addons/pom.xml b/addons/pom.xml
index 2f96b85a1d..2307dfd748 100644
--- a/addons/pom.xml
+++ b/addons/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    
diff --git a/addons/tests/pom.xml b/addons/tests/pom.xml
index 5ff5b2a98b..29bc1d61b4 100644
--- a/addons/tests/pom.xml
+++ b/addons/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>addons-tests</artifactId>
    <name>Forge - Addon Development Addon Tests</name>
diff --git a/bean-validation/addon/pom.xml b/bean-validation/addon/pom.xml
index 22eb436707..6684315ea6 100644
--- a/bean-validation/addon/pom.xml
+++ b/bean-validation/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>bean-validation-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/bean-validation/api/pom.xml b/bean-validation/api/pom.xml
index ed97e5ba22..88b24b3074 100644
--- a/bean-validation/api/pom.xml
+++ b/bean-validation/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>bean-validation-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>bean-validation-api</artifactId>
    <name>Forge - Bean Validation API</name>
diff --git a/bean-validation/impl/pom.xml b/bean-validation/impl/pom.xml
index e3761b384a..d442696d21 100644
--- a/bean-validation/impl/pom.xml
+++ b/bean-validation/impl/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jboss.forge.addon</groupId>
 		<artifactId>bean-validation-parent</artifactId>
-		<version>3.9.6-SNAPSHOT</version>
+		<version>3.9.6.Final</version>
 	</parent>
 	<artifactId>bean-validation-impl</artifactId>
 	<name>Forge - Bean Validation Impl</name>
diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml
index 676abe25fe..d1254c8d44 100644
--- a/bean-validation/pom.xml
+++ b/bean-validation/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>org.jboss.forge.addon</groupId>
diff --git a/bean-validation/tests/pom.xml b/bean-validation/tests/pom.xml
index 72d786a3bb..ddd7762e0e 100644
--- a/bean-validation/tests/pom.xml
+++ b/bean-validation/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>bean-validation-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>bean-validation-tests</artifactId>
    <name>Forge - Bean Validation Addon Tests</name>
diff --git a/bom/pom.xml b/bom/pom.xml
index 5983addad8..a273b0de66 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -8,7 +8,7 @@
    </parent>
    <groupId>org.jboss.forge</groupId>
    <artifactId>forge-bom</artifactId>
-   <version>3.9.6-SNAPSHOT</version>
+   <version>3.9.6.Final</version>
    <packaging>pom</packaging>
    <name>Forge - BOM</name>
    <description>The Forge "Bill of Materials"</description>
@@ -444,7 +444,7 @@
       <connection>scm:git:git://github.com/forge/core.git</connection>
       <developerConnection>scm:git:git@github.com:forge/core.git</developerConnection>
       <url>http://github.com/forge/core</url>
-      <tag>HEAD</tag>
+      <tag>3.9.6.Final</tag>
    </scm>
 
    <build>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 33ba8c64ed..51d4d89702 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>forge-bootstrap</artifactId>
diff --git a/configuration/addon/pom.xml b/configuration/addon/pom.xml
index f82cb2698f..e775f2619a 100644
--- a/configuration/addon/pom.xml
+++ b/configuration/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>configuration-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <name>Forge - Configuration Addon</name>
diff --git a/configuration/api/pom.xml b/configuration/api/pom.xml
index 6fa18bf13d..3b87908f36 100644
--- a/configuration/api/pom.xml
+++ b/configuration/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>configuration-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>configuration-api</artifactId>
    <name>Forge - Configuration API</name>
diff --git a/configuration/impl/pom.xml b/configuration/impl/pom.xml
index f8c38d71f9..7f92293289 100644
--- a/configuration/impl/pom.xml
+++ b/configuration/impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>configuration-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>configuration-impl</artifactId>
    <name>Forge - Configuration Impl</name>
diff --git a/configuration/pom.xml b/configuration/pom.xml
index 97a1529a8d..c0db47f5c7 100644
--- a/configuration/pom.xml
+++ b/configuration/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <groupId>org.jboss.forge.addon</groupId>
    <artifactId>configuration-parent</artifactId>
diff --git a/configuration/tests/pom.xml b/configuration/tests/pom.xml
index 3a53028a4e..89ff845291 100644
--- a/configuration/tests/pom.xml
+++ b/configuration/tests/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>configuration-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>configuration-tests</artifactId>
    <name>Forge - Configuration Tests</name>
diff --git a/convert/addon/pom.xml b/convert/addon/pom.xml
index 5a75efbfc7..968ae5e810 100644
--- a/convert/addon/pom.xml
+++ b/convert/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/convert/api/pom.xml b/convert/api/pom.xml
index ab73bf3a44..e395024476 100644
--- a/convert/api/pom.xml
+++ b/convert/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>convert-api</artifactId>
    <name>Forge - Convert API</name>
diff --git a/convert/impl/pom.xml b/convert/impl/pom.xml
index 043d5d5864..e8cbfa6728 100644
--- a/convert/impl/pom.xml
+++ b/convert/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>convert-impl</artifactId>
    <name>Forge - Convert Impl</name>
diff --git a/convert/pom.xml b/convert/pom.xml
index 2b0c2dee0d..1ae7625473 100644
--- a/convert/pom.xml
+++ b/convert/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    
diff --git a/convert/tests/pom.xml b/convert/tests/pom.xml
index 1d3641778f..9bd7614e12 100644
--- a/convert/tests/pom.xml
+++ b/convert/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>convert-tests</artifactId>
    <name>Forge - Convert Addon Tests</name>
diff --git a/core/addon/pom.xml b/core/addon/pom.xml
index 7584a2439f..24908c663d 100644
--- a/core/addon/pom.xml
+++ b/core/addon/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>core-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>core</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 5ac4c69639..64614d9f67 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/core/tests/pom.xml b/core/tests/pom.xml
index c0609c80f2..3b567f9e0c 100644
--- a/core/tests/pom.xml
+++ b/core/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>core-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>core-tests</artifactId>
    <name>Forge - Core Addon Tests (Addon Integration Tests)</name>
diff --git a/database-tools/addon/pom.xml b/database-tools/addon/pom.xml
index 9089292146..3905241992 100644
--- a/database-tools/addon/pom.xml
+++ b/database-tools/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>database-tools-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>database-tools</artifactId>
diff --git a/database-tools/api/pom.xml b/database-tools/api/pom.xml
index 79475ce5f7..86dc5478ca 100644
--- a/database-tools/api/pom.xml
+++ b/database-tools/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>database-tools-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>database-tools-api</artifactId>
diff --git a/database-tools/impl/pom.xml b/database-tools/impl/pom.xml
index 34cf272074..9cd3a95833 100644
--- a/database-tools/impl/pom.xml
+++ b/database-tools/impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>database-tools-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>database-tools-impl</artifactId>
diff --git a/database-tools/pom.xml b/database-tools/pom.xml
index 271b9ff8aa..362392edf0 100644
--- a/database-tools/pom.xml
+++ b/database-tools/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/database-tools/tests/pom.xml b/database-tools/tests/pom.xml
index d1e13c7f1f..5788d0bad8 100644
--- a/database-tools/tests/pom.xml
+++ b/database-tools/tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.forge.addon</groupId>
     <artifactId>database-tools-parent</artifactId>
-    <version>3.9.6-SNAPSHOT</version>
+    <version>3.9.6.Final</version>
   </parent>
 
   <artifactId>database-tools-tests</artifactId>
diff --git a/dependencies/addon/pom.xml b/dependencies/addon/pom.xml
index 95fc91053d..ba009f84e0 100644
--- a/dependencies/addon/pom.xml
+++ b/dependencies/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>dependencies</artifactId>
diff --git a/dependencies/api/pom.xml b/dependencies/api/pom.xml
index 3c1bb7f489..77a8ea5b53 100644
--- a/dependencies/api/pom.xml
+++ b/dependencies/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>dependencies-api</artifactId>
    <name>Forge - Dependencies API</name>
diff --git a/dependencies/impl/pom.xml b/dependencies/impl/pom.xml
index 374068d1b3..bd65ce45d4 100644
--- a/dependencies/impl/pom.xml
+++ b/dependencies/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>dependencies-impl</artifactId>
    <name>Forge - Dependencies Impl</name>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 03a30a9679..b8a2514d6c 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    
diff --git a/dependencies/tests/pom.xml b/dependencies/tests/pom.xml
index fd8ab91b6a..203c23abdc 100644
--- a/dependencies/tests/pom.xml
+++ b/dependencies/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>dependencies-tests</artifactId>
    <name>Forge - Dependencies Addon Tests</name>
diff --git a/dev-tools-java/pom.xml b/dev-tools-java/pom.xml
index 1c57b431c1..58cef00d76 100644
--- a/dev-tools-java/pom.xml
+++ b/dev-tools-java/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/dist/pom.xml b/dist/pom.xml
index 0345f19138..ae0f68715b 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/environment/addon/pom.xml b/environment/addon/pom.xml
index d2241741a3..8d3cd1ad06 100644
--- a/environment/addon/pom.xml
+++ b/environment/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/environment/api/pom.xml b/environment/api/pom.xml
index 80f848e224..52cda0ba31 100644
--- a/environment/api/pom.xml
+++ b/environment/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>environment-api</artifactId>
    <name>Forge - Environment API</name>
diff --git a/environment/impl/pom.xml b/environment/impl/pom.xml
index 05b313077c..b2738d31fa 100644
--- a/environment/impl/pom.xml
+++ b/environment/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>environment-impl</artifactId>
    <name>Forge - Environment Impl</name>
diff --git a/environment/pom.xml b/environment/pom.xml
index 2b53d748cf..9856aea3d2 100644
--- a/environment/pom.xml
+++ b/environment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/environment/tests/pom.xml b/environment/tests/pom.xml
index 111e80a3d5..aea96eafb4 100644
--- a/environment/tests/pom.xml
+++ b/environment/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>environment-tests</artifactId>
    <name>Forge - Environment Addon Tests</name>
diff --git a/facets/addon/pom.xml b/facets/addon/pom.xml
index 44004ce37d..46575c00c7 100644
--- a/facets/addon/pom.xml
+++ b/facets/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/facets/api/pom.xml b/facets/api/pom.xml
index 675e55ba1e..3fafe115a5 100644
--- a/facets/api/pom.xml
+++ b/facets/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>facets-api</artifactId>
diff --git a/facets/impl/pom.xml b/facets/impl/pom.xml
index a84bf220fd..a30747727b 100644
--- a/facets/impl/pom.xml
+++ b/facets/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>facets-impl</artifactId>
diff --git a/facets/pom.xml b/facets/pom.xml
index b217e80fb0..06479d62ea 100644
--- a/facets/pom.xml
+++ b/facets/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/facets/tests/pom.xml b/facets/tests/pom.xml
index c1c1ebd50a..44628fd6e4 100644
--- a/facets/tests/pom.xml
+++ b/facets/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>facets-tests</artifactId>
    <name>Forge - Facets Addon Tests</name>
diff --git a/git/addon/pom.xml b/git/addon/pom.xml
index 2d0afb1cd4..d3fee6f5ba 100644
--- a/git/addon/pom.xml
+++ b/git/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>git-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <name>Forge - Git Addon</name>
diff --git a/git/api/pom.xml b/git/api/pom.xml
index cc242681f0..32f3e64a2d 100644
--- a/git/api/pom.xml
+++ b/git/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>git-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>git-api</artifactId>
    <name>Forge - Git API</name>
diff --git a/git/impl/pom.xml b/git/impl/pom.xml
index a3baf101f9..42a1962062 100644
--- a/git/impl/pom.xml
+++ b/git/impl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.forge.addon</groupId>
 		<artifactId>git-parent</artifactId>
-		<version>3.9.6-SNAPSHOT</version>
+		<version>3.9.6.Final</version>
 	</parent>
 	<artifactId>git-impl</artifactId>
 	<name>Forge - Git Impl</name>
diff --git a/git/pom.xml b/git/pom.xml
index 97b575455c..bae49fa827 100644
--- a/git/pom.xml
+++ b/git/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/git/tests/pom.xml b/git/tests/pom.xml
index 45afded391..3c8f4d0d4b 100644
--- a/git/tests/pom.xml
+++ b/git/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>git-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>git-tests</artifactId>
    <name>Forge - Git Addon Tests</name>
diff --git a/javaee/addon/pom.xml b/javaee/addon/pom.xml
index b8c9275109..ebbe6a854c 100644
--- a/javaee/addon/pom.xml
+++ b/javaee/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>javaee</artifactId>
    <name>Forge - JavaEE Addon</name>
diff --git a/javaee/api/pom.xml b/javaee/api/pom.xml
index 59dd3b7210..37f3f603f1 100644
--- a/javaee/api/pom.xml
+++ b/javaee/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.forge.addon</groupId>
 		<artifactId>javaee-parent</artifactId>
-		<version>3.9.6-SNAPSHOT</version>
+		<version>3.9.6.Final</version>
 	</parent>
 	<artifactId>javaee-api</artifactId>
 	<name>Forge - JavaEE API</name>
diff --git a/javaee/impl/pom.xml b/javaee/impl/pom.xml
index 0bc1d03781..7cb2f210fb 100644
--- a/javaee/impl/pom.xml
+++ b/javaee/impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>javaee-impl</artifactId>
    <name>Forge - JavaEE Impl</name>
diff --git a/javaee/pom.xml b/javaee/pom.xml
index 6755386ee2..d028d4428a 100644
--- a/javaee/pom.xml
+++ b/javaee/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/javaee/scaffold-faces/pom.xml b/javaee/scaffold-faces/pom.xml
index 22d9c2c0d4..2fff34a47f 100644
--- a/javaee/scaffold-faces/pom.xml
+++ b/javaee/scaffold-faces/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>scaffold-faces</artifactId>
    <name>Forge - Faces Scaffold provider</name>
diff --git a/javaee/spi/pom.xml b/javaee/spi/pom.xml
index 0caa24c326..1be46b0246 100644
--- a/javaee/spi/pom.xml
+++ b/javaee/spi/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>javaee-spi</artifactId>
    <name>Forge - JavaEE SPI Addon</name>
diff --git a/javaee/tests/pom.xml b/javaee/tests/pom.xml
index f1a8d721b1..9076327410 100644
--- a/javaee/tests/pom.xml
+++ b/javaee/tests/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>javaee-tests</artifactId>
    <name>Forge - JavaEE Tests</name>
diff --git a/maven/addon/pom.xml b/maven/addon/pom.xml
index 965d9fa568..bc64780453 100644
--- a/maven/addon/pom.xml
+++ b/maven/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>maven</artifactId>
diff --git a/maven/api/pom.xml b/maven/api/pom.xml
index d6293c3b25..eca48587ae 100644
--- a/maven/api/pom.xml
+++ b/maven/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>maven-api</artifactId>
    <name>Forge - Maven API</name>
diff --git a/maven/impl-projects/pom.xml b/maven/impl-projects/pom.xml
index 67e9199f6f..bc9841ab8d 100644
--- a/maven/impl-projects/pom.xml
+++ b/maven/impl-projects/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>maven-impl-projects</artifactId>
    <name>Forge - Maven Projects Impl</name>
diff --git a/maven/impl/pom.xml b/maven/impl/pom.xml
index 0e9f029a0c..fc77ca0c1e 100644
--- a/maven/impl/pom.xml
+++ b/maven/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>maven-impl</artifactId>
diff --git a/maven/pom.xml b/maven/pom.xml
index fd1abc14f8..2c23fe8f7b 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/maven/tests/pom.xml b/maven/tests/pom.xml
index b8e1d669a5..b1764cea2e 100644
--- a/maven/tests/pom.xml
+++ b/maven/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>maven-tests</artifactId>
    <name>Forge - Maven Addon Tests</name>
diff --git a/parser-java/addon/pom.xml b/parser-java/addon/pom.xml
index 60e18e859e..2250da0129 100644
--- a/parser-java/addon/pom.xml
+++ b/parser-java/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>parser-java</artifactId>
diff --git a/parser-java/api/pom.xml b/parser-java/api/pom.xml
index 8ed0a3ff04..c9347c162d 100644
--- a/parser-java/api/pom.xml
+++ b/parser-java/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>parser-java-api</artifactId>
diff --git a/parser-java/impl/pom.xml b/parser-java/impl/pom.xml
index d13cbb27f8..99db25f960 100644
--- a/parser-java/impl/pom.xml
+++ b/parser-java/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/parser-java/pom.xml b/parser-java/pom.xml
index 6e84b6bc53..5d51474b72 100644
--- a/parser-java/pom.xml
+++ b/parser-java/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/parser-java/tests/pom.xml b/parser-java/tests/pom.xml
index 3aaea1b1b4..6e5248d2b0 100644
--- a/parser-java/tests/pom.xml
+++ b/parser-java/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>parser-java-tests</artifactId>
    <name>Forge - Java Parser Addon Tests</name>
diff --git a/parser-json/addon/pom.xml b/parser-json/addon/pom.xml
index c16f2fcc6a..dfa3b2a742 100644
--- a/parser-json/addon/pom.xml
+++ b/parser-json/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-json-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>parser-json</artifactId>
    <name>Forge - Json Parser Addon</name>
diff --git a/parser-json/api/pom.xml b/parser-json/api/pom.xml
index 9cd3813292..5ae8bdc5e5 100644
--- a/parser-json/api/pom.xml
+++ b/parser-json/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-json-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>parser-json-api</artifactId>
    <name>Forge - Json Parser Addon API</name>
diff --git a/parser-json/impl/pom.xml b/parser-json/impl/pom.xml
index eeba25c436..3c5553499f 100644
--- a/parser-json/impl/pom.xml
+++ b/parser-json/impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-json-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>parser-json-impl</artifactId>
    <name>Forge - Json Parser Addon Implementation</name>
diff --git a/parser-json/pom.xml b/parser-json/pom.xml
index eb58e4b0b9..af0db79cdd 100644
--- a/parser-json/pom.xml
+++ b/parser-json/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>org.jboss.forge.addon</groupId>
diff --git a/parser-json/tests/pom.xml b/parser-json/tests/pom.xml
index 119d92734c..0cbc24c4c5 100644
--- a/parser-json/tests/pom.xml
+++ b/parser-json/tests/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-json-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>parser-json-tests</artifactId>
    <name>Forge - Json Parser Addon Tests</name>
diff --git a/parser-xml/addon/pom.xml b/parser-xml/addon/pom.xml
index 00f580c95e..c568f1f725 100644
--- a/parser-xml/addon/pom.xml
+++ b/parser-xml/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-xml-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>parser-xml</artifactId>
diff --git a/parser-xml/api/pom.xml b/parser-xml/api/pom.xml
index 68c14445ff..680077b6e8 100644
--- a/parser-xml/api/pom.xml
+++ b/parser-xml/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-xml-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>parser-xml-api</artifactId>
diff --git a/parser-xml/impl/pom.xml b/parser-xml/impl/pom.xml
index 8d5d6d10a3..91522f104d 100644
--- a/parser-xml/impl/pom.xml
+++ b/parser-xml/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-xml-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/parser-xml/pom.xml b/parser-xml/pom.xml
index 8673a360a0..09a4514cd2 100644
--- a/parser-xml/pom.xml
+++ b/parser-xml/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    
diff --git a/parser-xml/tests/pom.xml b/parser-xml/tests/pom.xml
index c0cd73410b..99e08e7960 100644
--- a/parser-xml/tests/pom.xml
+++ b/parser-xml/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-xml-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>parser-xml-tests</artifactId>
    <name>Forge - XML Parser Addon Tests</name>
diff --git a/parser-yaml/pom.xml b/parser-yaml/pom.xml
index e1cf5ab642..78bc2d5516 100644
--- a/parser-yaml/pom.xml
+++ b/parser-yaml/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/pom.xml b/pom.xml
index 504e97b21b..614162b5a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
    <groupId>org.jboss.forge</groupId>
    <artifactId>forge-parent</artifactId>
-   <version>3.9.6-SNAPSHOT</version>
+   <version>3.9.6.Final</version>
    <packaging>pom</packaging>
 
    <name>Forge - Parent</name>
@@ -459,7 +459,7 @@
       <connection>${forge.scm.connection}</connection>
       <developerConnection>${forge.developer.connection}</developerConnection>
       <url>${forge.scm.url}</url>
-      <tag>HEAD</tag>
+      <tag>3.9.6.Final</tag>
    </scm>
 
    <distributionManagement>
diff --git a/projects/addon/pom.xml b/projects/addon/pom.xml
index 005afe8ab0..0970031b06 100644
--- a/projects/addon/pom.xml
+++ b/projects/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>projects</artifactId>
diff --git a/projects/api/pom.xml b/projects/api/pom.xml
index a54888e44b..6a5f798804 100644
--- a/projects/api/pom.xml
+++ b/projects/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>projects-api</artifactId>
    <name>Forge - Projects API</name>
diff --git a/projects/generic/pom.xml b/projects/generic/pom.xml
index 19bfa6d56d..c695b83d78 100644
--- a/projects/generic/pom.xml
+++ b/projects/generic/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>projects-generic</artifactId>
diff --git a/projects/impl/pom.xml b/projects/impl/pom.xml
index 7681f6e2c9..0d2ccefa56 100644
--- a/projects/impl/pom.xml
+++ b/projects/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>projects-impl</artifactId>
    <name>Forge - Projects Impl</name>
diff --git a/projects/pom.xml b/projects/pom.xml
index c1d1276537..dbc619a288 100644
--- a/projects/pom.xml
+++ b/projects/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/projects/tests/pom.xml b/projects/tests/pom.xml
index 4fbcd5116a..5536667def 100644
--- a/projects/tests/pom.xml
+++ b/projects/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>projects-tests</artifactId>
    <name>Forge - Projects Addon Tests</name>
diff --git a/resources/addon/pom.xml b/resources/addon/pom.xml
index 65a1270f7f..2c9a29a73c 100644
--- a/resources/addon/pom.xml
+++ b/resources/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>resources</artifactId>
diff --git a/resources/api/pom.xml b/resources/api/pom.xml
index 0142e38543..baf62bf83a 100644
--- a/resources/api/pom.xml
+++ b/resources/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>resources-api</artifactId>
diff --git a/resources/impl/pom.xml b/resources/impl/pom.xml
index 695bc6c9cb..0b36beae9f 100644
--- a/resources/impl/pom.xml
+++ b/resources/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>resources-impl</artifactId>
diff --git a/resources/pom.xml b/resources/pom.xml
index 0bea3b8a6d..ad50d0b468 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    
diff --git a/resources/tests/pom.xml b/resources/tests/pom.xml
index 8b9b1c27bd..bb60dc4193 100644
--- a/resources/tests/pom.xml
+++ b/resources/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>resources-tests</artifactId>
    <name>Forge - Resources Addon Tests</name>
diff --git a/rest-client/addon/pom.xml b/rest-client/addon/pom.xml
index b36b556ca3..6dc366a386 100644
--- a/rest-client/addon/pom.xml
+++ b/rest-client/addon/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>rest-client-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>rest-client</artifactId>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 22150c477b..3479e03ef6 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/rest-client/tests/pom.xml b/rest-client/tests/pom.xml
index 4c993ac107..e83c5e83c4 100644
--- a/rest-client/tests/pom.xml
+++ b/rest-client/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>rest-client-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>rest-client-tests</artifactId>
    <name>Forge - Rest Client Addon Integration Tests</name>
diff --git a/scaffold/addon/pom.xml b/scaffold/addon/pom.xml
index 8664b56fd9..0a4b3a4f0c 100644
--- a/scaffold/addon/pom.xml
+++ b/scaffold/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>scaffold-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>scaffold</artifactId>
    <name>Forge - Scaffold Addon</name>
diff --git a/scaffold/api/pom.xml b/scaffold/api/pom.xml
index ade1cde514..d7f6cd2b1a 100644
--- a/scaffold/api/pom.xml
+++ b/scaffold/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>scaffold-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>scaffold-api</artifactId>
    <name>Forge - Scaffold API</name>
diff --git a/scaffold/impl/pom.xml b/scaffold/impl/pom.xml
index 950fafac9e..b74782a158 100644
--- a/scaffold/impl/pom.xml
+++ b/scaffold/impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>scaffold-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>scaffold-impl</artifactId>
    <name>Forge - Scaffold Impl</name>
diff --git a/scaffold/pom.xml b/scaffold/pom.xml
index f82d921308..34cb5d8f61 100644
--- a/scaffold/pom.xml
+++ b/scaffold/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <groupId>org.jboss.forge.addon</groupId>
    <artifactId>scaffold-parent</artifactId>
diff --git a/scaffold/spi/pom.xml b/scaffold/spi/pom.xml
index 80de8f4e4f..a0d1380b40 100644
--- a/scaffold/spi/pom.xml
+++ b/scaffold/spi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.forge.addon</groupId>
 		<artifactId>scaffold-parent</artifactId>
-		<version>3.9.6-SNAPSHOT</version>
+		<version>3.9.6.Final</version>
 	</parent>
 	<artifactId>scaffold-spi</artifactId>
 	<name>Forge - Scaffold SPI</name>
diff --git a/scaffold/tests/pom.xml b/scaffold/tests/pom.xml
index ca8a58a153..04d1e71afd 100644
--- a/scaffold/tests/pom.xml
+++ b/scaffold/tests/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>scaffold-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>scaffold-tests</artifactId>
    <name>Forge - Scaffold Tests</name>
diff --git a/script/pom.xml b/script/pom.xml
index 2d5b7a1259..8ce9a80063 100644
--- a/script/pom.xml
+++ b/script/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/shell/addon/pom.xml b/shell/addon/pom.xml
index ed96d32202..6dd8893136 100644
--- a/shell/addon/pom.xml
+++ b/shell/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>shell-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/shell/api/pom.xml b/shell/api/pom.xml
index bc533f9fa1..a0f1ae5bb9 100644
--- a/shell/api/pom.xml
+++ b/shell/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>shell-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/shell/impl/pom.xml b/shell/impl/pom.xml
index c4f0e7295c..0a7384939b 100644
--- a/shell/impl/pom.xml
+++ b/shell/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>shell-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/shell/pom.xml b/shell/pom.xml
index 212c207375..fa009a2b96 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/shell/spi/pom.xml b/shell/spi/pom.xml
index d03a1646d9..7adf95640e 100644
--- a/shell/spi/pom.xml
+++ b/shell/spi/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>shell-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>shell-spi</artifactId>
diff --git a/shell/test-harness/pom.xml b/shell/test-harness/pom.xml
index b68214f6cf..281f7327e2 100644
--- a/shell/test-harness/pom.xml
+++ b/shell/test-harness/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>shell-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>shell-test-harness</artifactId>
diff --git a/shell/tests/pom.xml b/shell/tests/pom.xml
index 10c5edefa0..55f04d1e78 100644
--- a/shell/tests/pom.xml
+++ b/shell/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>shell-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>shell-tests</artifactId>
diff --git a/templates/addon/pom.xml b/templates/addon/pom.xml
index 267f5f52c0..0604aa33c5 100644
--- a/templates/addon/pom.xml
+++ b/templates/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>templates-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>templates</artifactId>
    <name>Forge - Templates Addon</name>
diff --git a/templates/api/pom.xml b/templates/api/pom.xml
index 7c6db9e5c2..1287817af4 100644
--- a/templates/api/pom.xml
+++ b/templates/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>templates-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>templates-api</artifactId>
diff --git a/templates/freemarker/pom.xml b/templates/freemarker/pom.xml
index 45e3013c2e..51ce788dde 100644
--- a/templates/freemarker/pom.xml
+++ b/templates/freemarker/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <artifactId>templates-parent</artifactId>
       <groupId>org.jboss.forge.addon</groupId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <properties>
diff --git a/templates/impl/pom.xml b/templates/impl/pom.xml
index 9ec7533ee1..dbb35d8c48 100644
--- a/templates/impl/pom.xml
+++ b/templates/impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>templates-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>templates-impl</artifactId>
    <name>Forge - Templates Addon Impl</name>
diff --git a/templates/pom.xml b/templates/pom.xml
index a43267c199..3ce06a7d32 100644
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>org.jboss.forge.addon</groupId>
diff --git a/templates/spi/pom.xml b/templates/spi/pom.xml
index c38803d753..3376fff51d 100644
--- a/templates/spi/pom.xml
+++ b/templates/spi/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>templates-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>templates-spi</artifactId>
diff --git a/templates/tests/pom.xml b/templates/tests/pom.xml
index 69397eda2a..df92f71f8e 100644
--- a/templates/tests/pom.xml
+++ b/templates/tests/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>templates-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>templates-tests</artifactId>
    <name>Forge - Templates Addon Tests</name>
diff --git a/testing/addon/pom.xml b/testing/addon/pom.xml
index e397670ce4..20e1ca5b91 100644
--- a/testing/addon/pom.xml
+++ b/testing/addon/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>testing-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>testing</artifactId>
    <name>Forge - Testing Addon</name>
diff --git a/testing/api/pom.xml b/testing/api/pom.xml
index 71592dd6b8..8df235f29d 100644
--- a/testing/api/pom.xml
+++ b/testing/api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>testing-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>testing-api</artifactId>
    <name>Forge - Testing Addon API</name>
diff --git a/testing/impl/pom.xml b/testing/impl/pom.xml
index e8d82b80db..53627c4aed 100644
--- a/testing/impl/pom.xml
+++ b/testing/impl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.forge.addon</groupId>
     <artifactId>testing-parent</artifactId>
-    <version>3.9.6-SNAPSHOT</version>
+    <version>3.9.6.Final</version>
   </parent>
   <artifactId>testing-impl</artifactId>
   <name>Forge - Testing Addon Implementation</name>
diff --git a/testing/pom.xml b/testing/pom.xml
index 927d1c94ed..d299aefada 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <groupId>org.jboss.forge.addon</groupId>
diff --git a/testing/tests/pom.xml b/testing/tests/pom.xml
index 96b1e2f176..b5bf0c8e61 100644
--- a/testing/tests/pom.xml
+++ b/testing/tests/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>testing-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>testing-tests</artifactId>
    <name>Forge - Testing Addon Tests</name>
diff --git a/text/pom.xml b/text/pom.xml
index d21f576536..38f88ed803 100644
--- a/text/pom.xml
+++ b/text/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <groupId>org.jboss.forge.addon</groupId>
diff --git a/ui/addon/pom.xml b/ui/addon/pom.xml
index 50e0d62ae0..47cdbd6cf5 100644
--- a/ui/addon/pom.xml
+++ b/ui/addon/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>ui</artifactId>
diff --git a/ui/api/pom.xml b/ui/api/pom.xml
index 4deb1a5b4b..19eea87c00 100644
--- a/ui/api/pom.xml
+++ b/ui/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>ui-api</artifactId>
diff --git a/ui/example/pom.xml b/ui/example/pom.xml
index 90fe364172..de6da19fb2 100644
--- a/ui/example/pom.xml
+++ b/ui/example/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>ui-example</artifactId>
    <name>Forge - UI Addon Example</name>
diff --git a/ui/impl/pom.xml b/ui/impl/pom.xml
index 83226218ca..7851aea2f3 100644
--- a/ui/impl/pom.xml
+++ b/ui/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>ui-impl</artifactId>
diff --git a/ui/pom.xml b/ui/pom.xml
index 23f8378472..62ffdb81de 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/ui/spi/pom.xml b/ui/spi/pom.xml
index 35f7a7abe3..514557a951 100644
--- a/ui/spi/pom.xml
+++ b/ui/spi/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/ui/test-harness/pom.xml b/ui/test-harness/pom.xml
index 194bc6d8ed..82f0b8ceb9 100644
--- a/ui/test-harness/pom.xml
+++ b/ui/test-harness/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
 
    <artifactId>ui-test-harness</artifactId>
diff --git a/ui/tests/pom.xml b/ui/tests/pom.xml
index c4b2de81ad..a266637b0a 100644
--- a/ui/tests/pom.xml
+++ b/ui/tests/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
-      <version>3.9.6-SNAPSHOT</version>
+      <version>3.9.6.Final</version>
    </parent>
    <artifactId>ui-tests</artifactId>
    <name>Forge - UI Addon Tests</name>