diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/src/main/java/org/wso2/carbon/keystore/mgt/KeyStoreGenerator.java b/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/src/main/java/org/wso2/carbon/keystore/mgt/KeyStoreGenerator.java
index ec038dcd..c3be0e45 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/src/main/java/org/wso2/carbon/keystore/mgt/KeyStoreGenerator.java
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/src/main/java/org/wso2/carbon/keystore/mgt/KeyStoreGenerator.java
@@ -177,7 +177,7 @@ private X509Certificate generateKeyPair(KeyStore keyStore) throws KeyStoreMgtExc
             KeyPair keyPair = keyPairGenerator.generateKeyPair();
 
             // Common Name and alias for the generated certificate
-            String commonName = "CN=" + tenantDomain + ", OU=None, O=None L=None, C=None";
+            String commonName = "CN=" + tenantDomain + ", OU=None, O=None, L=None, C=None";
 
             //generate certificates
             X500Name distinguishedName = new X500Name(commonName);
diff --git a/pom.xml b/pom.xml
index d01a50d7..527ce0cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -995,8 +995,8 @@
 
         <log4j.version>1.2.13</log4j.version>
 
-        <bcprov-jdk18.version>1.74.0.wso2v1</bcprov-jdk18.version>
-        <bcpkix-jdk18.version>1.74.0.wso2v1</bcpkix-jdk18.version>
+        <bcprov-jdk18.version>1.78.1.wso2v1</bcprov-jdk18.version>
+        <bcpkix-jdk18.version>1.78.1.wso2v1</bcpkix-jdk18.version>
         <org.bouncycastle.imp.pkg.version.range>[0.0.0,2.0.0)</org.bouncycastle.imp.pkg.version.range>
 
         <!-- Jasper Reports Version -->