diff --git a/etc/backend-service/src/main/resources/jks.properties b/etc/backend-service/src/main/resources/keystore.properties
similarity index 50%
rename from etc/backend-service/src/main/resources/jks.properties
rename to etc/backend-service/src/main/resources/keystore.properties
index db6fe95e1..e0e341c92 100644
--- a/etc/backend-service/src/main/resources/jks.properties
+++ b/etc/backend-service/src/main/resources/keystore.properties
@@ -1,2 +1,2 @@
-keystorename=wso2carbon.jks
+keystorename=wso2carbon.p12
 keystorepassword=wso2carbon
diff --git a/oidc-uma-samples/photo-edit/src/main/resources/jks.properties b/oidc-uma-samples/photo-edit/src/main/resources/keystore.properties
similarity index 50%
rename from oidc-uma-samples/photo-edit/src/main/resources/jks.properties
rename to oidc-uma-samples/photo-edit/src/main/resources/keystore.properties
index db6fe95e1..e0e341c92 100644
--- a/oidc-uma-samples/photo-edit/src/main/resources/jks.properties
+++ b/oidc-uma-samples/photo-edit/src/main/resources/keystore.properties
@@ -1,2 +1,2 @@
-keystorename=wso2carbon.jks
+keystorename=wso2carbon.p12
 keystorepassword=wso2carbon
diff --git a/oidc-uma-samples/photo-view/src/main/resources/jks.properties b/oidc-uma-samples/photo-view/src/main/resources/keystore.properties
similarity index 50%
rename from oidc-uma-samples/photo-view/src/main/resources/jks.properties
rename to oidc-uma-samples/photo-view/src/main/resources/keystore.properties
index db6fe95e1..e0e341c92 100644
--- a/oidc-uma-samples/photo-view/src/main/resources/jks.properties
+++ b/oidc-uma-samples/photo-view/src/main/resources/keystore.properties
@@ -1,2 +1,2 @@
-keystorename=wso2carbon.jks
+keystorename=wso2carbon.p12
 keystorepassword=wso2carbon
diff --git a/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/jks.properties b/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/keystore.properties
similarity index 50%
rename from sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/jks.properties
rename to sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/keystore.properties
index db6fe95e1..e0e341c92 100644
--- a/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/jks.properties
+++ b/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/keystore.properties
@@ -1,2 +1,2 @@
-keystorename=wso2carbon.jks
+keystorename=wso2carbon.p12
 keystorepassword=wso2carbon
diff --git a/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/jks.properties b/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/jks.properties
deleted file mode 100644
index db6fe95e1..000000000
--- a/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/jks.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-keystorename=wso2carbon.jks
-keystorepassword=wso2carbon
diff --git a/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/keystore.properties b/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/keystore.properties
new file mode 100644
index 000000000..e6b748e36
--- /dev/null
+++ b/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/keystore.properties
@@ -0,0 +1,2 @@
+keystorename=wso2carbon.12
+keystorepassword=wso2carbon