diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 34f8ca3bc..3d6c59430 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -1,13 +1,24 @@
 <?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">
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
-  </parent>
+<!--  <parent>-->
+<!--    <artifactId>ebean-parent</artifactId>-->
+<!--    <groupId>io.ebean</groupId>-->
+<!--    <version>12.5.1-SNAPSHOT</version>-->
+<!--  </parent>-->
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.avaje</groupId>
+    <artifactId>java8-oss</artifactId>
+    <version>2.2</version>
+  </parent>
 
+  <scm>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
   <artifactId>ebean-querybean</artifactId>
+  <groupId>io.ebean</groupId>
+  <version>12.5.0-SNAPSHOT</version>
 
   <dependencies>
 
@@ -15,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1-SNAPSHOT</version>
+      <version>12.5.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +66,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.5.1-SNAPSHOT</version>
+      <version>12.5.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index cba0f9743..6ec615152 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -1,14 +1,26 @@
 <?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">
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
-  </parent>
+<!--  <parent>-->
+<!--    <artifactId>ebean-parent</artifactId>-->
+<!--    <groupId>io.ebean</groupId>-->
+<!--    <version>12.5.1-SNAPSHOT</version>-->
+<!--  </parent>-->
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.avaje</groupId>
+    <artifactId>java8-oss</artifactId>
+    <version>2.2</version>
+  </parent>
 
+  <scm>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
+  <groupId>io.ebean</groupId>
   <artifactId>ebean-test</artifactId>
+  <version>12.5.0-SNAPSHOT</version>
 
   <dependencies>
 
@@ -22,14 +34,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1-SNAPSHOT</version>
+      <version>12.5.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.1-SNAPSHOT</version>
+      <version>12.5.0</version>
     </dependency>
 
     <dependency>