diff --git a/pom.xml b/pom.xml
index ea54c0a9c..02189151c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,9 @@
     <version>1.1</version>
   </parent>
 
-  <groupId>org.avaje.ebean</groupId>
+  <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>9.5.2-SNAPSHOT</version>
+  <version>10.1.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -69,9 +69,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-dbmigration</artifactId>
-      <version>1.2.1</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-dbmigration</artifactId>
+      <version>2.1.1</version>
     </dependency>
 
     <dependency>
@@ -164,7 +164,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>10.1.1-SNAPSHOT</version>
+      <version>10.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -229,7 +229,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>10.1.1-SNAPSHOT</version>
+        <version>10.1.1</version>
         <executions>
           <execution>
             <id>test</id>
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index ed9c28ba2..ca236cd32 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -1,8 +1,8 @@
 package io.ebean.config;
 
 import io.ebean.Platform;
-import org.avaje.dbmigration.MigrationConfig;
-import org.avaje.dbmigration.MigrationRunner;
+import io.ebean.dbmigration.MigrationConfig;
+import io.ebean.dbmigration.MigrationRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 123b8b880..985d85c06 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -1,7 +1,10 @@
 package io.ebean.config;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import io.ebean.EbeanServerFactory;
+import io.ebean.PersistBatch;
 import io.ebean.PersistenceContextScope;
+import io.ebean.Platform;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.Encrypted;
@@ -9,6 +12,7 @@ import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
+import io.ebean.dbmigration.MigrationRunner;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -23,11 +27,7 @@ import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
-import com.fasterxml.jackson.core.JsonFactory;
-import io.ebean.PersistBatch;
-import io.ebean.Platform;
 import org.avaje.datasource.DataSourceConfig;
-import org.avaje.dbmigration.MigrationRunner;
 
 import javax.sql.DataSource;
 import java.util.ArrayList;
diff --git a/src/main/java/io/ebean/dbmigration/DdlGenerator.java b/src/main/java/io/ebean/dbmigration/DdlGenerator.java
index 5d887c978..92a49c402 100644
--- a/src/main/java/io/ebean/dbmigration/DdlGenerator.java
+++ b/src/main/java/io/ebean/dbmigration/DdlGenerator.java
@@ -5,7 +5,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.dbmigration.model.CurrentModel;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
-import org.avaje.dbmigration.ddl.DdlRunner;
+import io.ebean.dbmigration.ddl.DdlRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;