diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml
index c71669f41e..a4ef16008e 100644
--- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml
+++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml
@@ -119,6 +119,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>
+                        --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
+                        --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+                    </argLine>
                     <systemPropertyVariables>
                         <log4j.configuration>file:src/test/resources/carbon-home/repository/conf/log4j.properties
                         </log4j.configuration>
@@ -126,6 +130,9 @@
                     <suiteXmlFiles>
                         <file>src/test/resources/testng.xml</file>
                     </suiteXmlFiles>
+                    <classpathDependencyExcludes>
+                        <classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>
+                    </classpathDependencyExcludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
index 6052156588..df3277920d 100644
--- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
+++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
   STATUS VARCHAR(50) DEFAULT NULL,
   DESCRIPTION         TEXT         DEFAULT NULL,
   OWNER               VARCHAR(255)  DEFAULT NULL,
-  PARENT_PATH         VARCHAR(255)  DEFAULT '/',
+  PARENT_PATH VARCHAR(255) DEFAULT NULL,
   TENANT_ID           INTEGER      DEFAULT 0,
   PRIMARY KEY (ID)
 );
@@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER auto_increment NOT NULL,
      DESCRIPTION           TEXT DEFAULT NULL,
      NAME                  VARCHAR(100) DEFAULT NULL,
-     DEVICE_TYPE_ID        INT(11) DEFAULT NULL,
+     DEVICE_TYPE_ID        INT DEFAULT NULL,
      DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL,
      LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
      TENANT_ID INTEGER DEFAULT 0,
