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/mssql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
index 5b6b3b93f1..34ff7ef1a7 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -21,9 +21,10 @@ IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[D
 CREATE TABLE DM_DEVICE_CERTIFICATE (
   ID INTEGER IDENTITY(1,1) NOT NULL,
   SERIAL_NUMBER VARCHAR(500) DEFAULT NULL,
-  CERTIFICATE   VARBINARY(max) DEFAULT NULL,
-  TENANT_ID     INTEGER DEFAULT 0,
-  USERNAME      VARCHAR(500) DEFAULT NULL,
+  CERTIFICATE VARBINARY(max) DEFAULT NULL,
+  TENANT_ID INTEGER DEFAULT 0,
+  DEVICE_IDENTIFIER VARCHAR(300),
+  USERNAME VARCHAR(500) DEFAULT NULL,
 PRIMARY KEY (ID)
 );
 
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 (
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 6cc55f7e74..708f135b78 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -24,10 +24,11 @@ WHEN (NEW.ID IS NULL)
 /
 
 CREATE TABLE DM_DEVICE_CERTIFICATE (
-  ID                    NUMBER(10) NOT NULL,
-  SERIAL_NUMBER         VARCHAR2(500) DEFAULT NULL,
-  CERTIFICATE           BLOB DEFAULT NULL,
+  ID NUMBER(10) NOT NULL,
+  SERIAL_NUMBER VARCHAR2(500) DEFAULT NULL,
+  CERTIFICATE BLOB DEFAULT NULL,
   TENANT_ID NUMBER(10) DEFAULT 0,
+  DEVICE_IDENTIFIER VARCHAR(300),
   USERNAME  VARCHAR2(500) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index b1fc128cf9..3ff77c0242 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -830,4 +830,15 @@ CREATE TABLE SUB_OPERATION_TEMPLATE (
 
 -- END OF SUB_OPERATION_TEMPLATE TABLE--
 
+CREATE SEQUENCE DM_DEVICE_CERTIFICATE_seq;
+
+CREATE TABLE DM_DEVICE_CERTIFICATE (
+  ID NUMBER(10) NOT NULL,
+  SERIAL_NUMBER VARCHAR2(500) DEFAULT NULL,
+  CERTIFICATE BLOB DEFAULT NULL,
+  TENANT_ID NUMBER(10) DEFAULT 0,
+  DEVICE_IDENTIFIER VARCHAR(300),
+  USERNAME  VARCHAR2(500) DEFAULT NULL,
+  PRIMARY KEY (ID)
+)