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 cad295b559..32827a1d0c 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
@@ -733,18 +733,18 @@ CREATE TABLE DM_GEOFENCE (
 
 -- DYNAMIC TASK TABLES--
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DYNAMIC_TASK]') AND TYPE IN (N'U'))
-CREATE TABLE IF NOT EXISTS DYNAMIC_TASK (
+CREATE TABLE DYNAMIC_TASK (
      DYNAMIC_TASK_ID INTEGER IDENTITY(1,1) NOT NULL,
      NAME VARCHAR(255) DEFAULT NULL ,
      CRON VARCHAR(8000) DEFAULT NULL,
-     IS_ENABLED BOOLEAN NOT NULL DEFAULT FALSE,
+     IS_ENABLED BIT NOT NULL DEFAULT 0,
      TASK_CLASS_NAME VARCHAR(8000) DEFAULT NULL,
      TENANT_ID INTEGER DEFAULT 0,
      PRIMARY KEY (DYNAMIC_TASK_ID)
 );
-IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DYNAMIC_TASK_PROPERTIES]')
-AND TYPE IN (N'U'))
-CREATE TABLE IF NOT EXISTS DYNAMIC_TASK_PROPERTIES (
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DYNAMIC_TASK_PROPERTIES]') AND TYPE IN (N'U'))
+CREATE TABLE DYNAMIC_TASK_PROPERTIES (
      DYNAMIC_TASK_ID INTEGER NOT NULL,
      PROPERTY_NAME VARCHAR(100) DEFAULT 0,
      PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,