diff --git a/assemblies/cde-renderer/docker/pom.xml b/assemblies/cde-renderer/docker/pom.xml
index 3f4797764d..0be7c71660 100644
--- a/assemblies/cde-renderer/docker/pom.xml
+++ b/assemblies/cde-renderer/docker/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-renderer-assembly</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-renderer-docker</artifactId>
diff --git a/assemblies/cde-renderer/feature/pom.xml b/assemblies/cde-renderer/feature/pom.xml
index e97deec024..add7b37d70 100644
--- a/assemblies/cde-renderer/feature/pom.xml
+++ b/assemblies/cde-renderer/feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-renderer-assembly</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>pentaho-cde-renderer</artifactId>
diff --git a/assemblies/cde-renderer/karaf/pom.xml b/assemblies/cde-renderer/karaf/pom.xml
index 10855b8ade..569c4106d9 100644
--- a/assemblies/cde-renderer/karaf/pom.xml
+++ b/assemblies/cde-renderer/karaf/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-renderer-assembly</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-renderer-karaf-assembly</artifactId>
diff --git a/assemblies/cde-renderer/pom.xml b/assemblies/cde-renderer/pom.xml
index 6abfa09747..587f3652a6 100644
--- a/assemblies/cde-renderer/pom.xml
+++ b/assemblies/cde-renderer/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-renderer-assembly</artifactId>
diff --git a/assemblies/cde-renderer/solr/pom.xml b/assemblies/cde-renderer/solr/pom.xml
index e6b64b6a0d..685f177bad 100644
--- a/assemblies/cde-renderer/solr/pom.xml
+++ b/assemblies/cde-renderer/solr/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.pentaho.ctools</groupId>
         <artifactId>cde-renderer-assembly</artifactId>
-        <version>9.6.0.0-SNAPSHOT-16</version>
+        <version>9.6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/assemblies/pdi/cde-plugin-pdi/pom.xml b/assemblies/pdi/cde-plugin-pdi/pom.xml
index a49c46653f..090fc4231e 100644
--- a/assemblies/pdi/cde-plugin-pdi/pom.xml
+++ b/assemblies/pdi/cde-plugin-pdi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies-pdi</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>pentaho-cde-plugin-pdi</artifactId>
   <packaging>feature</packaging>
diff --git a/assemblies/pdi/pom.xml b/assemblies/pdi/pom.xml
index 9310758b30..8f566652f3 100644
--- a/assemblies/pdi/pom.xml
+++ b/assemblies/pdi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-plugin-assemblies-pdi</artifactId>
   <packaging>pom</packaging>
diff --git a/assemblies/platform/pentaho-cdf-dd-disabled/pom.xml b/assemblies/platform/pentaho-cdf-dd-disabled/pom.xml
index 4df89a4323..b82f5349fb 100644
--- a/assemblies/platform/pentaho-cdf-dd-disabled/pom.xml
+++ b/assemblies/platform/pentaho-cdf-dd-disabled/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies-platform</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>pentaho-cdf-dd-disabled</artifactId>
diff --git a/assemblies/platform/pentaho-cdf-dd-rca/pom.xml b/assemblies/platform/pentaho-cdf-dd-rca/pom.xml
index eaceccea0d..2bebc9fd48 100644
--- a/assemblies/platform/pentaho-cdf-dd-rca/pom.xml
+++ b/assemblies/platform/pentaho-cdf-dd-rca/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.pentaho.ctools</groupId>
         <artifactId>cde-plugin-assemblies-platform</artifactId>
-        <version>9.6.0.0-SNAPSHOT-16</version>
+        <version>9.6.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>pentaho-cdf-dd-rca</artifactId>
     <packaging>pom</packaging>
