diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml
index 4fa1a8b206..905ed65f0f 100644
--- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml
+++ b/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>subtype-mgt</artifactId>
-        <version>5.0.20-SNAPSHOT</version>
+        <version>5.0.25-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/subtype-mgt/pom.xml b/components/subtype-mgt/pom.xml
index d2894ffb18..063cd9e767 100644
--- a/components/subtype-mgt/pom.xml
+++ b/components/subtype-mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.20-SNAPSHOT</version>
+        <version>5.0.25-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
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 b60819e102..30ef1d7d79 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
@@ -797,8 +797,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
     TYPE_DEFINITION TEXT NOT NULL,
     PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
 );
-
 -- END OF  DM_DEVICE_SUB_TYPE  TABLE--
+
 -- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
 CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
      ID INT NOT NULL AUTO_INCREMENT,
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 7ffa7dba87..2d8bdd30c3 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
@@ -766,8 +766,8 @@ CREATE TABLE DM_DEVICE_SUB_TYPE (
     TYPE_DEFINITION TEXT NOT NULL,
     PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
 );
-
 -- END OF  DM_DEVICE_SUB_TYPE  TABLE--
+
 -- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
 CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
     ID INT NOT NULL IDENTITY(1,1),
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 3334105c85..afebcf6150 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
@@ -861,8 +861,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
     TYPE_DEFINITION TEXT NOT NULL,
     PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
 ) ENGINE=InnoDB;
-
 -- END OF  DM_DEVICE_SUB_TYPE  TABLE--
+
 -- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
 CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
     ID INT NOT NULL AUTO_INCREMENT,
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 97f76cceea..73dcb320b4 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
@@ -1129,8 +1129,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
     TYPE_DEFINITION TEXT NOT NULL,
     PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
 ) ENGINE=InnoDB;
-
 -- END OF  DM_DEVICE_SUB_TYPE  TABLE--
+
 -- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
 CREATE TABLE DM_TRACCAR_UNSYNCED_DEVICES (
      ID NUMBER(10) NOT NULL,
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 6b61dc4cad..530083d967 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
@@ -783,8 +783,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_SUB_TYPE (
     TYPE_DEFINITION TEXT NOT NULL,
     PRIMARY KEY (SUB_TYPE_ID,DEVICE_TYPE)
 ) ENGINE=InnoDB;
-
 -- END OF  DM_DEVICE_SUB_TYPE  TABLE--
+
 -- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
 CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
     ID SERIAL NOT NULL,
diff --git a/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml b/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml
index ac9e4962ef..e6d23c6d08 100644
--- a/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml
+++ b/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.20-SNAPSHOT</version>
+        <version>5.0.25-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/subtype-mgt/pom.xml b/features/subtype-mgt/pom.xml
index 6c4f5489e2..96f3ae4aad 100644
--- a/features/subtype-mgt/pom.xml
+++ b/features/subtype-mgt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.20-SNAPSHOT</version>
+        <version>5.0.25-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>