diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml
index 6f56976..ef4bce0 100644
--- a/apache-qpid-broker-j/pom.xml
+++ b/apache-qpid-broker-j/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index 28886d9..2229ed8 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-bdbstore</artifactId>
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index c0f111d..4d77176 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml
index c3ab944..febddc6 100644
--- a/broker-codegen/pom.xml
+++ b/broker-codegen/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-broker-codegen</artifactId>
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 62af2cb..383ed52 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-broker-core</artifactId>
diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml
index 34c6b47..e7ad76f 100644
--- a/broker-plugins/access-control/pom.xml
+++ b/broker-plugins/access-control/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-0-10-protocol/pom.xml b/broker-plugins/amqp-0-10-protocol/pom.xml
index 22e46d8..b75adb0 100644
--- a/broker-plugins/amqp-0-10-protocol/pom.xml
+++ b/broker-plugins/amqp-0-10-protocol/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-0-8-protocol/pom.xml b/broker-plugins/amqp-0-8-protocol/pom.xml
index 90ab21e..afcb7d2 100644
--- a/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/broker-plugins/amqp-0-8-protocol/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-1-0-bdb-store/pom.xml b/broker-plugins/amqp-1-0-bdb-store/pom.xml
index c626ae6..bda51e0 100644
--- a/broker-plugins/amqp-1-0-bdb-store/pom.xml
+++ b/broker-plugins/amqp-1-0-bdb-store/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/broker-plugins/amqp-1-0-jdbc-store/pom.xml b/broker-plugins/amqp-1-0-jdbc-store/pom.xml
index e6d93ab..bad0afb 100644
--- a/broker-plugins/amqp-1-0-jdbc-store/pom.xml
+++ b/broker-plugins/amqp-1-0-jdbc-store/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/broker-plugins/amqp-1-0-protocol/pom.xml b/broker-plugins/amqp-1-0-protocol/pom.xml
index 03b8a4d..51beb8a 100644
--- a/broker-plugins/amqp-1-0-protocol/pom.xml
+++ b/broker-plugins/amqp-1-0-protocol/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
index d821981..9be0e86 100644
--- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
index f08129f..5f9ca5f 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
index 3b016ef..c14a305 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/derby-store/pom.xml b/broker-plugins/derby-store/pom.xml
index 39cdf72..8ddddf9 100644
--- a/broker-plugins/derby-store/pom.xml
+++ b/broker-plugins/derby-store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/jdbc-logging-logback/pom.xml b/broker-plugins/jdbc-logging-logback/pom.xml
index 8e9ac91..539ee08 100644
--- a/broker-plugins/jdbc-logging-logback/pom.xml
+++ b/broker-plugins/jdbc-logging-logback/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/jdbc-provider-bone/pom.xml b/broker-plugins/jdbc-provider-bone/pom.xml
index 0cfcc8f..2cea022 100644
--- a/broker-plugins/jdbc-provider-bone/pom.xml
+++ b/broker-plugins/jdbc-provider-bone/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/jdbc-store/pom.xml b/broker-plugins/jdbc-store/pom.xml
index f92309d..17ce1f8 100644
--- a/broker-plugins/jdbc-store/pom.xml
+++ b/broker-plugins/jdbc-store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/logging-logback/pom.xml b/broker-plugins/logging-logback/pom.xml
index a5daa92..d93c505 100644
--- a/broker-plugins/logging-logback/pom.xml
+++ b/broker-plugins/logging-logback/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/management-amqp/pom.xml b/broker-plugins/management-amqp/pom.xml
index 464e4f6..d039578 100644
--- a/broker-plugins/management-amqp/pom.xml
+++ b/broker-plugins/management-amqp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/broker-plugins/management-http/pom.xml b/broker-plugins/management-http/pom.xml
index 51127f4..a05afad 100644
--- a/broker-plugins/management-http/pom.xml
+++ b/broker-plugins/management-http/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/memory-store/pom.xml b/broker-plugins/memory-store/pom.xml
index 5f81e7c..b2c391a 100644
--- a/broker-plugins/memory-store/pom.xml
+++ b/broker-plugins/memory-store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/prometheus-exporter/pom.xml b/broker-plugins/prometheus-exporter/pom.xml
index 7f36868..6839e5a 100644
--- a/broker-plugins/prometheus-exporter/pom.xml
+++ b/broker-plugins/prometheus-exporter/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/broker-plugins/websocket/pom.xml b/broker-plugins/websocket/pom.xml
index 312f14f..eede207 100644
--- a/broker-plugins/websocket/pom.xml
+++ b/broker-plugins/websocket/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/broker/pom.xml b/broker/pom.xml
index 2aaa7ec..f40904a 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-broker</artifactId>
diff --git a/doc/developer-guide/pom.xml b/doc/developer-guide/pom.xml
index 4fc5285..06ba6f2 100644
--- a/doc/developer-guide/pom.xml
+++ b/doc/developer-guide/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
     </parent>
 
     <artifactId>qpid-broker-j-developer-guide</artifactId>
