diff --git a/dockerfiles/alpine/obam/Dockerfile b/dockerfiles/alpine/obam/Dockerfile
index ebe6180..f4cd70f 100644
--- a/dockerfiles/alpine/obam/Dockerfile
+++ b/dockerfiles/alpine/obam/Dockerfile
@@ -1,20 +1,13 @@
-# ------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------
 #
-# Copyright 2022 WSO2, Inc. (http://wso2.com)
+# Copyright (c) 2022-2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This software is the property of WSO2 LLC. and its suppliers, if any.
+# Dissemination of any information or reproduction of any material contained
+# herein in any form is strictly forbidden, unless permitted by WSO2 expressly.
+# You may not alter or remove any copyright or other notice from copies of this content.
 #
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-#
-# ------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------
 
 ARG BASE_DOCKER_IMAGE_REGISTRY="docker.wso2.com"
 ARG BASE_PRODUCT_VERSION=4.0.0.0
@@ -41,7 +34,8 @@ ARG WSO2_OB_ACCELERATOR=${WSO2_OB_ACCELERATOR_NAME}-${WSO2_OB_ACCELERATOR_VERSIO
 ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
 ARG WSO2_OB_ACCELERATOR_DIR=${WSO2_SERVER_HOME}/${WSO2_OB_ACCELERATOR}
 ARG WSO2_OB_Accelerator_DIST_URL
-ARG WSO2_OB_CERTS_URL
+ARG OB_TRUSTED_CERTS_URL
+ARG WSO2_OB_KEYSTORES_URL
 # build argument for MOTD
 ARG MOTD='printf "\n\
  Welcome to WSO2 Docker Resources \n\
@@ -79,9 +73,17 @@ RUN \
     wget -O ${WSO2_OB_ACCELERATOR}.zip "${WSO2_OB_Accelerator_DIST_URL}" \
     && unzip -d ${WSO2_SERVER_HOME}/ ${WSO2_OB_ACCELERATOR}.zip \
     && rm -f ${WSO2_OB_ACCELERATOR}.zip \
-    && wget -O ob-cert.zip "${WSO2_OB_CERTS_URL}" \
+    && wget -O ob-cert.zip "${OB_TRUSTED_CERTS_URL}" \
     && unzip -d ${USER_HOME} ob-cert.zip  \
-    && rm -f ob-cert.zip
+    && rm -f ob-cert.zip 
+
+# add keystores to base product 
+RUN if [ -n "$WSO2_OB_KEYSTORES_URL" ]; then wget -O client-truststore.jks "${WSO2_OB_KEYSTORES_URL}/client-truststore.jks" \
+    && cp client-truststore.jks ${WSO2_SERVER_HOME}/repository/resources/security/ \
+    && rm -f client-truststore.jks \
+    && wget -O wso2carbon.jks "${WSO2_OB_KEYSTORES_URL}/wso2carbon.jks" \
+    && cp wso2carbon.jks ${WSO2_SERVER_HOME}/repository/resources/security/ \
+    && rm -f wso2carbon.jks; fi 
 
 # set configurations
 # read deployment.toml file
diff --git a/dockerfiles/alpine/obam/README.md b/dockerfiles/alpine/obam/README.md
index f6ab05b..367a43c 100644
--- a/dockerfiles/alpine/obam/README.md
+++ b/dockerfiles/alpine/obam/README.md
@@ -10,7 +10,8 @@ This section defines the step-by-step instructions to build an [Alpine](https://
   + Host the downloaded artifacts locally or on a remote location.
   > The hosted locations of artifacts will be passed as the build arguments when building the Docker image.<br>
   > 1. **WSO2_OB_Accelerator_DIST_URL** - Accelerator location
-  > 2.  **WSO2_OB_CERTS_URL** - Certificate zip archive location
+  > 2. **OB_TRUSTED_CERTS_URL** - Certificate zip archive location
+  > 3. **WSO2_OB_KEYSTORES_URL** - OBAM Keystores folder location (https://github.com/wso2/docker-open-banking/raw/v3.0.0.7/dockerfiles/ubuntu/obam/obam-keystores)
 
 ## How to build an image and run
 
@@ -26,9 +27,9 @@ git clone https://github.com/wso2/docker-open-banking.git
 
 - Navigate to `<OBAM_DOCKERFILE_HOME>` directory. <br>
   Execute `docker build` command as shown below.
-  + `docker build --build-arg WSO2_SERVER_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> ---build-arg WSO2_OB_CERTS_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> -t wso2-obam:3.0.0-alpine .` <br>
-  > eg:- **Hosted locally**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://localhost:8000/wso2-obam-accelerator-3.0.0.tar.gz --build-arg WSO2_OB_CERTS_URL=http://localhost:8000/ob-cert.zip  -t wso2-obam:3.0.0-alpine .` <br><br>
-  > eg:- **Hosted remotely**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://<public_ip:port>/wso2-obam-accelerator-3.0.0.tar.gz --build-arg WSO2_OB_CERTS_URL=http://<public_ip:port>/ob-cert.zip  -t wso2-obam:3.0.0-alpine .`
+  + `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg OB_TRUSTED_CERTS_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg WSO2_OB_KEYSTORES_URL=<URL_OF_THE_HOSTED_LOCATION/FOLDER_NAME> -t wso2-obam:3.0.0-alpine .` <br>
+  > eg:- **Hosted locally**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://localhost:8000/wso2-obam-accelerator-3.0.0.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://localhost:8000/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=http://localhost:8000/obam-keystores -t wso2-obam:3.0.0-alpine .` <br><br>
+  > eg:- **Hosted remotely**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://<public_ip:port>/wso2-obam-accelerator-3.0.0.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://<public_ip:port>/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=http://<public_ip:port>/obam-keystores -t wso2-obam:3.0.0-alpine .`
 
 ##### 3. Running the Docker image.
 
diff --git a/dockerfiles/alpine/obiam/Dockerfile b/dockerfiles/alpine/obiam/Dockerfile
index cacb8fc..fd08377 100644
--- a/dockerfiles/alpine/obiam/Dockerfile
+++ b/dockerfiles/alpine/obiam/Dockerfile
@@ -1,20 +1,13 @@
-# ------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------
 #
-# Copyright 2022 WSO2, Inc. (http://wso2.com)
+# Copyright (c) 2022-2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This software is the property of WSO2 LLC. and its suppliers, if any.
+# Dissemination of any information or reproduction of any material contained
+# herein in any form is strictly forbidden, unless permitted by WSO2 expressly.
+# You may not alter or remove any copyright or other notice from copies of this content.
 #
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-#
-# ------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------
 
 ARG BASE_DOCKER_IMAGE_REGISTRY="docker.wso2.com"
 ARG BASE_PRODUCT_VERSION=5.11.0.0
@@ -43,7 +36,8 @@ ARG WSO2_SERVER_HOME=${USER_HOME}/${WSO2_SERVER}
 ARG WSO2_OB_ACCELERATOR_DIR=${WSO2_SERVER_HOME}/${WSO2_OB_ACCELERATOR}
 ARG WSO2_OB_Accelerator_DIST_URL
 ARG WSO2_OB_KEYMANAGER_DIST_URL
-ARG WSO2_OB_CERTS_URL
+ARG OB_TRUSTED_CERTS_URL
+ARG WSO2_OB_KEYSTORES_URL
 # build argument for MOTD
 ARG MOTD='printf "\n\
  Welcome to WSO2 Docker Resources \n\
@@ -84,9 +78,17 @@ RUN \
     && wget -O ${WSO2_OB_KM_EXTENSION}.zip "${WSO2_OB_KEYMANAGER_DIST_URL}" \
     && unzip ${WSO2_OB_KM_EXTENSION}.zip \
     && rm -f ${WSO2_OB_KM_EXTENSION}.zip \
-    && wget -O ob-cert.zip "${WSO2_OB_CERTS_URL}" \
+    && wget -O ob-cert.zip "${OB_TRUSTED_CERTS_URL}" \
     && unzip -d ${USER_HOME} ob-cert.zip  \
-    && rm -f ob-cert.zip
+    && rm -f ob-cert.zip 
+
+# add keystores to base product 
+RUN if [ -n "$WSO2_OB_KEYSTORES_URL" ]; then wget -O client-truststore.jks "${WSO2_OB_KEYSTORES_URL}/client-truststore.jks" \
+    && cp client-truststore.jks ${WSO2_SERVER_HOME}/repository/resources/security/ \
+    && rm -f client-truststore.jks \
+    && wget -O wso2carbon.jks "${WSO2_OB_KEYSTORES_URL}/wso2carbon.jks" \
+    && cp wso2carbon.jks ${WSO2_SERVER_HOME}/repository/resources/security/ \
+    && rm -f wso2carbon.jks; fi 
 
 # set configurations
 # read deployment.toml file
diff --git a/dockerfiles/alpine/obiam/README.md b/dockerfiles/alpine/obiam/README.md
index 404b62b..e18bd20 100644
--- a/dockerfiles/alpine/obiam/README.md
+++ b/dockerfiles/alpine/obiam/README.md
@@ -12,7 +12,8 @@ This section defines the step-by-step instructions to build an [Alpine](https://
   > The hosted locations of artifacts will be passed as the build arguments when building the Docker image.<br>
   > 1. **WSO2_OB_Accelerator_DIST_URL** - Accelerator location
   > 2. **WSO2_OB_KEYMANAGER_DIST_URL** - WSO2 IS Connector location
-  > 3. **WSO2_OB_CERTS_URL** - Certificate zip archive location
+  > 3. **OB_TRUSTED_CERTS_URL** - Certificate zip archive location
+  > 4. **WSO2_OB_KEYSTORES_URL** - OBIAM Keystores folder location (https://github.com/wso2/docker-open-banking/raw/v3.0.0.7/dockerfiles/ubuntu/obiam/obiam-keystores)
 
 
 ## How to build an image and run
@@ -29,9 +30,9 @@ git clone https://github.com/wso2/docker-open-banking.git
 
 - Navigate to `<OBIAM_DOCKERFILE_HOME>` directory. <br>
   Execute `docker build` command as shown below.
-    + `docker build --build-arg WSO2_SERVER_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg WSO2_OB_KEYMANAGER_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg WSO2_OB_CERTS_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> -t wso2-obiam:2.0.0-alpine .` <br>
-    > eg:- **Hosted locally**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://localhost:8000/wso2-obiam-accelerator-3.0.0.tar.gz --build-arg WSO2_OB_KEYMANAGER_DIST_URL=http://localhost:8000/wso2is-extensions-1.2.10.tar.gz --build-arg WSO2_OB_CERTS_URL=http://localhost:8000/ob-cert.zip  -t wso2-obiam:2.0.0-alpine .` <br><br>
-      eg:- **Hosted remotely**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://<public_ip:port>/wso2-obiam-accelerator-3.0.0.tar.gz --build-arg WSO2_OB_KEYMANAGER_DIST_URL=http://<public_ip:port>/wso2is-extensions-1.2.10.tar.gz --build-arg WSO2_OB_CERTS_URL=http://<public_ip:port>/ob-cert.zip  -t wso2-obiam:2.0.0-alpine .`
+    + `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg WSO2_OB_KEYMANAGER_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg OB_TRUSTED_CERTS_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg WSO2_OB_KEYSTORES_URL=<URL_OF_THE_HOSTED_LOCATION/FOLDER_NAME> -t wso2-obiam:3.0.0-alpine .` <br>
+    > eg:- **Hosted locally**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://localhost:8000/wso2-obiam-accelerator-3.0.0.tar.gz --build-arg WSO2_OB_KEYMANAGER_DIST_URL=http://localhost:8000/wso2is-extensions-1.2.10.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://localhost:8000/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=http://localhost:8000/obiam-keystores  -t wso2-obiam:3.0.0-alpine .` <br><br>
+      eg:- **Hosted remotely**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://<public_ip:port>/wso2-obiam-accelerator-3.0.0.tar.gz --build-arg WSO2_OB_KEYMANAGER_DIST_URL=http://<public_ip:port>/wso2is-extensions-1.2.10.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://<public_ip:port>/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=http://<public_ip:port>/obiam-keystores  -t wso2-obiam:3.0.0-alpine .`
   
 ##### 3. Running the Docker image.
 
diff --git a/dockerfiles/ubuntu/obam-uk/README.md b/dockerfiles/ubuntu/obam-uk/README.md
index 66ca351..9075156 100644
--- a/dockerfiles/ubuntu/obam-uk/README.md
+++ b/dockerfiles/ubuntu/obam-uk/README.md
@@ -1,4 +1,4 @@
-# Dockerfile for WSO2 Open Banking API Manager UK Toolkit Module#
+# Dockerfile for WSO2 Open Banking API Manager UK Toolkit Module
 This section defines the step-by-step instructions to build an [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for WSO2 Open Banking API Manager UK Toolkit.
 
 ## Prerequisites
diff --git a/dockerfiles/ubuntu/obam/README.md b/dockerfiles/ubuntu/obam/README.md
index fdcebae..ee19a0a 100644
--- a/dockerfiles/ubuntu/obam/README.md
+++ b/dockerfiles/ubuntu/obam/README.md
@@ -1,4 +1,4 @@
-# Dockerfile for WSO2 Open Banking API Manager Accelerator Module#
+# Dockerfile for WSO2 Open Banking API Manager Accelerator Module
 This section defines the step-by-step instructions to build an [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for WSO2 Open Banking API Manager.
 
 ## Prerequisites
@@ -11,7 +11,7 @@ This section defines the step-by-step instructions to build an [Ubuntu](https://
   > The hosted locations of artifacts will be passed as the build arguments when building the Docker image.<br>
   > 1. **WSO2_OB_Accelerator_DIST_URL** - Accelerator location
   > 2. **OB_TRUSTED_CERTS_URL** - Certificate zip archive location
-  > 3. **WSO2_OB_KEYSTORES_URL** - OBAM Keystores folder location
+  > 3. **WSO2_OB_KEYSTORES_URL** - OBAM Keystores folder location (https://github.com/wso2/docker-open-banking/raw/v3.0.0.7/dockerfiles/ubuntu/obam/obam-keystores)
 
 
 ## How to build an image and run
@@ -29,8 +29,8 @@ git clone https://github.com/wso2/docker-open-banking.git
 - Navigate to `<OBAM_DOCKERFILE_HOME>` directory. <br>
   Execute `docker build` command as shown below.
   + `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg OB_TRUSTED_CERTS_URL=<URL_OF_THE_HOSTED_LOCATION/FILENAME> --build-arg WSO2_OB_KEYSTORES_URL=<URL_OF_THE_HOSTED_LOCATION/FOLDER_NAME> -t wso2-obam:3.0.0 .` <br>
-  > eg:- **Hosted locally**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://localhost:8000/wso2-obam-accelerator-3.0.0.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://localhost:8000/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=https://github.com/wso2/docker-open-banking/tree/master/dockerfiles/ubuntu/obam/obam-keystores -t wso2-obam:3.0.0 .` <br><br>
-  > eg:- **Hosted remotely**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://<public_ip:port>/wso2-obam-accelerator-3.0.0.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://<public_ip:port>/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=https://github.com/wso2/docker-open-banking/tree/master/dockerfiles/ubuntu/obam/obam-keystores -t wso2-obam:3.0.0 .`
+  > eg:- **Hosted locally**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://localhost:8000/wso2-obam-accelerator-3.0.0.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://localhost:8000/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=hhttp://localhost:8000/obam-keystores -t wso2-obam:3.0.0 .` <br><br>
+  > eg:- **Hosted remotely**: `docker build --build-arg WSO2_OB_Accelerator_DIST_URL=http://<public_ip:port>/wso2-obam-accelerator-3.0.0.tar.gz --build-arg OB_TRUSTED_CERTS_URL=http://<public_ip:port>/ob-cert.zip --build-arg WSO2_OB_KEYSTORES_URL=http://<public_ip:port>/obam-keystores -t wso2-obam:3.0.0 .`
 
 ##### 3. Running the Docker image.
 
diff --git a/dockerfiles/ubuntu/obiam/README.md b/dockerfiles/ubuntu/obiam/README.md
index a062551..7c8d155 100644
--- a/dockerfiles/ubuntu/obiam/README.md
+++ b/dockerfiles/ubuntu/obiam/README.md
@@ -13,7 +13,7 @@ This section defines the step-by-step instructions to build an [Ubuntu](https://
     > 1. **WSO2_OB_Accelerator_DIST_URL** - Accelerator location
     > 2. **WSO2_OB_KEYMANAGER_DIST_URL** - WSO2 IS Connector location
     > 3. **OB_TRUSTED_CERTS_URL** - Certificate zip archive location
-    > 4. **WSO2_OB_KEYSTORES_URL** - OBIAM Keystores folder location
+    > 4. **WSO2_OB_KEYSTORES_URL** - OBIAM Keystores folder location (https://github.com/wso2/docker-open-banking/raw/v3.0.0.7/dockerfiles/ubuntu/obiam/obiam-keystores)
     
 
 ## How to build an image and run