diff --git a/components/registry/org.wso2.carbon.registry.event.core/src/main/java/org/wso2/carbon/registry/event/core/qpid/QpidServerDetails.java b/components/registry/org.wso2.carbon.registry.event.core/src/main/java/org/wso2/carbon/registry/event/core/qpid/QpidServerDetails.java
index 0e3bd6018..58c4f1b41 100644
--- a/components/registry/org.wso2.carbon.registry.event.core/src/main/java/org/wso2/carbon/registry/event/core/qpid/QpidServerDetails.java
+++ b/components/registry/org.wso2.carbon.registry.event.core/src/main/java/org/wso2/carbon/registry/event/core/qpid/QpidServerDetails.java
@@ -17,6 +17,7 @@
 package org.wso2.carbon.registry.event.core.qpid;
 
 import org.wso2.carbon.utils.ServerConstants;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 public class QpidServerDetails {
 
@@ -24,8 +25,8 @@ public class QpidServerDetails {
     private static final String DOMAIN_NAME_SEPARATOR_INTERNAL = "!";
 
     private static final String SECURITY_RESOURCES_DIR = "/repository/resources/security/";
-    private static final String KEYSTORE_FILE = "wso2carbon.jks";
-    private static final String TRUSTSTORE_FILE = "client-truststore.jks";
+    private static final String KEYSTORE_FILE = KeystoreUtils.StoreFileType.defaultFileType();
+    private static final String TRUSTSTORE_FILE = KeystoreUtils.getTrustStoreFileType();
 
     private String accessKey;
     private String clientID;
diff --git a/components/registry/org.wso2.carbon.registry.ws.client/pom.xml b/components/registry/org.wso2.carbon.registry.ws.client/pom.xml
index 022e9d105..5e11dd049 100644
--- a/components/registry/org.wso2.carbon.registry.ws.client/pom.xml
+++ b/components/registry/org.wso2.carbon.registry.ws.client/pom.xml
@@ -146,6 +146,10 @@
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.core</artifactId>
diff --git a/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java b/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java
index 8840e29dc..00da22c41 100644
--- a/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java
+++ b/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java
@@ -62,6 +62,8 @@
 import org.wso2.carbon.registry.ws.stub.xsd.WSTag;
 import org.wso2.carbon.registry.ws.stub.xsd.WSTaggedResourcePath;
 import org.wso2.carbon.utils.CarbonUtils;
+import org.wso2.carbon.utils.security.KeystoreUtils;
+
 
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
@@ -238,7 +240,8 @@ public void addSecurityOptions ( String policyPath, String keyStore,String userN
 		Policy policy = loadPolicy(policyPath);
 
 		Properties merlinProp = new Properties();
-		merlinProp.put("org.apache.ws.security.crypto.merlin.keystore.type", "JKS");
+		merlinProp.put("org.apache.ws.security.crypto.merlin.keystore.type",
+                KeystoreUtils.StoreFileType.defaultFileType());
 		merlinProp.put("org.apache.ws.security.crypto.merlin.file",
 		               keyStore);
 
diff --git a/pom.xml b/pom.xml
index ffeaa54f7..541111b87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1393,6 +1393,10 @@
                 <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
                 <version>${apache.felix.scr.ds.annotations.version}</version>
             </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1594,7 +1598,7 @@
     <properties>
         <!-- Carbon platform version comes here-->
 
-        <carbon.kernel.version>4.5.3</carbon.kernel.version>
+        <carbon.kernel.version>4.9.23</carbon.kernel.version>
         <carbon.kernel.feature.version>${carbon.kernel.version}</carbon.kernel.feature.version>
         <carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>