diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index cfe80387b5..d62c17355f 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 302a272cd7..f121e19f55 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-amqp</artifactId>
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 09ff02ab02..02e8386b50 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 0f41933f67..0eec7839aa 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-broker</artifactId>
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 5ff5138c64..9db9b797da 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-camel</artifactId>
diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml
index 6a29f1bced..653a2fb37b 100644
--- a/activemq-cf/pom.xml
+++ b/activemq-cf/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-cf</artifactId>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index a46377a9fe..30ba7533e8 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-client</artifactId>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index c38392e51d..b960b8d16d 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 4a3cd77c59..0d4eb16436 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-http</artifactId>
diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml
index 9fb24fc0a4..7bdc7d2b81 100644
--- a/activemq-itests-spring31/pom.xml
+++ b/activemq-itests-spring31/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-itests-spring31</artifactId>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 7065f44301..7c40d1198d 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index a661a9a074..49f7518a9b 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jdbc-store</artifactId>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index 8d75ca9baf..31a7148b5a 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jms-pool</artifactId>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index c8b7392dc6..53eaeb1e63 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-kahadb-store</artifactId>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index dc5e23c01a..b6c2de9bde 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-karaf-itest</artifactId>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 9ea4e9c874..00b188533b 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index c2c2dfc731..f6158a85af 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-leveldb-store</artifactId>
diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml
index 71ed6b4f2d..79d7052954 100644
--- a/activemq-log4j-appender/pom.xml
+++ b/activemq-log4j-appender/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-log4j-appender</artifactId>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index fc6255a749..bb0af505f9 100644
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-mqtt</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index 74382d7a5d..e41303a4d3 100644
--- a/activemq-openwire-generator/pom.xml
+++ b/activemq-openwire-generator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-openwire-generator</artifactId>
diff --git a/activemq-openwire-legacy/pom.xml b/activemq-openwire-legacy/pom.xml
index c4b1dab2c7..f2aa89c293 100644
--- a/activemq-openwire-legacy/pom.xml
+++ b/activemq-openwire-legacy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-openwire-legacy</artifactId>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index ebd952e6ee..8656b41419 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-osgi</artifactId>
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index a4410e788c..e5f063597c 100644
--- a/activemq-partition/pom.xml
+++ b/activemq-partition/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-partition</artifactId>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index 6f3e838fe5..9dffad7556 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-pool</artifactId>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index e711ef2654..c9c3fe2db0 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 8dfa9899f1..43f4359252 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index 2eb0e30f6a..1faeaef06e 100644
--- a/activemq-run/pom.xml
+++ b/activemq-run/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-run</artifactId>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index 99d1962739..138e58aa2c 100644
--- a/activemq-runtime-config/pom.xml
+++ b/activemq-runtime-config/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-runtime-config</artifactId>
diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml
index 4ecf12157f..373e7a8cc0 100644
--- a/activemq-shiro/pom.xml
+++ b/activemq-shiro/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-parent</artifactId>
-        <version>5.16.3</version>
+        <version>5.16.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>activemq-shiro</artifactId>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index fc4f55b034..9774b0b4d5 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-spring</artifactId>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index 0b1d898b39..1753337234 100644
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-stomp</artifactId>
diff --git a/activemq-tooling/activemq-junit/pom.xml b/activemq-tooling/activemq-junit/pom.xml
index 69e261b70d..19f5a79453 100644
--- a/activemq-tooling/activemq-junit/pom.xml
+++ b/activemq-tooling/activemq-junit/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-junit</artifactId>
diff --git a/activemq-tooling/activemq-maven-plugin/pom.xml b/activemq-tooling/activemq-maven-plugin/pom.xml
index 321340a252..d524ff461b 100644
--- a/activemq-tooling/activemq-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-maven-plugin</artifactId>
diff --git a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
index 90b8d7ad0b..7995a49ca8 100644
--- a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-memtest-maven-plugin</artifactId>
diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
index 0b472107d0..54b813298b 100644
--- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-perf-maven-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index c8c75d1da8..b47f95a67d 100644
--- a/activemq-tooling/pom.xml
+++ b/activemq-tooling/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 1dd4e36754..01962d5d78 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-unit-tests</artifactId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 6f30360f8f..0d4197aa0f 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 6750b26600..79cf159bd4 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 2027ed30da..e064ef4654 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ee343b5d8b..cf8dcd2921 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.16.3</version>
+    <version>5.16.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
diff --git a/pom.xml b/pom.xml
index 13edd8c36e..7148f15a54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>5.16.3</version>
+  <version>5.16.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
   <inceptionYear>2005</inceptionYear>
@@ -249,7 +249,7 @@
     <connection>scm:git:http://gitbox.apache.org/repos/asf/activemq.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/activemq.git</developerConnection>
     <url>https://github.com/apache/activemq</url>
-    <tag>activemq-5.16.3</tag>
+    <tag>activemq-5.16.0</tag>
   </scm>
 
   <dependencyManagement>