diff --git a/assemblies/platform/pentaho-cdf-dd-samples/pom.xml b/assemblies/platform/pentaho-cdf-dd-samples/pom.xml
index f45be382bd..d52a75cabf 100644
--- a/assemblies/platform/pentaho-cdf-dd-samples/pom.xml
+++ b/assemblies/platform/pentaho-cdf-dd-samples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies-platform</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>pentaho-cdf-dd-samples</artifactId>
   <packaging>pom</packaging>
diff --git a/assemblies/platform/pentaho-cdf-dd/pom.xml b/assemblies/platform/pentaho-cdf-dd/pom.xml
index 4b87ad937f..e897a4da86 100644
--- a/assemblies/platform/pentaho-cdf-dd/pom.xml
+++ b/assemblies/platform/pentaho-cdf-dd/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies-platform</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>pentaho-cdf-dd</artifactId>
   <packaging>pom</packaging>
diff --git a/assemblies/platform/pom.xml b/assemblies/platform/pom.xml
index 5ebb1603f1..3afb82557c 100644
--- a/assemblies/platform/pom.xml
+++ b/assemblies/platform/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin-assemblies</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-plugin-assemblies-platform</artifactId>
   <packaging>pom</packaging>
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index 41a3a2dab5..72ea039bea 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-plugin-assemblies</artifactId>
diff --git a/components/assemblies/cde-components-pdi/pom.xml b/components/assemblies/cde-components-pdi/pom.xml
index 222e1f269f..8fad1700a0 100644
--- a/components/assemblies/cde-components-pdi/pom.xml
+++ b/components/assemblies/cde-components-pdi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components-assemblies</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-components-pdi</artifactId>
diff --git a/components/assemblies/cde-components-platform/pom.xml b/components/assemblies/cde-components-platform/pom.xml
index de1211e1a4..e18d47a552 100644
--- a/components/assemblies/cde-components-platform/pom.xml
+++ b/components/assemblies/cde-components-platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components-assemblies</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-components-platform</artifactId>
diff --git a/components/assemblies/cde-components-webpackage/pom.xml b/components/assemblies/cde-components-webpackage/pom.xml
index fc6c0012f5..e3af7b1017 100644
--- a/components/assemblies/cde-components-webpackage/pom.xml
+++ b/components/assemblies/cde-components-webpackage/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components-assemblies</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-components-webpackage</artifactId>
diff --git a/components/assemblies/pom.xml b/components/assemblies/pom.xml
index 9cdac785ef..59ceea770a 100644
--- a/components/assemblies/pom.xml
+++ b/components/assemblies/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-components-assemblies</artifactId>
   <packaging>pom</packaging>
diff --git a/components/impls/core/pom.xml b/components/impls/core/pom.xml
index 46c35d27bb..2d80eba417 100644
--- a/components/impls/core/pom.xml
+++ b/components/impls/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components-impls</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-components-impls-core</artifactId>
   <packaging>pom</packaging>
diff --git a/components/impls/osgi/pom.xml b/components/impls/osgi/pom.xml
index 4646babf90..499ce7ff57 100644
--- a/components/impls/osgi/pom.xml
+++ b/components/impls/osgi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components-impls</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-components-impls-osgi</artifactId>
   <packaging>pom</packaging>
diff --git a/components/impls/pentaho/pom.xml b/components/impls/pentaho/pom.xml
index 6deb77deea..1e823867a2 100644
--- a/components/impls/pentaho/pom.xml
+++ b/components/impls/pentaho/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components-impls</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-components-impls-pentaho</artifactId>
   <packaging>pom</packaging>
diff --git a/components/impls/pom.xml b/components/impls/pom.xml
index 58ba57f606..41652af647 100644
--- a/components/impls/pom.xml
+++ b/components/impls/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-components</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-components-impls</artifactId>
   <packaging>pom</packaging>
diff --git a/components/pom.xml b/components/pom.xml
index f5a55b31bf..f487081370 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-components</artifactId>
   <packaging>pom</packaging>
