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 f383c5d5b9..1542733b82 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
@@ -786,4 +786,16 @@ CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
      CONSTRAINT FK_DYNAMIC_TASK_TASK_PROPERTIES FOREIGN KEY (DYNAMIC_TASK_ID) REFERENCES
              DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
--- END OF DYNAMIC TASK TABLE--
\ No newline at end of file
+-- END OF DYNAMIC TASK TABLE--
+
+-- DM_DEVICE_SUB_TYPE TABLE--
+CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
+    TENANT_ID INT DEFAULT 0,
+    SUB_TYPE_ID INT NOT NULL,
+    DEVICE_TYPE VARCHAR(25) NOT NULL,
+    SUB_TYPE_NAME VARCHAR(45) NOT NULL,
+    TYPE_DEFINITION TEXT NOT NULL,
+    PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
+);
+
+-- END OF  DM_DEVICE_SUB_TYPE  TABLE--
\ No newline at end of file
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 1c22ba25fc..292c25c4f1 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
@@ -753,4 +753,17 @@ CREATE TABLE DYNAMIC_TASK_PROPERTIES (
      CONSTRAINT FK_DYNAMIC_TASK_TASK_PROPERTIES FOREIGN KEY (DYNAMIC_TASK_ID) REFERENCES
              DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
--- END OF DYNAMIC TASK TABLE--
\ No newline at end of file
+-- END OF DYNAMIC TASK TABLE--
+
+-- DM_DEVICE_SUB_TYPE TABLE--
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_SUB_TYPE]') AND TYPE IN (N'U'))
+CREATE TABLE DM_DEVICE_SUB_TYPE (
+    TENANT_ID INT DEFAULT 0,
+    SUB_TYPE_ID INT NOT NULL,
+    DEVICE_TYPE VARCHAR(25) NOT NULL,
+    SUB_TYPE_NAME VARCHAR(45) NOT NULL,
+    TYPE_DEFINITION TEXT NOT NULL,
+    PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
+);
+
+-- END OF  DM_DEVICE_SUB_TYPE  TABLE--
\ No newline at end of file
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 17c7460c97..f18484b048 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
@@ -851,3 +851,15 @@ CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
              DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB;
 -- END OF DYNAMIC TASK TABLE--
+
+-- DM_DEVICE_SUB_TYPE TABLE--
+CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
+    TENANT_ID INT DEFAULT 0,
+    SUB_TYPE_ID INT NOT NULL,
+    DEVICE_TYPE VARCHAR(25) NOT NULL,
+    SUB_TYPE_NAME VARCHAR(45) NOT NULL,
+    TYPE_DEFINITION TEXT NOT NULL,
+    PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
+) ENGINE=InnoDB;
+
+-- END OF  DM_DEVICE_SUB_TYPE  TABLE--
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 a5d3725548..bd83ae4e72 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
@@ -1119,3 +1119,15 @@ CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
              DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB;
 -- END OF DYNAMIC TASK TABLE--
+
+-- DM_DEVICE_SUB_TYPE TABLE--
+CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
+    TENANT_ID INT DEFAULT 0,
+    SUB_TYPE_ID INT NOT NULL,
+    DEVICE_TYPE VARCHAR(25) NOT NULL,
+    SUB_TYPE_NAME VARCHAR(45) NOT NULL,
+    TYPE_DEFINITION TEXT NOT NULL,
+    PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
+) ENGINE=InnoDB;
+
+-- END OF  DM_DEVICE_SUB_TYPE  TABLE--
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 731f086c61..f0ad9975b7 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
@@ -772,3 +772,16 @@ CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
              DYNAMIC_TASK (DYNAMIC_TASK_ID) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB;
 -- END OF DYNAMIC TASK TABLE--
+
+
+-- DM_DEVICE_SUB_TYPE TABLE--
+CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
+    TENANT_ID INT DEFAULT 0,
+    SUB_TYPE_ID INT NOT NULL,
+    DEVICE_TYPE VARCHAR(25) NOT NULL,
+    SUB_TYPE_NAME VARCHAR(45) NOT NULL,
+    TYPE_DEFINITION TEXT NOT NULL,
+    PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
+) ENGINE=InnoDB;
+
+-- END OF  DM_DEVICE_SUB_TYPE  TABLE--