@@ -84,8 +84,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (
 CREATE TABLE IF NOT EXISTS DM_OPERATION (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     TYPE VARCHAR(50) NOT NULL,
-    CREATED_TIMESTAMP TIMESTAMP NOT NULL,
-    RECEIVED_TIMESTAMP TIMESTAMP NULL,
+    CREATED_TIMESTAMP BIGINT NOT NULL,
+    RECEIVED_TIMESTAMP BIGINT NULL,
     OPERATION_CODE VARCHAR(1000) NOT NULL,
     INITIATED_BY VARCHAR(100) NULL,
     OPERATION_DETAILS BLOB DEFAULT NULL,
@@ -108,7 +108,19 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
     CONSTRAINT uk_dm_device_enrolment UNIQUE (DEVICE_ID, OWNER, OWNERSHIP, TENANT_ID)
 );
-
+CREATE TABLE IF NOT EXISTS DM_DEVICE_STATUS (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    ENROLMENT_ID INTEGER NOT NULL,
+    DEVICE_ID INTEGER NOT NULL,
+    STATUS VARCHAR(50) DEFAULT NULL,
+    UPDATE_TIME TIMESTAMP DEFAULT NULL,
+    CHANGED_BY VARCHAR(255) NOT NULL,
+    PRIMARY KEY (ID),
+    CONSTRAINT fk_dm_device_status_device FOREIGN KEY (DEVICE_ID) REFERENCES
+        DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_device_status_enrolment FOREIGN KEY (ENROLMENT_ID) REFERENCES
+        DM_ENROLMENT (ID) ON DELETE CASCADE ON UPDATE CASCADE
+);
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
@@ -176,17 +188,17 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ID INT NOT NULL AUTO_INCREMENT ,
   NAME VARCHAR(45) DEFAULT NULL ,
   DESCRIPTION VARCHAR(1000) NULL,
   PAYLOAD_VERSION VARCHAR (45) NULL,
-  TENANT_ID INT(11) NOT NULL ,
-  PROFILE_ID INT(11) NOT NULL ,
+  TENANT_ID INT NOT NULL ,
+  PROFILE_ID INT NOT NULL ,
   OWNERSHIP_TYPE VARCHAR(45) NULL,
   COMPLIANCE VARCHAR(100) NULL,
   PRIORITY INT NOT NULL,
-  ACTIVE INT(2) NOT NULL,
-  UPDATED INT(1) NULL,
+  ACTIVE INT NOT NULL,
+  UPDATED INT NULL,
   POLICY_TYPE VARCHAR(45) NULL,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_DM_PROFILE_DM_POLICY
@@ -197,11 +209,11 @@ CREATE  TABLE IF NOT EXISTS DM_POLICY (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
-  DEVICE_ID INT(11) NOT NULL ,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ID INT NOT NULL AUTO_INCREMENT ,
+  DEVICE_ID INT NOT NULL ,
+  ENROLMENT_ID INT NOT NULL,
   DEVICE BLOB NOT NULL,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_POLICY_DEVICE_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -216,9 +228,9 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
-  ID INT(11) NOT NULL ,
+  ID INT NOT NULL ,
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_DEVICE_TYPE_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -228,11 +240,11 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
-  PROFILE_ID INT(11) NOT NULL,
+  ID INT NOT NULL AUTO_INCREMENT,
+  PROFILE_ID INT NOT NULL,
   FEATURE_CODE VARCHAR(100) NOT NULL,
   DEVICE_TYPE VARCHAR(300) NOT NULL,
-  TENANT_ID INT(11) NOT NULL ,
+  TENANT_ID INT NOT NULL ,
   CONTENT BLOB NULL DEFAULT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES
@@ -243,11 +255,11 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
 );
 
 CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION (
-  ID INT(11) NOT NULL AUTO_INCREMENT,
+  ID INT NOT NULL AUTO_INCREMENT,
   ACTION_TYPE VARCHAR(45) NOT NULL,
-  CORRECTIVE_POLICY_ID INT(11) DEFAULT NULL,
-  POLICY_ID INT(11) NOT NULL,
-  FEATURE_ID INT(11) DEFAULT NULL,
+  CORRECTIVE_POLICY_ID INT DEFAULT NULL,
+  POLICY_ID INT NOT NULL,
+  FEATURE_ID INT DEFAULT NULL,
   IS_REACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION
@@ -258,9 +270,9 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION (
 );
 
 CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
-  ID INT(11) NOT NULL AUTO_INCREMENT ,
+  ID INT NOT NULL AUTO_INCREMENT ,
   ROLE_NAME VARCHAR(45) NOT NULL ,
-  POLICY_ID INT(11) NOT NULL ,
+  POLICY_ID INT NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_ROLE_POLICY_POLICY
     FOREIGN KEY (POLICY_ID )
@@ -284,11 +296,11 @@ CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
 CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
   ID INT NOT NULL AUTO_INCREMENT ,
   DEVICE_ID INT NOT NULL ,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   POLICY_ID INT NOT NULL ,
   POLICY_CONTENT BLOB NULL ,
   TENANT_ID INT NOT NULL,
-  APPLIED TINYINT(1) NULL ,
+  APPLIED TINYINT NULL ,
   CREATED_TIME TIMESTAMP NULL ,
   UPDATED_TIME TIMESTAMP NULL ,
   APPLIED_TIME TIMESTAMP NULL ,
@@ -341,7 +353,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
 CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   ID INT NOT NULL AUTO_INCREMENT,
   DEVICE_ID INT NOT NULL,
-  ENROLMENT_ID INT(11) NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   POLICY_ID INT NOT NULL,
   TENANT_ID INT NOT NULL,
   STATUS INT NULL,
@@ -356,7 +368,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (
   ID INT NOT NULL AUTO_INCREMENT,
   POLICY_ID INT NOT NULL,
   DEVICE_TYPE VARCHAR(300) NOT NULL ,
-  TENANT_ID INT(11) NOT NULL,
+  TENANT_ID INT NOT NULL,
   PRIMARY KEY (ID)
 );
 
@@ -385,7 +397,7 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
     LOCATION_URL VARCHAR(100) DEFAULT NULL,
     IMAGE_URL VARCHAR(100) DEFAULT NULL,
     APP_PROPERTIES BLOB NULL,
-    MEMORY_USAGE INTEGER(10) NULL,
+    MEMORY_USAGE INTEGER NULL,
     IS_ACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
     DEVICE_ID INTEGER NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
@@ -405,6 +417,16 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
 
 -- POLICY RELATED TABLES  FINISHED --
 
+CREATE TABLE IF NOT EXISTS DM_APP_ICONS (
+    ID INTEGER AUTO_INCREMENT NOT NULL,
+    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)
+);
+
 -- NOTIFICATION TABLE --
 CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
     NOTIFICATION_ID INTEGER AUTO_INCREMENT NOT NULL,
@@ -425,7 +447,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(1000) NULL,
+  VALUE_FIELD VARCHAR(1500) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
@@ -454,7 +476,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION (
   STATE VARCHAR(45) NULL,
   COUNTRY VARCHAR(45) NULL,
   GEO_HASH VARCHAR(45) NULL,
-  UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
+  UPDATE_TIMESTAMP BIGINT NOT NULL,
   ALTITUDE DOUBLE NULL,
   SPEED FLOAT NULL,
   BEARING FLOAT NULL,
@@ -491,8 +513,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
   CPU_USAGE DECIMAL(5) NULL,
   TOTAL_RAM_MEMORY DECIMAL(30,3) NULL,
   AVAILABLE_RAM_MEMORY DECIMAL(30,3) NULL,
-  PLUGGED_IN INT(1) NULL,
-  UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
+  PLUGGED_IN INT NULL,
+  UPDATE_TIMESTAMP BIGINT NOT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_DEVICE_DETAILS_DEVICE
     FOREIGN KEY (DEVICE_ID)
@@ -519,7 +541,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_HISTORY_LAST_SEVEN_DAYS
     LONGITUDE        DOUBLE                 NULL,
     SPEED            FLOAT                  NULL,
     HEADING          FLOAT                  NULL,
-    TIMESTAMP        BIGINT(15)             NOT NULL,
+    TIMESTAMP        BIGINT             NOT NULL,
     GEO_HASH         VARCHAR(45)            NULL,
     DEVICE_OWNER     VARCHAR(45)            NULL,
     DEVICE_ALTITUDE  DOUBLE                 NULL,
@@ -588,8 +610,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
-   PRIMARY KEY (ID),
-   CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+   PRIMARY KEY (ID)
 );
 -- END OF DM_OTP_DATA TABLE --
 
@@ -725,52 +746,94 @@ CREATE TABLE IF NOT EXISTS DM_GEOFENCE_EVENT_MAPPING (
 
 -- END OF DM_GEOFENCE_GROUP_MAPPING TABLE--
 
+-- DM_EXT_GROUP_MAPPING TABLE--
+CREATE TABLE IF NOT EXISTS DM_EXT_GROUP_MAPPING (
+    ID INT NOT NULL AUTO_INCREMENT,
+    TRACCAR_GROUP_ID INT DEFAULT 0,
+    GROUP_ID INT NOT NULL,
+    TENANT_ID INT NOT NULL,
+    STATUS INT DEFAULT 0,
+    PRIMARY KEY (ID)
+);
+-- END OF DM_EXT_GROUP_MAPPING TABLE--
+
+-- END OF DM_EXT_DEVICE_MAPPING TABLE--
+CREATE TABLE IF NOT EXISTS DM_EXT_DEVICE_MAPPING (
+    ID INT NOT NULL AUTO_INCREMENT,
+    TRACCAR_DEVICE_ID INT DEFAULT 0,
+    DEVICE_ID INT NOT NULL,
+    TENANT_ID INT NOT NULL,
+    STATUS INT DEFAULT 0,
+    PRIMARY KEY (ID)
+);
+-- END OF DM_EXT_DEVICE_MAPPING TABLE--
+
+-- END OF DM_EXT_PERMISSION_MAPPING TABLE--
+CREATE TABLE IF NOT EXISTS DM_EXT_PERMISSION_MAPPING (
+    TRACCAR_DEVICE_ID INT DEFAULT 0,
+    TRACCAR_USER_ID INT DEFAULT 0
+);
+-- END OF DM_EXT_PERMISSION_MAPPING TABLE--
+
+-- DYNAMIC TASK TABLES--
+CREATE TABLE IF NOT EXISTS DYNAMIC_TASK (
+     DYNAMIC_TASK_ID INTEGER AUTO_INCREMENT NOT NULL,
+     NAME VARCHAR(300) DEFAULT NULL ,
+     CRON VARCHAR(8000) DEFAULT NULL,
+     IS_ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+     TASK_CLASS_NAME VARCHAR(8000) DEFAULT NULL,
+     TENANT_ID INTEGER DEFAULT 0,
+     PRIMARY KEY (DYNAMIC_TASK_ID)
+);
+
+CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
+     DYNAMIC_TASK_ID INTEGER NOT NULL,
+     PROPERTY_NAME VARCHAR(100) DEFAULT 0,
+     PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
+     TENANT_ID VARCHAR(100),
+     PRIMARY KEY (DYNAMIC_TASK_ID, PROPERTY_NAME, TENANT_ID),
+     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--
+
 -- 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,
+    SUB_TYPE_ID VARCHAR(45) 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--
 
+-- DM_TRACCAR_UNSYNCED_DEVICES TABLE --
+CREATE TABLE IF NOT EXISTS DM_TRACCAR_UNSYNCED_DEVICES (
+     ID INT NOT NULL AUTO_INCREMENT,
+     DEVICE_NAME VARCHAR(100) NOT NULL,
+     IOTS_DEVICE_IDENTIFIER VARCHAR(300) DEFAULT NULL UNIQUE,
+     TRACCAR_DEVICE_UNIQUE_ID INT NOT NULL,
+     TRACCAR_USENAME VARCHAR(100) NULL,
+     STATUS VARCHAR(100) NULL,
+     TENANT_ID INTEGER DEFAULT 0,
+     PRIMARY KEY (ID)
+);
+-- END OF DM_TRACCAR_UNSYNCED_DEVICES TABLE --
+
 -- SUB_OPERATION_TEMPLATE TABLE--
-CREATE TABLE SUB_OPERATION_TEMPLATE (
-  SUB_OPERATION_TEMPLATE_ID int NOT NULL AUTO_INCREMENT,
+CREATE TABLE IF NOT EXISTS SUB_OPERATION_TEMPLATE (
+  SUB_OPERATION_TEMPLATE_ID INT NOT NULL AUTO_INCREMENT,
   OPERATION_DEFINITION TEXT NOT NULL,
-  OPERATION_CODE varchar(100) NOT NULL,
-  SUB_TYPE_ID int NOT NULL,
+  OPERATION_CODE VARCHAR(100) NOT NULL,
+  SUB_TYPE_ID INT NOT NULL,
   DEVICE_TYPE VARCHAR(25) NOT NULL,
-  CREATE_TIMESTAMP timestamp NULL DEFAULT NULL,
-  UPDATE_TIMESTAMP timestamp NULL DEFAULT NULL,
+  CREATE_TIMESTAMP TIMESTAMP NULL DEFAULT NULL,
+  UPDATE_TIMESTAMP TIMESTAMP NULL DEFAULT NULL,
   PRIMARY KEY (SUB_OPERATION_TEMPLATE_ID),
-  UNIQUE KEY SUB_OPERATION_TEMPLATE (SUB_TYPE_ID,OPERATION_CODE, DEVICE_TYPE),
+  CONSTRAINT uk_sub_operation_template UNIQUE (SUB_TYPE_ID, OPERATION_CODE, DEVICE_TYPE),
+--  UNIQUE KEY SUB_OPERATION_TEMPLATE (SUB_TYPE_ID, OPERATION_CODE, DEVICE_TYPE),
   CONSTRAINT fk_SUB_OPERATION_TEMPLATE_DM_DEVICE_SUB_TYPE FOREIGN KEY (SUB_TYPE_ID, DEVICE_TYPE) REFERENCES DM_DEVICE_SUB_TYPE (SUB_TYPE_ID, DEVICE_TYPE)
 );
 
-/*
- * Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 -- END OF SUB_OPERATION_TEMPLATE TABLE--
-
-INSERT INTO DM_DEVICE_SUB_TYPE (SUB_TYPE_ID, TENANT_ID, DEVICE_TYPE, SUB_TYPE_NAME, TYPE_DEFINITION) VALUES
-(3,-1234,'METER','TestSubType','{"make": "TestSubType", "model": "ATx-Mega SIM800", "subTypeId": 3, "hasSMSSupport": true, "hasICMPSupport": true, "socketServerPort": 8071}'),
-(4,-1234,'METER','TestSubType','{"make": "TestSubType", "model": "ATx-Mega SIM800", "subTypeId": 4, "hasSMSSupport": true, "hasICMPSupport": true, "socketServerPort": 8071}');
diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index b6c2900db7..3ce48daefe 100644
--- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -31,18 +31,10 @@
         <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
         <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
         <PushNotificationProviders>
-            <Provider>
-                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
-            </Provider>
-            <Provider>
-                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
-            </Provider>
-            <Provider>
-                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider
-            </Provider>
-            <Provider>
-                io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
-            </Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
+            <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
         </PushNotificationProviders>
     </PushNotificationConfiguration>
     <PullNotificationConfiguration>
@@ -50,16 +42,16 @@
     </PullNotificationConfiguration>
     <IdentityConfiguration>
         <ServerUrl>https://localhost:9443</ServerUrl>
-        <AdminUsername>admin</AdminUsername>
-        <AdminPassword>admin</AdminPassword>
+        <AdminUsername>${admin.username}</AdminUsername>
+        <AdminPassword>${admin.username}</AdminPassword>
     </IdentityConfiguration>
     <KeyManagerConfiguration>
         <ServerUrl>https://localhost:9443</ServerUrl>
-        <AdminUsername>admin</AdminUsername>
-        <AdminPassword>admin</AdminPassword>
+        <AdminUsername>${admin.username}</AdminUsername>
+        <AdminPassword>${admin.username}</AdminPassword>
     </KeyManagerConfiguration>
     <PolicyConfiguration>
-        <MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
+        <MonitoringClass>io.entgra.device.mgt.core.policy.mgt</MonitoringClass>
         <MonitoringEnable>true</MonitoringEnable>
         <MonitoringFrequency>60000</MonitoringFrequency>
         <MaxRetries>5</MaxRetries>
@@ -90,7 +82,7 @@
     device caching for upto configured expiry-time in seconds. In clustered setup all worker nodes can enable the
     device-cache to improve performance. -->
     <DeviceCacheConfiguration>
-        <Enable>false</Enable>
+        <Enable>true</Enable>
         <ExpiryTime>600</ExpiryTime>
         <!--This configuration specifies the number of cache entries in device cache. default capacity is 10000 entries.
         This can be configured to higher number if cache eviction happens due to large number of devices in the
@@ -98,18 +90,20 @@
         <Capacity>10000</Capacity>
     </DeviceCacheConfiguration>
     <GeoFenceCacheConfiguration>
-        <Enable>false</Enable>
+        <Enable>true</Enable>
         <ExpiryTime>600</ExpiryTime>
-        <!--This configuration specifies the number of cache entries in device cache. default capacity is 10000 entries.
-        This can be configured to higher number if cache eviction happens due to large number of devices in the
-        server environment-->
         <Capacity>10000</Capacity>
     </GeoFenceCacheConfiguration>
+    <BillingCacheConfiguration>
+        <Enable>true</Enable>
+        <ExpiryTime>600</ExpiryTime>
+        <Capacity>10000</Capacity>
+    </BillingCacheConfiguration>
     <EventOperationTaskConfiguration>
         <Enable>true</Enable>
     </EventOperationTaskConfiguration>
     <CertificateCacheConfiguration>
-        <Enable>false</Enable>
+        <Enable>true</Enable>
         <ExpiryTime>86400</ExpiryTime>
     </CertificateCacheConfiguration>
     <ArchivalConfiguration>
@@ -120,6 +114,11 @@
         </DataSourceConfiguration>
         <ArchivalTask>
             <Enabled>false</Enabled>
+            <ArchivePendingOperations>false</ArchivePendingOperations>
+            <DBConfig>
+                <SourceDB>DM_DB</SourceDB>
+                <DestinationDB>ARCHIVAL_DB</DestinationDB>
+            </DBConfig>
             <TaskClass>io.entgra.device.mgt.core.device.mgt.core.task.impl.ArchivalTask</TaskClass>
             <!-- Cron expression to run the task at specified time -->
             <CronExpression>0 0 0 1/1 * ? *</CronExpression>
@@ -159,7 +158,7 @@
     <!--This configuration used to configure the options for remote device control feature -->
     <RemoteSessionConfiguration>
         <Enabled>true</Enabled>
-        <RemoteSessionServerUrl>wss://localhost:9443</RemoteSessionServerUrl>
+        <RemoteSessionServerUrl>ws://localhost:9763</RemoteSessionServerUrl>
         <MaximumHTTPConnectionPerHost>2</MaximumHTTPConnectionPerHost>
         <MaximumTotalHTTPConnections>100</MaximumTotalHTTPConnections>
         <MaximumMessagesPerSecond>20</MaximumMessagesPerSecond>
@@ -167,5 +166,50 @@
         <MaximumMessageBufferSize>640</MaximumMessageBufferSize>
     </RemoteSessionConfiguration>
     <DefaultGroupsConfiguration>BYOD,COPE</DefaultGroupsConfiguration>
+    <EnrolmentNotificationConfiguration>
+        <Enabled>false</Enabled>
+        <NotifyThroughExtension>false</NotifyThroughExtension>
+        <ExtensionClass>io.entgra.device.mgt.core.device.mgt.common.enrollment.notification.EnrollmentNotifier</ExtensionClass>
+        <NotifyingInternalHost>http://localhost:8280</NotifyingInternalHost>
+    </EnrolmentNotificationConfiguration>
+    <DefaultRoles>
+        <Enabled>false</Enabled>
+        <Roles>
+            <Role>
+                <Name>test_role</Name>
+                <Permissions>
+                    <Permission>/permission/admin/Login</Permission>
+                </Permissions>
+            </Role>
+        </Roles>
+    </DefaultRoles>
+    <MetaDataConfiguration>
+        <WhiteLabelConfiguration>
+            <FooterText>
+                &lt;a href='https://entgra.io' target='_blank'&gt;
+                Entgra
+                &lt;/a&gt;
+                IoT Server 5.2.0 |  &#169; 2023
+                , All Rights Reserved.
+            </FooterText>
+            <AppTitle>Entgra</AppTitle>
+            <WhiteLabelImages>
+                <StoragePath>repository/resources/whitelabel</StoragePath>
+                <DefaultFaviconName>favicon.png</DefaultFaviconName>
+                <DefaultLogoName>logo.png</DefaultLogoName>
+                <DefaultLogoIconName>icon.png</DefaultLogoIconName>
+                <DefaultImagesLocation>default</DefaultImagesLocation>
+            </WhiteLabelImages>
+        </WhiteLabelConfiguration>
+    </MetaDataConfiguration>
+
+    <OperationTimeoutConfigurations>
+        <OperationTimeouts>
+        </OperationTimeouts>
+    </OperationTimeoutConfigurations>
+    <EnrollmentGuideConfiguration>
+        <Enable>false</Enable>
+        <Mail>Replace with mail</Mail>
+    </EnrollmentGuideConfiguration>
 </DeviceMgtConfiguration>
 
diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
index ad8165fc67..2e591b07c9 100644
--- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
+++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
@@ -18,7 +18,7 @@
   -->
 
 <DataSourceConfig>
-    <Url>jdbc:h2:mem:smart-meter-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url>
+    <Url>jdbc:h2:mem:smart-meter-test-db;DB_CLOSE_ON_EXIT=FALSE</Url>
     <DriverClassName>org.h2.Driver</DriverClassName>
     <User>wso2carbon</User>
     <Password>wso2carbon</Password>