diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
index 5a7881793a..e63b0e587b 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -422,6 +422,8 @@ CREATE TABLE IF NOT EXISTS DM_APP_ICONS (
     ICON_PATH VARCHAR(150) DEFAULT NULL,
     PACKAGE_NAME VARCHAR(150) NOT NULL,
     VERSION VARCHAR(50) DEFAULT '1.1.0',
+    CREATED_TIMESTAMP TIMESTAMP NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID)
 );
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
index b12f586bcf..64b91b05f6 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -452,6 +452,8 @@ CREATE TABLE DM_APP_ICONS (
     ICON_PATH VARCHAR(150) DEFAULT NULL,
     PACKAGE_NAME VARCHAR(150) NOT NULL,
     VERSION VARCHAR(50) DEFAULT '1.1.0',
+    CREATED_TIMESTAMP DATETIME2 NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID)
 );
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
index 001d9eb5db..14535f3e7a 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -463,6 +463,8 @@ CREATE TABLE IF NOT EXISTS DM_APP_ICONS (
     ICON_PATH VARCHAR(150) DEFAULT NULL,
     PACKAGE_NAME VARCHAR(150) NOT NULL,
     VERSION VARCHAR(50) DEFAULT '1.1.0',
+    CREATED_TIMESTAMP TIMESTAMP NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 8b0307011c..437c819af1 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -753,6 +753,8 @@ CREATE TABLE DM_APP_ICONS (
   ICON_PATH VARCHAR2(150) DEFAULT NULL,
   PACKAGE_NAME VARCHAR2(150) NOT NULL,
   VERSION VARCHAR2(50) DEFAULT '1.1.0',
+  CREATED_TIMESTAMP TIMESTAMP(0) NOT NULL,
+  TENANT_ID NUMBER(10) NOT NULL,
   PRIMARY KEY (ID)
 )
 /
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index 5bde66fc30..671906a31e 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -497,6 +497,8 @@ CREATE TABLE IF NOT EXISTS DM_APP_ICONS (
     ICON_PATH  VARCHAR(150) DEFAULT NULL,
     PACKAGE_NAME VARCHAR(150)  NOT NULL,
     VERSION VARCHAR(50) DEFAULT '1.1.0',
+    CREATED_TIMESTAMP TIMESTAMP(0) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID)
 )
 ;
@@ -670,7 +672,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
    META_INFO VARCHAR(20000) NOT NULL,
-   CREATED_AT TIMESTAMP(0) NOT NULL,
+   CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
    PRIMARY KEY (ID),