diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 7888380..2a0cff2 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 1658ebf..33d7d38 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-amqp</artifactId>
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 02e8386..9761490 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index b0305e2..8a6784b 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-broker</artifactId>
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index c5d05fe..143081f 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-camel</artifactId>
diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml
index 9ff459e..17d9cdf 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-cf</artifactId>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 3374638..1830d29 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-client</artifactId>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 138b7f9..676fb33 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 365c585..f8ba02a 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-http</artifactId>
diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml
index d918c73..6ab2821 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-itests-spring31</artifactId>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 2f1afdf..3b9d31f 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index df57138..f1df304 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-jdbc-store</artifactId>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index 7004f1f..94e8187 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-jms-pool</artifactId>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 8773935..fd11af8 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-kahadb-store</artifactId>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index e6d137c..d964e2a 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-karaf-itest</artifactId>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 53f17e7..b36ed5e 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index c9e3d8e..6127e9f 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-leveldb-store</artifactId>
diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml
index 6dee085..e9f5054 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-log4j-appender</artifactId>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index ad70e00..96380a9 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-mqtt</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index e41303a..dfefe53 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-openwire-generator</artifactId>
diff --git a/activemq-openwire-legacy/pom.xml b/activemq-openwire-legacy/pom.xml
index f2aa89c..9c1ac38 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-openwire-legacy</artifactId>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 3e619db..a74b98a 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-osgi</artifactId>
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index 1358df5..c87987b 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-partition</artifactId>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index ea457038..e4d5404 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-pool</artifactId>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 64613ef..e93cb13 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index e529674..7d33854 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index 1faeaef..4752260 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-run</artifactId>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index 6cbeffc..8e7e20f 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-runtime-config</artifactId>
diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml
index eb50ccb..5f4e5b5 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.4-SNAPSHOT</version>
+        <version>5.16.4</version>
     </parent>
 
     <artifactId>activemq-shiro</artifactId>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 132e3e9..c61bf9a 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-spring</artifactId>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index e8df216..e9d6951 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-stomp</artifactId>
diff --git a/activemq-tooling/activemq-junit/pom.xml b/activemq-tooling/activemq-junit/pom.xml
index 19f5a79..7759770 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.4-SNAPSHOT</version>
+    <version>5.16.4</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 d524ff4..c61a629 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.4-SNAPSHOT</version>
+    <version>5.16.4</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 7995a49..a5f9a37 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.4-SNAPSHOT</version>
+    <version>5.16.4</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 0edbb09..1ccdd53 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-perf-maven-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index b47f95a..60415a4 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 47b77ce..199d4c1 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-unit-tests</artifactId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 00018d8..5aadade 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 449e7b5..5306573 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index ad25e27..5020912 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6737b7f..543b0d4 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.4-SNAPSHOT</version>
+    <version>5.16.4</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
diff --git a/pom.xml b/pom.xml
index ca62033..5cdf777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>5.16.4-SNAPSHOT</version>
+  <version>5.16.4</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
   <inceptionYear>2005</inceptionYear>
@@ -253,7 +253,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.0</tag>
+    <tag>activemq-5.16.4</tag>
   </scm>
 
   <dependencyManagement>