diff --git a/README.md b/README.md
index 3db488ae..92730331 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,19 @@
 <!--
- ~  Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
- ~   
- ~  This software is the property of WSO2 Inc. and its suppliers, if any. 
- ~  Dissemination of any information or reproduction of any material contained 
- ~  herein is strictly forbidden, unless permitted by WSO2 in accordance with 
- ~  the WSO2 Software License available at https://wso2.com/licenses/eula/3.1. 
- ~  For specific language governing the permissions and limitations under 
- ~  this license, please see the license as well as any agreement you’ve 
- ~  entered into with WSO2 governing the purchase of this software and any 
- ~  associated services.
+ ~ Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ ~
+ ~ WSO2 LLC. 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.
 -->
 
 # WSO2 OB Compliance Toolkit Berlin
diff --git a/components/org.wso2.openbanking.berlin.common/pom.xml b/components/org.wso2.openbanking.berlin.common/pom.xml
index 206756e5..e0d140f9 100644
--- a/components/org.wso2.openbanking.berlin.common/pom.xml
+++ b/components/org.wso2.openbanking.berlin.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2-components</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.openbanking.berlin.consent.extensions/pom.xml b/components/org.wso2.openbanking.berlin.consent.extensions/pom.xml
index 5ba4b21d..494bf6eb 100644
--- a/components/org.wso2.openbanking.berlin.consent.extensions/pom.xml
+++ b/components/org.wso2.openbanking.berlin.consent.extensions/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.openbanking.berlin.demo.backend/pom.xml b/components/org.wso2.openbanking.berlin.demo.backend/pom.xml
index 4fb24705..d4d18524 100644
--- a/components/org.wso2.openbanking.berlin.demo.backend/pom.xml
+++ b/components/org.wso2.openbanking.berlin.demo.backend/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2-components</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.openbanking.berlin.gateway/pom.xml b/components/org.wso2.openbanking.berlin.gateway/pom.xml
index b5d4eefb..e7b49f6f 100644
--- a/components/org.wso2.openbanking.berlin.gateway/pom.xml
+++ b/components/org.wso2.openbanking.berlin.gateway/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.openbanking.berlin.identity/pom.xml b/components/org.wso2.openbanking.berlin.identity/pom.xml
index f2f40529..d11d6af9 100644
--- a/components/org.wso2.openbanking.berlin.identity/pom.xml
+++ b/components/org.wso2.openbanking.berlin.identity/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2-components</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.openbanking.berlin.keymanager/pom.xml b/components/org.wso2.openbanking.berlin.keymanager/pom.xml
index b991e653..f060a210 100644
--- a/components/org.wso2.openbanking.berlin.keymanager/pom.xml
+++ b/components/org.wso2.openbanking.berlin.keymanager/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2-components</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/pom.xml b/components/pom.xml
index 697fcd75..cd1fafa3 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
 
     <artifactId>reference-implementation-nextgenpsd2-components</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <name>WSO2 Open Banking Berlin Toolkit</name>
     <description>WSO2 Open Banking Toolkit for Berlin Specification</description>
diff --git a/integration-test-suite/berlin-toolkit-integration-test/pom.xml b/integration-test-suite/berlin-toolkit-integration-test/pom.xml
index ba68c83e..8450121c 100644
--- a/integration-test-suite/berlin-toolkit-integration-test/pom.xml
+++ b/integration-test-suite/berlin-toolkit-integration-test/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>integration-test-suite</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>berlin-toolkit-integration-test</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>pom</packaging>
     <name>WSO2 Open Banking Toolkit Berlin Test Modules</name>
     <url>http://wso2.org</url>
diff --git a/integration-test-suite/berlin-toolkit-test-framework/pom.xml b/integration-test-suite/berlin-toolkit-test-framework/pom.xml
index eb1ef574..a906fad8 100644
--- a/integration-test-suite/berlin-toolkit-test-framework/pom.xml
+++ b/integration-test-suite/berlin-toolkit-test-framework/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>integration-test-suite</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>berlin-toolkit-test-framework</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <dependencies>
         <dependency>