diff --git a/doc/java-broker/pom.xml b/doc/java-broker/pom.xml
index e41bb4a..70daf6f 100644
--- a/doc/java-broker/pom.xml
+++ b/doc/java-broker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
     </parent>
 
     <artifactId>qpid-java-doc-broker</artifactId>
diff --git a/doc/java-perftests/pom.xml b/doc/java-perftests/pom.xml
index b395f42..88bfd29 100644
--- a/doc/java-perftests/pom.xml
+++ b/doc/java-perftests/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
     </parent>
 
     <artifactId>qpid-java-doc-perftests</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index 7b60a10..15195de 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
     </parent>
 
     <artifactId>qpid-java-doc</artifactId>
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index f73580c..1386e89 100644
--- a/joramtests/pom.xml
+++ b/joramtests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/perftests/pom.xml b/perftests/pom.xml
index ff16b9b..569a2c6 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-perftests</artifactId>
diff --git a/perftests/visualisation-jfc/pom.xml b/perftests/visualisation-jfc/pom.xml
index 6685ea5..b182867 100644
--- a/perftests/visualisation-jfc/pom.xml
+++ b/perftests/visualisation-jfc/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 8d60c87..6cd2101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-parent</artifactId>
-  <version>8.0.6-SNAPSHOT</version>
+  <version>8.0.6</version>
   <packaging>pom</packaging>
 
   <name>Apache Qpid Broker-J Parent</name>
@@ -65,7 +65,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/qpid-broker-j.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf/qpid-broker-j.git</url>
-    <tag>7.0.x</tag>
+    <tag>8.0.6</tag>
   </scm>
 
   <distributionManagement>
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 0f42419..fb5315e 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index c0598e2..a79aa1a 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-systests-parent</artifactId>
-  <version>8.0.6-SNAPSHOT</version>
+  <version>8.0.6</version>
   <packaging>pom</packaging>
   <name>Apache Qpid Broker-J System Test Parent</name>
   <description>Parent POM for Qpid system testing modules</description>
diff --git a/qpid-test-utils/pom.xml b/qpid-test-utils/pom.xml
index 21c018d..6c4fa49 100644
--- a/qpid-test-utils/pom.xml
+++ b/qpid-test-utils/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-test-utils</artifactId>
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 17658a9..773d5b0 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml
index 69e5282..53659d4 100644
--- a/systests/protocol-tests-amqp-0-10/pom.xml
+++ b/systests/protocol-tests-amqp-0-10/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml
index 0f48b0b..a3c5376 100644
--- a/systests/protocol-tests-amqp-0-8/pom.xml
+++ b/systests/protocol-tests-amqp-0-8/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml
index 9d3fb8a..e126480 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-core/pom.xml b/systests/protocol-tests-core/pom.xml
index 8930336..04a8d52 100644
--- a/systests/protocol-tests-core/pom.xml
+++ b/systests/protocol-tests-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml
index e5363d4..2877a92 100644
--- a/systests/qpid-systests-http-management/pom.xml
+++ b/systests/qpid-systests-http-management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/qpid-systests-jms-core/pom.xml b/systests/qpid-systests-jms-core/pom.xml
index 6656e50..150d115 100644
--- a/systests/qpid-systests-jms-core/pom.xml
+++ b/systests/qpid-systests-jms-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml
index ded25c4..02964a3 100644
--- a/systests/qpid-systests-jms_1.1/pom.xml
+++ b/systests/qpid-systests-jms_1.1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/qpid-systests-jms_2.0/pom.xml b/systests/qpid-systests-jms_2.0/pom.xml
index 969f080..ba10609 100644
--- a/systests/qpid-systests-jms_2.0/pom.xml
+++ b/systests/qpid-systests-jms_2.0/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
     <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/systests/qpid-systests-spawn-admin/pom.xml b/systests/qpid-systests-spawn-admin/pom.xml
index 88f6033..57705d5 100644
--- a/systests/qpid-systests-spawn-admin/pom.xml
+++ b/systests/qpid-systests-spawn-admin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/systests-utils/pom.xml b/systests/systests-utils/pom.xml
index d50cfba..3e850d6 100644
--- a/systests/systests-utils/pom.xml
+++ b/systests/systests-utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/pom.xml b/tck/pom.xml
index 7da420b..bef5efa 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>8.0.6-SNAPSHOT</version>
+        <version>8.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index 009a925..00868d0 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>8.0.6-SNAPSHOT</version>
+    <version>8.0.6</version>
   </parent>
 
   <artifactId>qpid-tools</artifactId>