diff --git a/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mssql.sql b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mssql.sql
new file mode 100644
index 00000000..e2f7e6d5
--- /dev/null
+++ b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mssql.sql
@@ -0,0 +1,3 @@
+ALTER TABLE DM_ENROLMENT ALTER COLUMN OWNER VARCHAR (255) NOT NULL;
+
+ALTER TABLE DM_GROUP ALTER COLUMN OWNER VARCHAR (255) DEFAULT NULL;
diff --git a/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mysql.sql b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mysql.sql
new file mode 100644
index 00000000..99d8db97
--- /dev/null
+++ b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mysql.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `DM_ENROLMENT`
+CHANGE COLUMN `OWNER` `OWNER` VARCHAR(255) NOT NULL;
+
+ALTER TABLE `DM_GROUP`
+CHANGE COLUMN `OWNER` `OWNER` VARCHAR(255) NULL DEFAULT NULL;
diff --git a/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-postgres.sql b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-postgres.sql
new file mode 100644
index 00000000..a5fb68f7
--- /dev/null
+++ b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-postgres.sql
@@ -0,0 +1,3 @@
+ALTER TABLE dm_enrolment ALTER COLUMN owner TYPE character varying(255);
+
+ALTER TABLE dm_group ALTER COLUMN owner TYPE character varying(255);