diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index c6956c341..52cbffd37 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-clickhouse</name>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index b2fe1f4c7..52f519a4b 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-cockroach</name>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 791dc8ce8..df22399dd 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-db2</name>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 51d2fa142..6c4419ad0 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-h2</name>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index af57b3c3a..ce395d525 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-hana</name>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 16bc22e31..2dbc92405 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-mariadb</name>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 7aa8cd4db..8ff1e5fc4 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-mysql</name>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index fc7d3ee45..81f0ccb58 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-nuodb</name>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 4789950dd..d5c6810e2 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-oracle</name>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index d2deeda02..ed850f5b1 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-postgres</name>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 65c49159a..9af0611f4 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-sqlite</name>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 92e3ee5d6..221911c2b 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-sqlserver</name>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index d7510ac48..450640f69 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean-yugabyte</name>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 76007d421..9eda6f406 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean (all platforms)</name>
diff --git a/composites/pom.xml b/composites/pom.xml
index 8eb5330a0..54005e4be 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index dec80b7ba..ce9eab757 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 02a5f8054..80fa1dd9f 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index b04f0450d..3febbb3d7 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean bom</name>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 10dc6aec1..e97d20395 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index d4c60b55f..80a2d5b27 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 304451a4e..9cf4a81cf 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 4aa5c9797..1c9d846c7 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean ddl generation</name>
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 3cb9e756f..9975772ea 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 74423bcfd..0d06d693f 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <scm>
diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index 53c766ec9..431a33d9a 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index 8f265e04a..902607c7b 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index 76a01303c..386187137 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index da0323c6c..58c5493ac 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 5b5eeb470..d9652f4fc 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean postgis</name>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 9dbe92a31..3db74f935 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean querybean</name>
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index bee5345b1..3a07ee1f8 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 5dd143960..729d576dc 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>ebean test</name>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 57cdad464..c8526a4c8 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>kotlin querybean generator</name>
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 1cf5b1595..8a3e8de01 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 08a882ffe..c1bb67b11 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 19396555d..9fa945b6e 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 8ea46da38..5833de736 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 777c206e9..568e43aa8 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 8c2d30922..863c2252a 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 506edba7c..94579e939 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index ba7bfc76f..f4533a42a 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index b84cb26cc..4c39d1c50 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 28e1af331..1dadcbb09 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 40f008599..2923264d2 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index d8e158dc8..9ce1c6e8d 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 6be4f3220..ca2f626ca 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index bc5f1a7c5..924e5f8f0 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 1f78448c8..aa0707266 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
diff --git a/pom.xml b/pom.xml
index d47764a46..4aa62b5c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.13.1-SNAPSHOT</version>
+  <version>${revision}</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -38,6 +38,7 @@
   </developers>
 
   <properties>
+    <revision>13.13.1-SNAPSHOT</revision>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
     <jackson.version>2.14.0</jackson.version>
     <h2database.version>2.1.214</h2database.version>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 0c0807b51..738e329c4 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.13.1-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/pom.xml b/tests/pom.xml
index ac7678298..c57db4568 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -2,15 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>3.3</version>
-    <relativePath/>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>${revision}</version>
   </parent>
 
-  <groupId>io.ebean</groupId>
   <artifactId>tests</artifactId>
-  <version>1.0</version>
   <packaging>pom</packaging>
 
   <name>tests</name>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 5ff9b930f..658487d31 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -2,10 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>tests</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>${revision}</version>
+  </parent>
 
-  <groupId>io.ebean</groupId>
   <artifactId>test-java16</artifactId>
-  <version>1.0</version>
 
   <properties>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 7c5dec305..e4d79b7d7 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -4,16 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java11-oss</artifactId>
-    <version>3.7</version>
-    <relativePath/>
+    <artifactId>tests</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>${revision}</version>
   </parent>
 
-  <name>test-kotlin</name>
-  <description>Kotlin specific tests</description>
   <artifactId>test-kotlin</artifactId>
-  <version>1.0</version>
 
   <properties>
     <maven.compiler.source>11</maven.compiler.source>