diff --git a/integration-test-suite/pom.xml b/integration-test-suite/pom.xml
index 241dca52..8be9b43f 100644
--- a/integration-test-suite/pom.xml
+++ b/integration-test-suite/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.wso2.openbanking</groupId>
     <artifactId>integration-test-suite</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <dependencies>
         <dependency>
diff --git a/open-banking-test-suite/open-banking-test-framework/pom.xml b/open-banking-test-suite/open-banking-test-framework/pom.xml
index b6a52b69..3f7a3adb 100644
--- a/open-banking-test-suite/open-banking-test-framework/pom.xml
+++ b/open-banking-test-suite/open-banking-test-framework/pom.xml
@@ -22,12 +22,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>com.wso2.openbanking.test.framework</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>open-banking-test-suite</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/open-banking-test-suite/pom.xml b/open-banking-test-suite/pom.xml
index c6b35a28..52b9401b 100644
--- a/open-banking-test-suite/pom.xml
+++ b/open-banking-test-suite/pom.xml
@@ -23,7 +23,7 @@
 
     <groupId>org.wso2.openbanking</groupId>
     <artifactId>open-banking-test-suite</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/berlin.common.utils/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/berlin.common.utils/pom.xml
index 252c8d36..33b0221b 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/berlin.common.utils/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/berlin.common.utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>com.wso2.openbanking.toolkit.berlin.test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/accounts/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/accounts/pom.xml
index e1cf5deb..86364415 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/accounts/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/accounts/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>com.wso2.openbanking.toolkit.berlin.test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/cof/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/cof/pom.xml
index 6bb39141..b7db96a8 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/cof/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/cof/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>com.wso2.openbanking.toolkit.berlin.test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/payments/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/payments/pom.xml
index fb9a95f4..1bbf2820 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/payments/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/integration.tests/payments/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>com.wso2.openbanking.toolkit.berlin.test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/accounts/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/accounts/pom.xml
index 2357f84c..72db253b 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/accounts/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/accounts/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>com.wso2.openbanking.toolkit.berlin.test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/payments/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/payments/pom.xml
index 5166661f..aa54a604 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/payments/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/keymanager.tests/payments/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>com.wso2.openbanking.toolkit.berlin.test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/pom.xml b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/pom.xml
index 92fa21b0..00734dc4 100644
--- a/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/com.wso2.openbanking.toolkit.berlin.test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>open-banking-toolkit-berlin-test</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/open-banking-test-suite/toolkit-berlin-test/pom.xml b/open-banking-test-suite/toolkit-berlin-test/pom.xml
index 9d99163b..1dc30c50 100644
--- a/open-banking-test-suite/toolkit-berlin-test/pom.xml
+++ b/open-banking-test-suite/toolkit-berlin-test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>open-banking-test-suite</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index af47de3a..c157f03d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <groupId>org.wso2.openbanking</groupId>
     <artifactId>reference-implementation-nextgenpsd2</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <parent>
         <groupId>org.wso2</groupId>
diff --git a/react-apps/pom.xml b/react-apps/pom.xml
index 191ea38e..d38c3b9e 100644
--- a/react-apps/pom.xml
+++ b/react-apps/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>reference-implementation-nextgenpsd2</artifactId>
         <groupId>org.wso2.openbanking</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/react-apps/self-care-portal/README.md b/react-apps/self-care-portal/README.md
