diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index ae06c46a0..307df6dcb 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index fb3634d2e..a79d31bd8 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 8f01686a4..53c91b635 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 0d14f9c1a..c0e1169cd 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 3a6b8154c..c5a1f7cda 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 170cee3b1..c9af427ac 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 2b2f2c8ca..c5170b722 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index fa32a46b6..fc3f81002 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index cc35219a5..c37d4e2e8 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index ac801ffa5..c7212f383 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 249a3d283..aee19d4b4 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index e68ea52fc..d74093575 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 1dd8857ef..d089e2354 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 1d2393de8..43b0a8188 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index a6879ba32..0400890a3 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 8cc04bbae..182eeeca3 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index ac7869953..7e51ff4b0 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index a9d12773b..61bceac1e 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,94 +71,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.3.1-FOC1-SNAPSHOT</version>
+        <version>13.3.1-FOC1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 6ba8ee295..34eda87a8 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e8c6f317d..a8fc8911b 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <dependencies>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index 5aec33b2b..1c5ed640a 100644
--- a/ebean-dbmigration-runner/pom.xml
+++ b/ebean-dbmigration-runner/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 00a8d7325..26e72be3d 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index d09015609..2dec41ed4 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 18af4f221..196c2b6d8 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index fed57c104..dde4e67f2 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +48,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 6f80cfed0..2f1fecf68 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 1bbfdb568..ff3666682 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index b88f9d4a9..4789dfc91 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 62f3c3720..bae4f2eec 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -106,14 +106,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index d334edab1..d5f59d99d 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index edbef8843..87014117a 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 8b69df730..e3b49e654 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 176f33763..f0d75b963 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index a8f880846..711fde0e5 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index c4e17aeaf..dddee4f8c 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 6a7b4ab84..7b200c0eb 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 2a401a0d7..b042d58c5 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 460d49e9d..a7626d718 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 0fa3d31ef..2e0c23db0 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 3c75f8710..e8e6b2439 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 737b57d3a..a350d6743 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index aedcdec5f..409d5e4b3 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index b51bb30dc..45620614b 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 8a24b1e9c..8fc086f08 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index e788b0846..371c0de11 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index fd8df2d27..473a798d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.3.1-FOC1-SNAPSHOT</version>
+  <version>13.3.1-FOC1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 53a213262..6eeb9d482 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.3.1-FOC1-SNAPSHOT</version>
+    <version>13.3.1-FOC1</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/pom.xml b/tests/pom.xml
index fb11b1c8f..ede2c5d78 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>tests</artifactId>
-  <version>1.0</version>
+  <version>13.3.1-FOC1</version>
   <packaging>pom</packaging>
 
   <name>tests</name>
@@ -43,7 +43,7 @@
 
 
   <scm>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.3.1-FOC1</tag>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
   </scm>
 </project>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 620894090..1c50f1a81 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
 
   <groupId>io.ebean</groupId>
   <artifactId>test-java16</artifactId>
-  <version>1.0</version>
+  <version>13.3.1-FOC1</version>
 
   <properties>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
@@ -15,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC1-SNAPSHOT</version>
+      <version>13.3.1-FOC1</version>
       <scope>test</scope>
     </dependency>