diff --git a/components/org.wso2.carbon.identity.application.authenticator.samlsso/src/main/java/org/wso2/carbon/identity/application/authenticator/samlsso/manager/X509CredentialImpl.java b/components/org.wso2.carbon.identity.application.authenticator.samlsso/src/main/java/org/wso2/carbon/identity/application/authenticator/samlsso/manager/X509CredentialImpl.java
index b79f9c65..c1adae1b 100644
--- a/components/org.wso2.carbon.identity.application.authenticator.samlsso/src/main/java/org/wso2/carbon/identity/application/authenticator/samlsso/manager/X509CredentialImpl.java
+++ b/components/org.wso2.carbon.identity.application.authenticator.samlsso/src/main/java/org/wso2/carbon/identity/application/authenticator/samlsso/manager/X509CredentialImpl.java
@@ -35,6 +35,7 @@
 import org.wso2.carbon.identity.application.authenticator.samlsso.util.SSOErrorConstants.ErrorMessages;
 import org.wso2.carbon.identity.application.common.util.IdentityApplicationManagementUtil;
 import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -121,13 +122,10 @@ public X509CredentialImpl(String tenantDomain, String idpCert) throws SAMLSSOExc
                  */
                 if (!tenantDomain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
                     FrameworkUtils.startTenantFlow(tenantDomain);
-                    // derive key store name
-                    String ksName = tenantDomain.trim().replace(".", "-");
-                    // derive JKS name
-                    String jksName = ksName + ".jks";
+                    String fileName = KeystoreUtils.getKeyStoreFileLocation(tenantDomain);
                     key =
-                            (PrivateKey) keyStoreManager.getPrivateKey(jksName, tenantDomain);
-                    cert = (X509Certificate) keyStoreManager.getKeyStore(jksName)
+                            (PrivateKey) keyStoreManager.getPrivateKey(fileName, tenantDomain);
+                    cert = (X509Certificate) keyStoreManager.getKeyStore(fileName)
                             .getCertificate(tenantDomain);
                 } else {
                     if (isSignKeyStoreConfigured()) {
diff --git a/pom.xml b/pom.xml
index 367dda5c..f0f5bb74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,7 +285,7 @@
         <identity.outbound.auth.samlsso.imp.pkg.version.range>[1.0.0, 2.0.0)</identity.outbound.auth.samlsso.imp.pkg.version.range>
 
         <!--Carbon Kernel Version-->
-        <carbon.kernel.version>4.9.17</carbon.kernel.version>
+        <carbon.kernel.version>4.9.23</carbon.kernel.version>
         <carbon.kernel.feature.version>4.9.0</carbon.kernel.feature.version>
         <carbon.kernel.imp.pkg.version.range>[4.4.0, 5.0.0)</carbon.kernel.imp.pkg.version.range>
         <carbon.user.api.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.user.api.imp.pkg.version.range>