diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql
index 232123d86fd..6a7ff488144 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql
@@ -416,7 +416,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   DEVICE_ID INT NULL,
   ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(100) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql
index e2d3356c698..c6a935cfc4d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/sql-files/h2.sql
@@ -400,7 +400,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   ID INTEGER AUTO_INCREMENT NOT NULL,
   DEVICE_ID INT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(100) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
index 289ac3ec3ee..e236efe7ffb 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql
@@ -467,7 +467,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   DEVICE_ID INT NULL,
   ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(500) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
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 6e4989721a6..abfdcad9520 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
@@ -413,7 +413,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   DEVICE_ID INT NULL,
   ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(500) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_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 8d6bb0fb7d1..0cb27a0ebc2 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
@@ -457,7 +457,7 @@ CREATE TABLE DM_DEVICE_INFO (
   DEVICE_ID INTEGER NULL,
   ENROLMENT_ID INTEGER NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(500) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   INDEX DM_DEVICE_INFO_DEVICE_idx (DEVICE_ID ASC),
   INDEX DM_DEVICE_INFO_DEVICE_ENROLLMENT_idx (ENROLMENT_ID ASC)
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 0ff005b6b92..65a5d235b4a 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
@@ -472,7 +472,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   DEVICE_ID INT NULL,
   ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(500) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   INDEX DM_DEVICE_INFO_DEVICE_idx (DEVICE_ID ASC),
   INDEX DM_DEVICE_INFO_DEVICE_ENROLLMENT_idx (ENROLMENT_ID ASC),
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 9ebdcf56153..2382fe2b47b 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
@@ -791,7 +791,7 @@ CREATE TABLE DM_DEVICE_INFO (
   DEVICE_ID NUMBER(10) NOT NULL,
   ENROLMENT_ID NUMBER(10) NOT NULL,
   KEY_FIELD VARCHAR2(45) NULL,
-  VALUE_FIELD VARCHAR2(500) NULL,
+  VALUE_FIELD VARCHAR2(1000) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
   FOREIGN KEY (DEVICE_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 4ef06be29cd..26e7800a8f0 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
@@ -417,7 +417,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   DEVICE_ID INT NOT NULL,
   ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(500) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
     REFERENCES DM_DEVICE (ID)