diff --git a/modules/distribution/src/repository/resources/conf/default.json b/modules/distribution/src/repository/resources/conf/default.json
index 2d30d5cf9f2..c6b1c430f05 100644
--- a/modules/distribution/src/repository/resources/conf/default.json
+++ b/modules/distribution/src/repository/resources/conf/default.json
@@ -5,9 +5,9 @@
   },
   "user_store.type": "database_unique_id",
 
-  "keystore.primary.type" : "PKCS12",
+  "keystore.primary.type" : "JKS",
   "keystore.userstore_password_encryption": "",
-  "truststore.type" : "PKCS12",
+  "truststore.type" : "JKS",
 
   "transport.https.sslHostConfig.properties.certificateVerification": "want",
 
diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml
index 016e16aadc5..4d16278ad4f 100644
--- a/modules/distribution/src/repository/resources/conf/deployment.toml
+++ b/modules/distribution/src/repository/resources/conf/deployment.toml
@@ -24,11 +24,11 @@ username = "wso2carbon"
 password = "wso2carbon"
 
 [keystore.primary]
-file_name = "wso2carbon.p12"
+file_name = "wso2carbon.jks"
 password = "wso2carbon"
 
 [truststore]
-file_name="client-truststore.p12"
+file_name="client-truststore.jks"
 password="wso2carbon"
 type="JKS"