diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
index 20786cfe2d..b3bc1c36ea 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -9,12 +9,13 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
 );
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER auto_increment NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  BLOB DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
+      ID INTEGER auto_increment NOT NULL,
+      SERIAL_NUMBER VARCHAR(500) DEFAULT NULL,
+      CERTIFICATE BLOB DEFAULT NULL,
+      TENANT_ID INTEGER DEFAULT 0,
+      DEVICE_IDENTIFIER VARCHAR(300),
+      USERNAME  VARCHAR(500) DEFAULT NULL,
+      PRIMARY KEY (ID)
 );
 
 CREATE TABLE IF NOT EXISTS DM_GROUP (
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
index 86da197b12..e55274e49f 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -13,12 +13,13 @@ CREATE INDEX IDX_DEVICE_NAME ON DM_DEVICE_TYPE (NAME);
 CREATE INDEX IDX_DEVICE_TYPE_DEVICE_NAME ON DM_DEVICE_TYPE(ID, NAME);
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER auto_increment NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  BLOB DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
+      ID INTEGER auto_increment NOT NULL,
+      SERIAL_NUMBER VARCHAR(500) DEFAULT NULL,
+      CERTIFICATE BLOB DEFAULT NULL,
+      TENANT_ID INTEGER DEFAULT 0,
+      DEVICE_IDENTIFIER VARCHAR(300),
+      USERNAME  VARCHAR(500) DEFAULT NULL,
+      PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
 CREATE TABLE IF NOT EXISTS DM_GROUP (