diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index b9f42fca3b..95b236c858 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index b967b97e27..bf037bd71a 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-amqp</artifactId>
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index ab57b0eef7..ef7f94a57a 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 6c031b99b0..97693d1532 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-broker</artifactId>
diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml
index 14f3af5829..473b8600b9 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-cf</artifactId>
diff --git a/activemq-client-jakarta/pom.xml b/activemq-client-jakarta/pom.xml
index e1e2144441..71095ec944 100644
--- a/activemq-client-jakarta/pom.xml
+++ b/activemq-client-jakarta/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-parent</artifactId>
-        <version>5.18.5-SNAPSHOT</version>
+        <version>5.18.5</version>
     </parent>
     <artifactId>activemq-client-jakarta</artifactId>
     <packaging>bundle</packaging>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index b295c97a88..bf3f0e7c54 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-client</artifactId>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 8dabe10043..edbf723728 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 317994597b..3d9e76084e 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-http</artifactId>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 28f07c843d..848756cadf 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index 9fc5d41c91..84d1d7b4bf 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-jdbc-store</artifactId>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index fdf36dad37..de38abfc39 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-jms-pool</artifactId>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 6021ef94b1..8256fe04d9 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-kahadb-store</artifactId>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index 0dec16d4af..9d2a8c0030 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-karaf-itest</artifactId>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 8351bf0f70..b5aa7cd18a 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>
diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml
index 34a727a890..eeeab032d5 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-log4j-appender</artifactId>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index 95598b7da5..1da43f5b24 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-mqtt</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index 52182aaf36..6dfd2207cd 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-openwire-generator</artifactId>
diff --git a/activemq-openwire-legacy/pom.xml b/activemq-openwire-legacy/pom.xml
index c0b36001dc..50db943335 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-openwire-legacy</artifactId>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 748fe478ee..530de25194 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-osgi</artifactId>
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index b91772fed7..9d14df166d 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-partition</artifactId>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index f3c7f59511..39bd5ac3fc 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-pool</artifactId>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index a92fb82025..a633d7662e 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 5480fb1cfd..35f4d17c96 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index 7b9e756907..9e63dc9dc4 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-run</artifactId>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index 00b32d88ee..e164a6b0c8 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-runtime-config</artifactId>
diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml
index a7a9358c3f..e5a4a8f671 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.18.5-SNAPSHOT</version>
+        <version>5.18.5</version>
     </parent>
 
     <artifactId>activemq-shiro</artifactId>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 88c3e28987..26953f0eec 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-spring</artifactId>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index c0f59c6754..4101131d3a 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-stomp</artifactId>
diff --git a/activemq-tooling/activemq-junit/pom.xml b/activemq-tooling/activemq-junit/pom.xml
index 3978b9b5a5..3d7b0db5b6 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</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 fa2a901f8d..1211ab3b50 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</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 fac9073432..d70a041704 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</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 bb4923438c..dbf6047211 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-perf-maven-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index a1bee49708..367b7f485e 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 8e0afc9e1d..c4606d042d 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-unit-tests</artifactId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index d003c310e1..5a70a4e535 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 826e8cb0e5..013c8f77c5 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 0a143e550a..802350fb0b 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3f022fccf1..0ad4ed2dab 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.18.5-SNAPSHOT</version>
+    <version>5.18.5</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
diff --git a/pom.xml b/pom.xml
index a296349dfa..d6e7ff1543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,14 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>5.18.5-SNAPSHOT</version>
+  <version>5.18.5</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
   <inceptionYear>2005</inceptionYear>
 
   <properties>
     <!-- for reproducible builds -->	
-    <project.build.outputTimestamp>2024-04-08T06:25:24Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-18T12:46:34Z</project.build.outputTimestamp>
 
     <activeio-version>3.1.4</activeio-version>
     <siteId>activemq-${project.version}</siteId>
@@ -246,7 +246,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>main</tag>
+    <tag>activemq-5.18.5</tag>
   </scm>
 
   <dependencyManagement>