index ea0e071e..84412bfe 100644
--- a/react-apps/self-care-portal/README.md
+++ b/react-apps/self-care-portal/README.md
@@ -1,14 +1,20 @@
-/*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
- *
- * This software is the property of WSO2 Inc. and its suppliers, if any.
- * Dissemination of any information or reproduction of any material contained
- * herein is strictly forbidden, unless permitted by WSO2 in accordance with
- * the WSO2 Commercial License available at http://wso2.com/licenses. For specific
- * language governing the permissions and limitations under this license,
- * please see the license as well as any agreement you’ve entered into with
- * WSO2 governing the purchase of this software and any associated services.
- */
+<!--
+ ~ Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ ~
+ ~ WSO2 LLC. 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.
+-->
  
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app), using the [Redux](https://redux.js.org/) and [Redux Toolkit](https://redux-toolkit.js.org/) template.
 
diff --git a/react-apps/self-care-portal/pom.xml b/react-apps/self-care-portal/pom.xml
index ea3b69b8..f69d99e4 100644
--- a/react-apps/self-care-portal/pom.xml
+++ b/react-apps/self-care-portal/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>react-apps</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/toolkits/ob-apim/pom.xml b/toolkits/ob-apim/pom.xml
index 3e7f99d6..71b3595d 100644
--- a/toolkits/ob-apim/pom.xml
+++ b/toolkits/ob-apim/pom.xml
@@ -29,7 +29,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wso2-obam-toolkit-berlin</artifactId>
+    <artifactId>wso2ob-apim-toolkit-berlin</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Open Banking - Berlin API Manager Toolkit Module</name>
     <url>http://wso2.org</url>
diff --git a/toolkits/ob-apim/repository/resources/wso2am-4.0.0-deployment-berlin.toml b/toolkits/ob-apim/repository/resources/wso2am-4.0.0-deployment-berlin.toml
index 86500db1..835c4721 100644
--- a/toolkits/ob-apim/repository/resources/wso2am-4.0.0-deployment-berlin.toml
+++ b/toolkits/ob-apim/repository/resources/wso2am-4.0.0-deployment-berlin.toml
@@ -556,13 +556,13 @@ cache_expiry = 3600
 enabled = true
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "accounts"
-roles = "AISP, ASPSP"
+roles = "PSP_AS, PSP_AI"
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "payments"
-roles = "PISP"
+roles = "PSP_PI"
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "fundsconfirmations"
-roles = "CBPII"
+roles = "PSP_IC"
 
 
 #===================for Connection pool====================
@@ -621,7 +621,7 @@ priority="3"
 
 [open_banking_berlin.gateway.signature_verification]
 supported_hash_algorithms = ["SHA-256", "SHA-512"]
-supported_signature_algorithms = ["SHA256withRSA", "SHA512withRSA"]
+supported_signature_algorithms = ["SHA256withRSA", "SHA512withRSA", "SHA1withRSA"]
 
 [open_banking.berlin.keymanager.org_id_validation]
 regex="^PSD[A-Z]{2}-[A-Z]{2,8}-[a-zA-Z0-9]*$"
diff --git a/toolkits/ob-apim/repository/resources/wso2am-4.1.0-deployment-berlin.toml b/toolkits/ob-apim/repository/resources/wso2am-4.1.0-deployment-berlin.toml
index b2cbe8e4..09c1b912 100644
--- a/toolkits/ob-apim/repository/resources/wso2am-4.1.0-deployment-berlin.toml
+++ b/toolkits/ob-apim/repository/resources/wso2am-4.1.0-deployment-berlin.toml
@@ -556,13 +556,13 @@ cache_expiry = 3600
 enabled = true
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "accounts"
-roles = "AISP, ASPSP"
+roles = "PSP_AS, PSP_AI"
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "payments"
-roles = "PISP"
+roles = "PSP_PI"
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "fundsconfirmations"
-roles = "CBPII"
+roles = "PSP_IC"
 
 
 #===================for Connection pool====================
@@ -621,7 +621,7 @@ priority="3"
 
 [open_banking_berlin.gateway.signature_verification]
 supported_hash_algorithms = ["SHA-256", "SHA-512"]
-supported_signature_algorithms = ["SHA256withRSA", "SHA512withRSA"]
+supported_signature_algorithms = ["SHA256withRSA", "SHA512withRSA", "SHA1withRSA"]
 
 [open_banking.berlin.keymanager.org_id_validation]
 regex="^PSD[A-Z]{2}-[A-Z]{2,8}-[a-zA-Z0-9]*$"
diff --git a/toolkits/ob-apim/repository/resources/wso2am-4.2.0-deployment-berlin.toml b/toolkits/ob-apim/repository/resources/wso2am-4.2.0-deployment-berlin.toml
index b2cbe8e4..09c1b912 100644
--- a/toolkits/ob-apim/repository/resources/wso2am-4.2.0-deployment-berlin.toml
+++ b/toolkits/ob-apim/repository/resources/wso2am-4.2.0-deployment-berlin.toml
@@ -556,13 +556,13 @@ cache_expiry = 3600
 enabled = true
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "accounts"
-roles = "AISP, ASPSP"
+roles = "PSP_AS, PSP_AI"
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "payments"
-roles = "PISP"
+roles = "PSP_PI"
 [[open_banking.gateway.tpp_management.allowed_scopes]]
 name = "fundsconfirmations"
-roles = "CBPII"
+roles = "PSP_IC"
 
 
 #===================for Connection pool====================
@@ -621,7 +621,7 @@ priority="3"
 
 [open_banking_berlin.gateway.signature_verification]
 supported_hash_algorithms = ["SHA-256", "SHA-512"]
-supported_signature_algorithms = ["SHA256withRSA", "SHA512withRSA"]
+supported_signature_algorithms = ["SHA256withRSA", "SHA512withRSA", "SHA1withRSA"]
 
 [open_banking.berlin.keymanager.org_id_validation]
 regex="^PSD[A-Z]{2}-[A-Z]{2,8}-[a-zA-Z0-9]*$"
diff --git a/toolkits/ob-apim/src/assembly/bin.xml b/toolkits/ob-apim/src/assembly/bin.xml
index 9420e205..650045e0 100644
--- a/toolkits/ob-apim/src/assembly/bin.xml
+++ b/toolkits/ob-apim/src/assembly/bin.xml
@@ -20,7 +20,7 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>ob.am.toolkit.berlin</id>
     <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>wso2-obam-toolkit-berlin-${project.version}</baseDirectory>
+    <baseDirectory>wso2ob-apim-toolkit-berlin-${project.version}</baseDirectory>
 
     <formats>
         <format>zip</format>
diff --git a/toolkits/ob-is/pom.xml b/toolkits/ob-is/pom.xml
index c55ed4f0..df38332f 100644
--- a/toolkits/ob-is/pom.xml
+++ b/toolkits/ob-is/pom.xml
@@ -29,7 +29,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wso2-obiam-toolkit-berlin</artifactId>
+    <artifactId>wso2ob-is-toolkit-berlin</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Open Banking - Berlin Identity Server Toolkit Module</name>
     <url>http://wso2.org</url>
diff --git a/toolkits/ob-is/src/assembly/bin.xml b/toolkits/ob-is/src/assembly/bin.xml
index f663b465..459d7bb3 100644
--- a/toolkits/ob-is/src/assembly/bin.xml
+++ b/toolkits/ob-is/src/assembly/bin.xml
@@ -20,7 +20,7 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>ob.iam.toolkit.berlin</id>
     <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>wso2-obiam-toolkit-berlin-${project.version}</baseDirectory>
+    <baseDirectory>wso2ob-is-toolkit-berlin-${project.version}</baseDirectory>
 
     <formats>
         <format>zip</format>
diff --git a/toolkits/pom.xml b/toolkits/pom.xml
index 159e5051..b3dda37d 100644
--- a/toolkits/pom.xml
+++ b/toolkits/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.openbanking</groupId>
         <artifactId>reference-implementation-nextgenpsd2</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>