diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/h2.sql b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/h2.sql
new file mode 100644
index 0000000000..6705b595f0
--- /dev/null
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/h2.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
+      ID                    INTEGER auto_increment NOT NULL,
+      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
+    	CERTIFICATE                  BLOB DEFAULT NULL,
+    	TENANT_ID INTEGER DEFAULT 0,
+    	USERNAME  VARCHAR(500) DEFAULT NULL,
+    	PRIMARY KEY (ID)
+);
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/mssql.sql b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/mssql.sql
new file mode 100644
index 0000000000..888ee030c8
--- /dev/null
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/mssql.sql
@@ -0,0 +1,8 @@
+CREATE TABLE DM_DEVICE_CERTIFICATE (
+      ID                    INTEGER IDENTITY NOT NULL,
+      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
+    	CERTIFICATE                  VARBINARY(max) DEFAULT NULL,
+    	TENANT_ID INTEGER DEFAULT 0,
+    	USERNAME  VARCHAR(500) DEFAULT NULL,
+    	PRIMARY KEY (ID)
+);
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/mysql.sql b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/mysql.sql
new file mode 100644
index 0000000000..3bdf0a5a17
--- /dev/null
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/mysql.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
+      ID                    INTEGER auto_increment NOT NULL,
+      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
+    	CERTIFICATE                  BLOB DEFAULT NULL,
+    	TENANT_ID INTEGER DEFAULT 0,
+    	USERNAME  VARCHAR(500) DEFAULT NULL,
+    	PRIMARY KEY (ID)
+)ENGINE = InnoDB;
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/oracle.sql b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/oracle.sql
new file mode 100644
index 0000000000..75732199f6
--- /dev/null
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/oracle.sql
@@ -0,0 +1,8 @@
+CREATE TABLE DM_DEVICE_CERTIFICATE (
+  ID                    NUMBER(10) NOT NULL,
+  SERIAL_NUMBER         VARCHAR2(500) DEFAULT NULL,
+  CERTIFICATE           BLOB DEFAULT NULL,
+  TENANT_ID NUMBER(10) DEFAULT 0,
+  USERNAME  VARCHAR2(500) DEFAULT NULL,
+  PRIMARY KEY (ID)
+)
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/postgresql.sql b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/postgresql.sql
new file mode 100644
index 0000000000..c23791abf0
--- /dev/null
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/cdm/certs/postgresql.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
+  ID                    BIGSERIAL NOT NULL PRIMARY KEY,
+  SERIAL_NUMBER         VARCHAR(500) DEFAULT NULL,
+  CERTIFICATE           BYTEA DEFAULT NULL,
+  TENANT_ID INTEGER DEFAULT 0,
+  USERNAME  VARCHAR(500) DEFAULT NULL
+);
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf
index 7bae1dd04a..44e5960b63 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf
@@ -1,3 +1,4 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/conf/wso2certs.jks,target:${installFolder}/../../resources/security/wso2certs.jks,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/conf/certificate-config.xml,target:${installFolder}/../../conf/certificate-config.xml,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/conf/certificate-config.xml,target:${installFolder}/../../conf/certificate-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/dbscripts/cdm/,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
\ No newline at end of file
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
index 3e40d109bd..e9894b7997 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -17,15 +17,6 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
   PRIMARY KEY (ID)
 );
 
-CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER auto_increment NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  BLOB DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
-);
-
 CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER auto_increment NOT NULL,
      DESCRIPTION           TEXT DEFAULT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
index a67d67f9e0..66ce12dc87 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -17,15 +17,6 @@ CREATE TABLE DM_GROUP (
   PRIMARY KEY (ID)
 );
 
-CREATE TABLE DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER IDENTITY NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  VARBINARY(max) DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
-);
-
 CREATE TABLE DM_DEVICE (
      ID                    INTEGER identity NOT NULL,
      DESCRIPTION           VARCHAR(max) DEFAULT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
index 40535450ac..1d2013cbc4 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -6,15 +6,6 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
      PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 
-CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER auto_increment NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  BLOB DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
-)ENGINE = InnoDB;
-
 CREATE TABLE IF NOT EXISTS DM_DEVICE (
      ID                    INTEGER AUTO_INCREMENT NOT NULL,
      DESCRIPTION           TEXT DEFAULT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 41f539cee0..18ed9c2abe 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -44,16 +44,6 @@ WHEN (NEW.ID IS NULL)
     SELECT DM_GROUP_seq.NEXTVAL INTO :NEW.ID FROM DUAL;
   END;
 /
-
-CREATE TABLE DM_DEVICE_CERTIFICATE (
-  ID                    NUMBER(10) NOT NULL,
-  SERIAL_NUMBER         VARCHAR2(500) DEFAULT NULL,
-  CERTIFICATE           BLOB DEFAULT NULL,
-  TENANT_ID NUMBER(10) DEFAULT 0,
-  USERNAME  VARCHAR2(500) DEFAULT NULL,
-  PRIMARY KEY (ID)
-)
-/
 -- Generate ID using sequence and trigger
 CREATE SEQUENCE DM_DEVICE_CERTIFICATE_seq START WITH 1 INCREMENT BY 1 NOCACHE
 /
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index c29d18e021..2da059d3a7 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -5,14 +5,6 @@ CREATE TABLE IF NOT EXISTS  DM_DEVICE_TYPE (
   SHARED_WITH_ALL_TENANTS BOOLEAN NOT NULL DEFAULT FALSE
 );
 
-CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-  ID                    BIGSERIAL NOT NULL PRIMARY KEY,
-  SERIAL_NUMBER         VARCHAR(500) DEFAULT NULL,
-  CERTIFICATE           BYTEA DEFAULT NULL,
-  TENANT_ID INTEGER DEFAULT 0,
-  USERNAME  VARCHAR(500) DEFAULT NULL
-);
-
 CREATE TABLE IF NOT EXISTS  DM_DEVICE (
   ID                    BIGSERIAL NOT NULL PRIMARY KEY,
   DESCRIPTION           TEXT DEFAULT NULL,