diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index d11bb71f6..52e1f7c3f 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>7.3</version>
+      <version>7.5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ForIPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ForIPlatform.java
index 8271063bb..4e3db3ca5 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ForIPlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ForIPlatform.java
@@ -16,7 +16,7 @@ public class DB2ForIPlatform extends BaseDB2Platform {
 
   public DB2ForIPlatform() {
     super();
-    this.platform = Platform.DB2;
+    this.platform = Platform.DB2FORI;
     // Note: IBM i from 7.1 allow up to to 128
     // TODO: Check if we need to introduce older platform (DB2ForI_6 ? but older documentation is not anymore published on ibm.com),
     this.maxTableNameLength = 128;
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2LuwPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2LuwPlatform.java
index e1268f3d0..967cc2428 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2LuwPlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2LuwPlatform.java
@@ -10,7 +10,7 @@ import io.ebean.annotation.Platform;
 public class DB2LuwPlatform extends BaseDB2Platform {
   public DB2LuwPlatform() {
     super();
-    this.platform = Platform.DB2; // TODO DB2LUW
+    this.platform = Platform.DB2LUW;
     this.maxTableNameLength = 128;
     this.maxConstraintNameLength = 128;
   }
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ZosPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ZosPlatform.java
index 10cf70f8f..2cb4cb35b 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ZosPlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2ZosPlatform.java
@@ -11,7 +11,7 @@ import io.ebean.annotation.Platform;
 public class DB2ZosPlatform extends BaseDB2Platform {
   public DB2ZosPlatform() {
     super();
-    this.platform = Platform.DB2; // TODO DB2ZOS
+    this.platform = Platform.DB2ZOS;
     this.maxTableNameLength = 128;
     this.maxConstraintNameLength = 128;
   }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 4add6fe13..f8c4855a8 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -24,7 +24,10 @@ import io.ebean.config.PropertiesWrapper;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform;
 import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
-import io.ebean.config.dbplatform.db2.DB2Platform;
+import io.ebean.config.dbplatform.db2.DB2ForIPlatform;
+import io.ebean.config.dbplatform.db2.DB2LegacyPlatform;
+import io.ebean.config.dbplatform.db2.DB2LuwPlatform;
+import io.ebean.config.dbplatform.db2.DB2ZosPlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
@@ -831,7 +834,14 @@ public class DefaultDbMigration implements DbMigration {
       case SQLSERVER:
         throw new IllegalArgumentException("Please choose the more specific SQLSERVER16 or SQLSERVER17 platform. Refer to issue #1340 for details");
       case DB2:
-        return new DB2Platform();
+        logger.warn("Using DB2LegacyPlatform. It is recommended to migrate to db2luw/db2zos/db2fori. Refer to issue #xxxx for details");
+        return new DB2LegacyPlatform();
+      case DB2LUW:
+        return new DB2LuwPlatform();
+      case DB2ZOS:
+        return new DB2ZosPlatform();
+      case DB2FORI:
+        return new DB2ForIPlatform();
       case SQLITE:
         return new SQLitePlatform();
       case HANA: