diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml
index b8202f2a2e..e19786b861 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <CertificateConfigurations>
     <CertificateKeystore>
-        <!-- EMM Keystore file location-->
-        <CertificateKeystoreLocation>${carbon.home}/repository/resources/security/wso2cert.jks</CertificateKeystoreLocation>
-        <!-- EMM Keystore type (JKS/PKCS12 etc.)-->
+        <!-- Certificate Keystore file location-->
+        <CertificateKeystoreLocation>${carbon.home}/repository/resources/security/wso2certs.jks</CertificateKeystoreLocation>
+        <!-- Certificate Keystore type (JKS/PKCS12 etc.)-->
         <CertificateKeystoreType>JKS</CertificateKeystoreType>
-        <!-- EMM Keystore password-->
+        <!-- Certificate Keystore password-->
         <CertificateKeystorePassword>wso2carbon</CertificateKeystorePassword>
         <!-- Certificate authority certificate alias -->
         <CACertAlias>cacert</CACertAlias>
@@ -16,4 +16,4 @@
         <!-- Registration authority private key password -->
         <RAPrivateKeyPassword>racert</RAPrivateKeyPassword>
     </CertificateKeystore>
-</CertificateConfigurations>
+</CertificateConfigurations>
\ No newline at end of file
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/wso2cert.jks b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/wso2certs.jks
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/wso2cert.jks
rename to components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/wso2certs.jks
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml
index b8202f2a2e..e19786b861 100755
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <CertificateConfigurations>
     <CertificateKeystore>
-        <!-- EMM Keystore file location-->
-        <CertificateKeystoreLocation>${carbon.home}/repository/resources/security/wso2cert.jks</CertificateKeystoreLocation>
-        <!-- EMM Keystore type (JKS/PKCS12 etc.)-->
+        <!-- Certificate Keystore file location-->
+        <CertificateKeystoreLocation>${carbon.home}/repository/resources/security/wso2certs.jks</CertificateKeystoreLocation>
+        <!-- Certificate Keystore type (JKS/PKCS12 etc.)-->
         <CertificateKeystoreType>JKS</CertificateKeystoreType>
-        <!-- EMM Keystore password-->
+        <!-- Certificate Keystore password-->
         <CertificateKeystorePassword>wso2carbon</CertificateKeystorePassword>
         <!-- Certificate authority certificate alias -->
         <CACertAlias>cacert</CACertAlias>
@@ -16,4 +16,4 @@
         <!-- Registration authority private key password -->
         <RAPrivateKeyPassword>racert</RAPrivateKeyPassword>
     </CertificateKeystore>
-</CertificateConfigurations>
+</CertificateConfigurations>
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks
new file mode 100644
index 0000000000..d40aca9848
Binary files /dev/null and b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks differ
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 8ee7eea2af..7bae1dd04a 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,2 +1,3 @@
 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