diff --git a/core/impl/pom.xml b/core/impl/pom.xml
index f6543de64f..4a60ae3672 100644
--- a/core/impl/pom.xml
+++ b/core/impl/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-core</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-core-impl</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 2e4354de19..496a97cc8e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-core</artifactId>
   <packaging>pom</packaging>
diff --git a/foundry-extensions/impl/pom.xml b/foundry-extensions/impl/pom.xml
index b4bfec3036..d1741905ad 100644
--- a/foundry-extensions/impl/pom.xml
+++ b/foundry-extensions/impl/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <artifactId>cde-foundry-extensions</artifactId>
     <groupId>org.pentaho.ctools</groupId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cde-foundry-extensions-impl</artifactId>
-  <version>9.6.0.0-SNAPSHOT-16</version>
+  <version>9.6.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Pentaho Community Dashboard Editor Foundry Extensions Implementation</description>
   <dependencies>
diff --git a/foundry-extensions/pom.xml b/foundry-extensions/pom.xml
index b35966e1fd..827a8c8a6f 100644
--- a/foundry-extensions/pom.xml
+++ b/foundry-extensions/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <artifactId>cde-plugin</artifactId>
     <groupId>org.pentaho.ctools</groupId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cde-foundry-extensions</artifactId>
-  <version>9.6.0.0-SNAPSHOT-16</version>
+  <version>9.6.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Pentaho Community Dashboard Editor specifics intended to be available on a Foundry environment</description>
   <modules>
diff --git a/osgi/impl/pom.xml b/osgi/impl/pom.xml
index 5f8eb28255..913b5002fe 100644
--- a/osgi/impl/pom.xml
+++ b/osgi/impl/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-osgi</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-osgi-impl</artifactId>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 1e3d72e4b5..5fb1ce6f78 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-osgi</artifactId>
   <packaging>pom</packaging>
diff --git a/pentaho/impl/pom.xml b/pentaho/impl/pom.xml
index e2fc341976..9470d5bec8 100644
--- a/pentaho/impl/pom.xml
+++ b/pentaho/impl/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-pentaho</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-pentaho-impl</artifactId>
diff --git a/pentaho/pom.xml b/pentaho/pom.xml
index fd96a7825d..a6289e93bb 100644
--- a/pentaho/pom.xml
+++ b/pentaho/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-pentaho</artifactId>
   <packaging>pom</packaging>
diff --git a/samples/pom.xml b/samples/pom.xml
index 8851e5091f..bd91d19a7d 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cde-samples-webpackage</artifactId>
diff --git a/webclient/impls/core/pom.xml b/webclient/impls/core/pom.xml
index 014dc11dc9..b730dad211 100644
--- a/webclient/impls/core/pom.xml
+++ b/webclient/impls/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-webclient-impls</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-webclient-impls-core</artifactId>
   <packaging>pom</packaging>
diff --git a/webclient/impls/pentaho/pom.xml b/webclient/impls/pentaho/pom.xml
index cf641c655d..e54b8ba28f 100644
--- a/webclient/impls/pentaho/pom.xml
+++ b/webclient/impls/pentaho/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-webclient-impls</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-webclient-impls-pentaho</artifactId>
   <packaging>pom</packaging>
diff --git a/webclient/impls/pom.xml b/webclient/impls/pom.xml
index 2f0cdfad05..fe43ce6b4a 100644
--- a/webclient/impls/pom.xml
+++ b/webclient/impls/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-webclient</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-webclient-impls</artifactId>
   <packaging>pom</packaging>
diff --git a/webclient/pom.xml b/webclient/pom.xml
index f91da915f2..908414e1b2 100644
--- a/webclient/pom.xml
+++ b/webclient/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho.ctools</groupId>
     <artifactId>cde-plugin</artifactId>
-    <version>9.6.0.0-SNAPSHOT-16</version>
+    <version>9.6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>cde-webclient</artifactId>
   <packaging>pom</packaging>