diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml
index a168989..f0ccdb9 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index 2fa1c4b..2130ea8 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-bdbstore</artifactId>
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 44defbf..9f94e2f 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml
index d7bd655..bcec3a9 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-broker-codegen</artifactId>
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 228080d..52089db 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-broker-core</artifactId>
diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml
index 44f06c4..be76c2b 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 60a528e..b5da82f 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 ff26411..331b82c 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 c655dcf..17b75b6 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 ff93bf7..4b647ed 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 8287500..d2f6163 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 a0e1f01..4cf9ec5 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 524deb6..c0b3106 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 d354132..6ea2961 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/derby-store/pom.xml b/broker-plugins/derby-store/pom.xml
index 8e0dc48..ed9d930 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 bccaf42..83870b0 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 f9c448a..6c9f629 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/jdbc-store/pom.xml b/broker-plugins/jdbc-store/pom.xml
index 65f7bcc..c3fe773 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/logging-logback/pom.xml b/broker-plugins/logging-logback/pom.xml
index e85bdde..f0e6bb9 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/management-amqp/pom.xml b/broker-plugins/management-amqp/pom.xml
index 35e26c1..a61dcc9 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/broker-plugins/management-http/pom.xml b/broker-plugins/management-http/pom.xml
index db5bf9b..dc83e99 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/memory-store/pom.xml b/broker-plugins/memory-store/pom.xml
index 7bbbfb3..b98dc36 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/websocket/pom.xml b/broker-plugins/websocket/pom.xml
index 05e0113..ad4a988 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/broker/pom.xml b/broker/pom.xml
index 2fae9b1..59b4b49 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-broker</artifactId>
diff --git a/doc/java-broker/pom.xml b/doc/java-broker/pom.xml
index aa91f13..fdaa07a 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
     </parent>
 
     <artifactId>qpid-java-doc-broker</artifactId>
diff --git a/doc/java-perftests/pom.xml b/doc/java-perftests/pom.xml
index aacd28e..91b5290 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
     </parent>
 
     <artifactId>qpid-java-doc-perftests</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index 2cd0847..3e920bb 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
     </parent>
 
     <artifactId>qpid-java-doc</artifactId>
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index 3a15edf..106fd86 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/perftests/pom.xml b/perftests/pom.xml
index 44fbdf7..ea38347 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-perftests</artifactId>
diff --git a/perftests/visualisation-jfc/pom.xml b/perftests/visualisation-jfc/pom.xml
index 970a04a..555290a 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index b4b5b6a..42039cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-parent</artifactId>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.8</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.1.x</tag>
+    <tag>7.1.8</tag>
   </scm>
 
   <distributionManagement>
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 64e4812..fa31014 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
     <relativePath>../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index cf30ccf..c392a50 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-systests-parent</artifactId>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.8</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 166dc0d..d530feb 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 5dfe09b..cdc42b0 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 6c368c0..536d885 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 7fae3c9..5978e2a 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 2365672..f9c541e 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 ef3043f..5332f8c 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 741020b..5c487ec 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 b729c42..aafb368 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 a33dd18..32a23a9 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 5124a34..e3a6101 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</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 8f1cf45..93d6b3c 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/systests-utils/pom.xml b/systests/systests-utils/pom.xml
index b731f81..e9b72cf 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</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 03c48c8..159987f 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>7.1.8-SNAPSHOT</version>
+        <version>7.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index 86d9480..7cb436f 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>7.1.8-SNAPSHOT</version>
+    <version>7.1.8</version>
   </parent>
 
   <artifactId>qpid-tools</artifactId>