diff --git a/docker-compose/obam-obiam-with-obbi/docker-compose.yml b/docker-compose/obam-obiam-with-obbi/docker-compose.yml
index f1e8fed..8905800 100755
--- a/docker-compose/obam-obiam-with-obbi/docker-compose.yml
+++ b/docker-compose/obam-obiam-with-obbi/docker-compose.yml
@@ -43,7 +43,7 @@ services:
 
   obbi-worker:
     container_name: obbi-worker
-    image: wso2-obbi-worker:2.0.0
+    image: docker.wso2.com/wso2-obbi-worker
     healthcheck:
       test: ["CMD", "nc", "-z", "localhost", "9445"]
       interval: 10s
@@ -70,7 +70,7 @@ services:
 
   obbi-dashboard:
     container_name: obbi-dashboard
-    image: wso2-obbi-dashboard:2.0.0
+    image: docker.wso2.com/wso2-obbi-dashboard
     healthcheck:
       test: ["CMD", "nc", "-z", "localhost", "9649"]
       interval: 10s
@@ -96,7 +96,7 @@ services:
 
   obiam:
     container_name: obiam
-    image: wso2-obiam:2.0.0
+    image: docker.wso2.com/wso2-obiam
     healthcheck:
       test: ["CMD", "curl", "-k", "-f", "https://localhost:9446/carbon/admin/login.jsp"]
       interval: 10s
@@ -121,7 +121,7 @@ services:
 
   obam:
     container_name: obam
-    image: wso2-obam:2.0.0
+    image: docker.wso2.com/wso2-obam
     healthcheck:
       test: ["CMD", "curl", "-k", "-f", "https://localhost:9443/carbon/admin/login.jsp"]
       interval: 10s
diff --git a/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks
index 912c188..01cb8f3 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks and b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/openbanking.jks b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/openbanking.jks
index c8e7e84..b05f0d1 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/openbanking.jks and b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/openbanking.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks
index e888dff..d175597 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/client-truststore.jks
index cc4438b..5adbb00 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/client-truststore.jks and b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/openbanking.jks b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/openbanking.jks
index c8e7e84..b05f0d1 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/openbanking.jks and b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/openbanking.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks
index e888dff..d175597 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/client-truststore.jks
index 1c1a0c3..2e16842 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/client-truststore.jks and b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/securevault.jks b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/securevault.jks
index 24679cc..1168667 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/securevault.jks and b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/securevault.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/wso2carbon.jks
index 94318d0..d99d20e 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/wso2carbon.jks and b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/client-truststore.jks
index 21f5c02..870dd68 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/client-truststore.jks and b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/securevault.jks b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/securevault.jks
index 24679cc..1168667 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/securevault.jks and b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/securevault.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/wso2carbon.jks
index 94318d0..d99d20e 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/wso2carbon.jks and b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/client-truststore.jks
index 564b917..b880ce7 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/client-truststore.jks and b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/wso2carbon.jks
index bcd5ea5..95dcc3c 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/client-truststore.jks
index da8f18e..d71982b 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/client-truststore.jks and b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/wso2carbon.jks
index bcd5ea5..95dcc3c 100644
Binary files a/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks
index 529945a..5adbb00 100644
Binary files a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml
index 4f6aac4..080ff5f 100644
--- a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml
+++ b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml
@@ -17,9 +17,7 @@
   ~  under the License.
   -->
 
-<parameter name="SSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">
-
-
+<parameter name="SSLProfiles">
 <profile>
         <bindAddress>0.0.0.0</bindAddress>
          <KeyStore>
@@ -36,4 +34,3 @@
         <SSLVerifyClient>optional</SSLVerifyClient>
     </profile>
 </parameter>
-
diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/openbanking.jks b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/openbanking.jks
index c8e7e84..b05f0d1 100644
Binary files a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/openbanking.jks and b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/openbanking.jks differ
diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml
index af68444..64d9c2b 100644
--- a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml
+++ b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml
@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2018, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. licenses this file to you 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
-  ~
-  ~    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.
-  -->
-  
-<parameter name="customSSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">
+<parameter name="customSSLProfiles">
     <profile>
         <servers>*</servers>
-         <KeyStore>
+        <KeyStore>
             <Location>repository/resources/security/wso2carbon.jks</Location>
             <Type>JKS</Type>
             <Password>wso2carbon</Password>
@@ -33,4 +15,3 @@
         </TrustStore>
     </profile>
 </parameter>
-
diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks
index d7d6eb4..d175597 100644
Binary files a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks
index 529945a..5adbb00 100644
Binary files a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml
index 4f6aac4..080ff5f 100644
--- a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml
+++ b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml
@@ -17,9 +17,7 @@
   ~  under the License.
   -->
 
-<parameter name="SSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">
-
-
+<parameter name="SSLProfiles">
 <profile>
         <bindAddress>0.0.0.0</bindAddress>
          <KeyStore>
@@ -36,4 +34,3 @@
         <SSLVerifyClient>optional</SSLVerifyClient>
     </profile>
 </parameter>
-
diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/openbanking.jks b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/openbanking.jks
index c8e7e84..b05f0d1 100644
Binary files a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/openbanking.jks and b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/openbanking.jks differ
diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml
index af68444..64d9c2b 100644
--- a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml
+++ b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml
@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2018, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. licenses this file to you 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
-  ~
-  ~    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.
-  -->
-  
-<parameter name="customSSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">
+<parameter name="customSSLProfiles">
     <profile>
         <servers>*</servers>
-         <KeyStore>
+        <KeyStore>
             <Location>repository/resources/security/wso2carbon.jks</Location>
             <Type>JKS</Type>
             <Password>wso2carbon</Password>
@@ -33,4 +15,3 @@
         </TrustStore>
     </profile>
 </parameter>
-
diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks
index d7d6eb4..d175597 100644
Binary files a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks
index 50aa5d9..d71982b 100644
Binary files a/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks
index e7da3b2..95dcc3c 100644
Binary files a/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks differ
diff --git a/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks
index 50aa5d9..d71982b 100644
Binary files a/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks differ
diff --git a/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks
index e7da3b2..95dcc3c 100644
Binary files a/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks and b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks differ