diff --git a/financial-services-accelerator/accelerators/fs-apim/README.md b/financial-services-accelerator/accelerators/fs-apim/README.md
index c5b498b2..9fbe6619 100644
--- a/financial-services-accelerator/accelerators/fs-apim/README.md
+++ b/financial-services-accelerator/accelerators/fs-apim/README.md
@@ -1,26 +1,26 @@
-### **WSO2 Open Banking APIM Accelerator 3.0.0**
+### **WSO2 Financial Services APIM Accelerator 4.0.0**
 
 **Try Locally:**
 
 Prerequisites:
 1. [Download](https://wso2.com/api-manager/#) the WSO2 API Manager product 
 2. Build the repository completely using the below command to create accelerator zip files.
-<code>mvn clean install -PSolution</code>
-3. Locate the Accelerator Zip file (wso2-obam-accelerator-3.0.0.zip) from 
+<code>mvn clean install -P Solution</code>
+3. Locate the Accelerator Zip file (wso2-fsam-accelerator-4.0.0.zip) from 
 the <code>target</code> folder in this directory
 4. Setup MySQL database server
 5. Install Java on your local machine
 
-Below are the simplified steps to install the WSO2 Open Banking Accelerator. For more information, 
+Below are the simplified steps to install the WSO2 Financial Services Accelerator. For more information, 
 please refer to [Quick Start Guide](https://ob.docs.wso2.com/en/latest/get-started/quick-start-guide/) or 
 to [ Complete install and Setup Guide ](https://ob.docs.wso2.com/en/latest/install-and-setup/)
 
 Steps:
 1. Extract the Base product (WSO2 API Manager product) to a preferred location (<WSO2_APIM_HOME>)
-2. Extract WSO2 OB APIM Accelerator (wso2-obam-accelerator-3.0.0.zip) to WSO2_APIM_HOME 
-3. Run <WSO2_OB_APIM_ACC_HOME>/bin/merge.sh. This will copy/install the Open Banking artifacts to 
+2. Extract WSO2 FS APIM Accelerator (wso2-fsam-accelerator-4.0.0.zip) to WSO2_APIM_HOME 
+3. Run <WSO2_FS_APIM_ACC_HOME>/bin/merge.sh. This will copy/install the Financial Services artifacts to 
 the WSO2 API Manager product
-4. Run <WSO2_OB_APIM_ACC_HOME>/bin/configure.sh. This will configure the server and create databases and  tables.
+4. Run <WSO2_FS_APIM_ACC_HOME>/bin/configure.sh. This will configure the server and create databases and  tables.
 5. Run <WSO2_APIM_HOME>/bin/wso2server.sh to start the server.
 
 
diff --git a/financial-services-accelerator/accelerators/fs-apim/bin/configure.ps1 b/financial-services-accelerator/accelerators/fs-apim/bin/configure.ps1
index 84f16ca1..ea57e597 100644
--- a/financial-services-accelerator/accelerators/fs-apim/bin/configure.ps1
+++ b/financial-services-accelerator/accelerators/fs-apim/bin/configure.ps1
@@ -68,12 +68,12 @@ Function Find-Replace {
 
 # Get the root directory location of the accelerator. Which is <BASE_PRODUCT>/<ACCELERATOR>/
 Set-Location (Join-Path $PSScriptRoot ".\..\")
-$WSO2_OB_ACCELERATOR_HOME = (Get-Location).path
-Write-Output "[INFO] Accelerator Home : $WSO2_OB_ACCELERATOR_HOME"
+$WSO2_FS_ACCELERATOR_HOME = (Get-Location).path
+Write-Output "[INFO] Accelerator Home : $WSO2_FS_ACCELERATOR_HOME"
 
 # Get the root directory of the base product.
 if ($null -eq $WSO2_BASE_PRODUCT_HOME) {
-    Set-Location (Join-Path $WSO2_OB_ACCELERATOR_HOME ".\..\")
+    Set-Location (Join-Path $WSO2_FS_ACCELERATOR_HOME ".\..\")
     $WSO2_BASE_PRODUCT_HOME = (Get-Location).path
 }
 Write-Output "[INFO] Base Product Home : $WSO2_BASE_PRODUCT_HOME"
@@ -90,16 +90,16 @@ if (-NOT(Test-Path (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components")))
 }
 
 # Get the location of the configure.properties
-$CONFIG_PROPERTIES_PATH = Join-Path $WSO2_OB_ACCELERATOR_HOME "repository\conf\configure.properties"
+$CONFIG_PROPERTIES_PATH = Join-Path $WSO2_FS_ACCELERATOR_HOME "repository\conf\configure.properties"
 Write-Output "[INFO] configure.properties location : $CONFIG_PROPERTIES_PATH"
 
 # Load the variables in the configure.properties file
 $PROPERTIES = ConvertFrom-StringData (Get-Content $CONFIG_PROPERTIES_PATH -raw)
 
-$SELECTED_DEPLOYMENT_TOML_FILE = Join-Path $WSO2_OB_ACCELERATOR_HOME $PROPERTIES.'PRODUCT_CONF_PATH'
+$SELECTED_DEPLOYMENT_TOML_FILE = Join-Path $WSO2_FS_ACCELERATOR_HOME $PROPERTIES.'PRODUCT_CONF_PATH'
 Write-Output "[INFO] Selected deployment.toml location : $SELECTED_DEPLOYMENT_TOML_FILE"
 
-$DEPLOYMENT_TOML_FILE = Join-Path $WSO2_OB_ACCELERATOR_HOME "repository\resources\deployment.toml"
+$DEPLOYMENT_TOML_FILE = Join-Path $WSO2_FS_ACCELERATOR_HOME "repository\resources\deployment.toml"
 # Temporary copy the selected toml file so we can make changes to it.
 Copy-Item -Path $SELECTED_DEPLOYMENT_TOML_FILE $DEPLOYMENT_TOML_FILE
 Write-Output "[INFO] Temporary deployment.toml location : $DEPLOYMENT_TOML_FILE"
@@ -139,7 +139,6 @@ Function Set-Datasources
 Function Set-Hostnames {
     Find-Replace $DEPLOYMENT_TOML_FILE "APIM_HOSTNAME" "$( $PROPERTIES.'APIM_HOSTNAME' )"
     Find-Replace $DEPLOYMENT_TOML_FILE "IS_HOSTNAME" "$( $PROPERTIES.'IS_HOSTNAME' )"
-    Find-Replace $DEPLOYMENT_TOML_FILE "BI_HOSTNAME" "$( $PROPERTIES.'BI_HOSTNAME' )"
 }
 
 # A utility function to create a database.
diff --git a/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh b/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh
index f04cb235..265bf794 100755
--- a/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh
+++ b/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh
@@ -16,10 +16,10 @@
  # under the License.
 
 # command to execute
-# ./merge.sh <WSO2_OB_APIM_HOME>
+# ./merge.sh <WSO2_APIM_HOME>
 
 source $(pwd)/../repository/conf/configure.properties
-WSO2_OB_APIM_HOME=$1
+WSO2_APIM_HOME=$1
 
 # set accelerator home
 cd ../
@@ -27,15 +27,15 @@ ACCELERATOR_HOME=$(pwd)
 echo "Accelerator Home: ${ACCELERATOR_HOME}"
 
 # set product home
-if [ "${WSO2_OB_APIM_HOME}" == "" ]
+if [ "${WSO2_APIM_HOME}" == "" ]
   then
     cd ../
-    WSO2_OB_APIM_HOME=$(pwd)
-    echo "Product Home: ${WSO2_OB_APIM_HOME}"
+    WSO2_APIM_HOME=$(pwd)
+    echo "Product Home: ${WSO2_APIM_HOME}"
 fi
 
 # validate product home
-if [ ! -d "${WSO2_OB_APIM_HOME}/repository/components" ]; then
+if [ ! -d "${WSO2_APIM_HOME}/repository/components" ]; then
   echo -e "\n\aERROR:specified product path is not a valid carbon product path\n";
   exit 2;
 else
@@ -86,7 +86,7 @@ create_databases() {
 
             echo -e "\nUpdate am_application_registration table input field size (temporary)"
             echo -e "=======================================================================\n"
-            sed -i -e 's|INPUTS VARCHAR(1000)|INPUTS VARCHAR(7500)|g' ${WSO2_OB_APIM_HOME}/dbscripts/apimgt/mysql.sql
+            sed -i -e 's|INPUTS VARCHAR(1000)|INPUTS VARCHAR(7500)|g' ${WSO2_APIM_HOME}/dbscripts/apimgt/mysql.sql
 
 
             echo -e "\nCreate database tables"
@@ -101,8 +101,8 @@ create_databases() {
 
             echo -e "\nUpdate idn_req_object_reference table foreign keys (temporary)"
             echo -e "=======================================================================\n"
-            sed -i -e 's|FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ,|FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID),|g' ${WSO2_OB_APIM_HOME}/dbscripts/apimgt/mssql.sql
-            sed -i -e 's|FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID),|FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE,|g' ${WSO2_OB_APIM_HOME}/dbscripts/apimgt/mssql.sql
+            sed -i -e 's|FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ,|FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID),|g' ${WSO2_APIM_HOME}/dbscripts/apimgt/mssql.sql
+            sed -i -e 's|FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID),|FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE,|g' ${WSO2_APIM_HOME}/dbscripts/apimgt/mssql.sql
 
     fi
 }
@@ -123,25 +123,24 @@ create_mysql_databases() {
 };
 
 create_mysql_database_tables() {
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_APIMGT} -h${DB_HOST} -e "SOURCE ${WSO2_OB_APIM_HOME}/dbscripts/apimgt/mysql.sql";
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_APIMGT} -h${DB_HOST} -e "SOURCE ${WSO2_APIM_HOME}/dbscripts/apimgt/mysql.sql";
     echo "Database tables Created for: ${DB_APIMGT}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_AM_CONFIG} -h${DB_HOST} -e "SOURCE ${WSO2_OB_APIM_HOME}/dbscripts/mysql.sql";
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_AM_CONFIG} -h${DB_HOST} -e "SOURCE ${WSO2_APIM_HOME}/dbscripts/mysql.sql";
     echo "Database tables Created for: ${DB_AM_CONFIG}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_GOV} -h${DB_HOST} -e "SOURCE ${WSO2_OB_APIM_HOME}/dbscripts/mysql.sql";
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_GOV} -h${DB_HOST} -e "SOURCE ${WSO2_APIM_HOME}/dbscripts/mysql.sql";
     echo "Database tables Created for: ${DB_GOV}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_USER_STORE} -h${DB_HOST} -e "SOURCE ${WSO2_OB_APIM_HOME}/dbscripts/mysql.sql";
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_USER_STORE} -h${DB_HOST} -e "SOURCE ${WSO2_APIM_HOME}/dbscripts/mysql.sql";
     echo "Database tables Created for: ${DB_USER_STORE}"
 };
 
 add_json_fault_sequence() {
-  sed -i -e 's|</sequence>|\t<sequence key="jsonConverter"/>\n</sequence>|g' ${WSO2_OB_APIM_HOME}/repository/deployment/server/synapse-configs/default/sequences/_cors_request_handler_.xml
+  sed -i -e 's|</sequence>|\t<sequence key="jsonConverter"/>\n</sequence>|g' ${WSO2_APIM_HOME}/repository/deployment/server/synapse-configs/default/sequences/_cors_request_handler_.xml
 }
 
 echo -e "\nReplace hostnames \n"
 echo -e "================================================\n"
 sed -i -e 's|APIM_HOSTNAME|'${APIM_HOSTNAME}'|g' ${DEPLOYMENT_TOML_FILE}
 sed -i -e 's|IS_HOSTNAME|'${IS_HOSTNAME}'|g' ${DEPLOYMENT_TOML_FILE}
-sed -i -e 's|BI_HOSTNAME|'${BI_HOSTNAME}'|g' ${DEPLOYMENT_TOML_FILE}
 
 echo -e "\nConfigure datasources \n"
 echo -e "================================================\n"
@@ -153,7 +152,7 @@ create_databases;
 
 echo -e "\nCopy deployment.toml file to repository/conf \n"
 echo -e "================================================\n"
-cp ${DEPLOYMENT_TOML_FILE} ${WSO2_OB_APIM_HOME}/repository/conf/
+cp ${DEPLOYMENT_TOML_FILE} ${WSO2_APIM_HOME}/repository/conf/
 rm ${DEPLOYMENT_TOML_FILE}
 rm -f ${DEPLOYMENT_TOML_FILE}-e
 
diff --git a/financial-services-accelerator/accelerators/fs-apim/bin/merge.ps1 b/financial-services-accelerator/accelerators/fs-apim/bin/merge.ps1
index d49d9dc0..99d2e8f0 100644
--- a/financial-services-accelerator/accelerators/fs-apim/bin/merge.ps1
+++ b/financial-services-accelerator/accelerators/fs-apim/bin/merge.ps1
@@ -43,12 +43,12 @@ Function Exit-Clean {
 
 # Get the root directory location of the accelerator. Which is <BASE_PRODUCT>/<ACCELERATOR>/
 Set-Location (Join-Path $PSScriptRoot ".\..\")
-$WSO2_OB_ACCELERATOR_HOME = (Get-Location).path
-Write-Output "[INFO] Accelerator Home : $WSO2_OB_ACCELERATOR_HOME"
+$WSO2_FS_ACCELERATOR_HOME = (Get-Location).path
+Write-Output "[INFO] Accelerator Home : $WSO2_FS_ACCELERATOR_HOME"
 
 # Get the root directory of the base product.
 if ($null -eq $WSO2_BASE_PRODUCT_HOME) {
-    Set-Location (Join-Path $WSO2_OB_ACCELERATOR_HOME ".\..\")
+    Set-Location (Join-Path $WSO2_FS_ACCELERATOR_HOME ".\..\")
     $WSO2_BASE_PRODUCT_HOME = (Get-Location).path
 }
 Write-Output "[INFO] Base Product Home : $WSO2_BASE_PRODUCT_HOME"
@@ -65,17 +65,17 @@ if (-NOT(Test-Path (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components")))
 }
 
 # Remove old open-banking artifacts
-Write-Output "[INFO] Removing old open-banking artifacts..."
-Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\dropins") | Where-Object{$_.Name -Match "com.wso2.openbanking.accelerator.*"} | Remove-Item
-Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\lib") | Where-Object{$_.Name -Match "com.wso2.openbanking.accelerator.*"} | Remove-Item
-Write-Output "[INFO] All previous OB artifacts have been deleted!"
+Write-Output "[INFO] Removing old financial services artifacts..."
+Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\dropins") | Where-Object{$_.Name -Match "org.wso2.financial.services.accelerator.*"} | Remove-Item
+Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\lib") | Where-Object{$_.Name -Match "org.wso2.financial.services.accelerator.*"} | Remove-Item
+Write-Output "[INFO] All previous FS artifacts have been deleted!"
 
-# Copying all the new OB artifacts to the base product
-# Copy-Item -Force -Recurse -Verbose (Join-Path $WSO2_OB_ACCELERATOR_HOME "carbon-home\*") -Destination $WSO2_BASE_PRODUCT_HOME
+# Copying all the new FS artifacts to the base product
+# Copy-Item -Force -Recurse -Verbose (Join-Path $WSO2_FS_ACCELERATOR_HOME "carbon-home\*") -Destination $WSO2_BASE_PRODUCT_HOME
 # Using Robocopy.exe becuase powershell Copy-Item cmdlet doesn't do recursive copying after a certain number of subdirectories.
-Write-Output "[INFO] Copying new open-banking artifacts..."
-Robocopy.exe (Join-Path $WSO2_OB_ACCELERATOR_HOME "carbon-home") $WSO2_BASE_PRODUCT_HOME * /E /NFL /NDL /NJH /NJS /nc /ns /np
-Write-Output "[INFO] All the new OB artifacts has been copied!"
+Write-Output "[INFO] Copying new financial services artifacts..."
+Robocopy.exe (Join-Path $WSO2_FS_ACCELERATOR_HOME "carbon-home") $WSO2_BASE_PRODUCT_HOME * /E /NFL /NDL /NJH /NJS /nc /ns /np
+Write-Output "[INFO] All the new FS artifacts has been copied!"
 
 Write-Output "[INFO] Completed!"
 
diff --git a/financial-services-accelerator/accelerators/fs-apim/bin/merge.sh b/financial-services-accelerator/accelerators/fs-apim/bin/merge.sh
index c44f298b..8ab67628 100755
--- a/financial-services-accelerator/accelerators/fs-apim/bin/merge.sh
+++ b/financial-services-accelerator/accelerators/fs-apim/bin/merge.sh
@@ -15,11 +15,11 @@
  # specific language governing permissions and limitations
  # under the License.
 
-# merge.sh script copy the WSO2 OB APIM accelerator artifacts on top of WSO2 APIM base product
+# merge.sh script copy the WSO2 FS APIM accelerator artifacts on top of WSO2 APIM base product
 #
-# merge.sh <WSO2_OB_APIM_HOME>
+# merge.sh <WSO2_APIM_HOME>
 
-WSO2_OB_APIM_HOME=$1
+WSO2_APIM_HOME=$1
 
 # set accelerator home
 cd ../
@@ -27,15 +27,15 @@ ACCELERATOR_HOME=$(pwd)
 echo "Accelerator home is: ${ACCELERATOR_HOME}"
 
 # set product home
-if [ "${WSO2_OB_APIM_HOME}" == "" ];
+if [ "${WSO2_APIM_HOME}" == "" ];
   then
     cd ../
-    WSO2_OB_APIM_HOME=$(pwd)
-    echo "Product home is: ${WSO2_OB_APIM_HOME}"
+    WSO2_APIM_HOME=$(pwd)
+    echo "Product home is: ${WSO2_APIM_HOME}"
 fi
 
 # validate product home
-if [ ! -d "${WSO2_OB_APIM_HOME}/repository/components" ]; then
+if [ ! -d "${WSO2_APIM_HOME}/repository/components" ]; then
   echo -e "\n\aERROR:specified product path is not a valid carbon product path\n";
   exit 2;
 else
@@ -44,5 +44,5 @@ fi
 
 echo -e "\nCopying open banking artifacts\n"
 echo -e "================================================\n"
-cp -r ${ACCELERATOR_HOME}/carbon-home/* "${WSO2_OB_APIM_HOME}"/
+cp -r ${ACCELERATOR_HOME}/carbon-home/* "${WSO2_APIM_HOME}"/
 echo -e "\nComplete!\n"
diff --git a/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
index 11fbbf2d..b40fab63 100644
--- a/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
+++ b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
@@ -18,14 +18,18 @@
  -->
 
 <Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
+    <Common>
+        <Cache>
+            <CacheAccessExpiry>60</CacheAccessExpiry>
+            <CacheModifiedExpiry>60</CacheModifiedExpiry>
+        </Cache>
+    </Common>
     <Gateway>
-        <RequestRouter>com.wso2.openbanking.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
-        <!-- Custom Throttle Data publisher -->
-        <CustomThrottleDataPublisher>com.wso2.openbanking.sample.throttling.publisher.SampleThrottlingDataPublisher</CustomThrottleDataPublisher>
-        <OpenBankingGatewayExecutors>
+        <RequestRouter>org.wso2.financial.services.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
+        <FinancialServicesGatewayExecutors>
 
-        </OpenBankingGatewayExecutors>
-        <ConsentValidationEndpoint>https://localhost:9446/api/openbanking/consent/validate</ConsentValidationEndpoint>
+        </FinancialServicesGatewayExecutors>
+        <ConsentValidationEndpoint>https://localhost:9446/api/fs/consent/validate</ConsentValidationEndpoint>
         <Cache>
             <GatewayCache>
                 <CacheAccessExpiry>60</CacheAccessExpiry>
@@ -34,66 +38,6 @@
         </Cache>
     </Gateway>
     <PublisherURL>https://localhost:9443</PublisherURL>
-    <APIMAnalytics>
-        <Enabled>false</Enabled>
-    </APIMAnalytics>
-    <DataPublishing>
-        <Enabled>true</Enabled>
-        <Username>admin</Username>
-        <Password>admin</Password>
-        <ServerURL>{tcp://localhost:7612}</ServerURL>
-        <AuthURL></AuthURL>
-        <!-- Allowed values: Thrift -->
-        <Protocol>Thrift</Protocol>
-        <PoolSize>10</PoolSize>
-        <QueueSize>32768</QueueSize>
-        <WorkerThreadCount>10</WorkerThreadCount>
-        <PoolWaitTimeMs>60000</PoolWaitTimeMs>
-        <Thrift>
-            <PublishingTimeout>2000</PublishingTimeout>
-            <Streams>
-                <APIInputStream>
-                    <Attribute name="consentId" priority="1"/>
-                    <Attribute name="consumerId" priority="2"/>
-                    <Attribute name="clientId" priority="3"/>
-                    <Attribute name="userAgent" priority="4"/>
-                    <Attribute name="statusCode" priority="5"/>
-                    <Attribute name="httpMethod" priority="6"/>
-                    <Attribute name="responsePayloadSize" priority="7"/>
-                    <Attribute name="electedResource" priority="8"/>
-                    <Attribute name="apiName" priority="9"/>
-                    <Attribute name="apiSpecVersion" priority="10"/>
-                    <Attribute name="timestamp" priority="11"/>
-                    <Attribute name="messageId" priority="12"/>
-                </APIInputStream>
-                <AuthenticationInputStream>
-                    <Attribute name="userId" priority="1"/>
-                    <Attribute name="authenticationStep" priority="2"/>
-                    <Attribute name="authenticationStatus" priority="3"/>
-                    <Attribute name="authenticationApproach" priority="4"/>
-                    <Attribute name="psuChannel" priority="5"/>
-                    <Attribute name="timestamp" priority="6"/>
-                </AuthenticationInputStream>
-            </Streams>
-        </Thrift>
-    </DataPublishing>
-    <DCR>
-        <APIMRESTEndPoints>
-            <AppCreation>api/am/devportal/v2/applications</AppCreation>
-            <KeyGeneration>api/am/devportal/v2/applications/application-id/map-keys</KeyGeneration>
-            <RetrieveAPIS>api/am/devportal/v2/apis</RetrieveAPIS>
-            <SubscribeAPIs>api/am/devportal/v2/subscriptions/multiple</SubscribeAPIs>
-        </APIMRESTEndPoints>
-        <TokenEndpoint>https://localhost:9446/oauth2/token</TokenEndpoint>
-        <RegulatoryAPINames>
-            <API></API>
-        </RegulatoryAPINames>
-        <JWKSEndpointName>jwks_uri</JWKSEndpointName>
-        <JWKS-Retriever>
-            <ConnectionTimeout>0</ConnectionTimeout>
-            <ReadTimeout>0</ReadTimeout>
-        </JWKS-Retriever>
-    </DCR>
     <HTTPConnectionPool>
         <MaxConnections>2000</MaxConnections>
         <MaxConnectionsPerRoute>1500</MaxConnectionsPerRoute>
diff --git a/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
index 7038429d..ccaf14d6 100644
--- a/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
+++ b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -19,551 +19,61 @@
 
 <Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
     <Common>
-        <Identity>
-            <Cache>
-                {% if open_banking.common.identity.cache.cache_access_expiry_minutes is defined %}
-                <CacheAccessExpiry>{{open_banking.common.identity.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
-                {% else %}
-                <CacheAccessExpiry>60</CacheAccessExpiry>
-                {% endif %}
-                {% if open_banking.common.identity.cache.cache_modified_expiry_minutes is defined %}
-                <CacheModifiedExpiry>{{open_banking.common.identity.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
-                {% else %}
-                <CacheModifiedExpiry>60</CacheModifiedExpiry>
-                {% endif %}
-            </Cache>
-        </Identity>
+        <Cache>
+            {% if financial_services.common.cache.cache_access_expiry_minutes is defined %}
+            <CacheAccessExpiry>{{financial_services.common.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
+            {% else %}
+            <CacheAccessExpiry>60</CacheAccessExpiry>
+            {% endif %}
+            {% if financial_services.common.cache.cache_modified_expiry_minutes is defined %}
+            <CacheModifiedExpiry>{{financial_services.common.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
+            {% else %}
+            <CacheModifiedExpiry>60</CacheModifiedExpiry>
+            {% endif %}
+        </Cache>
     </Common>
     <Gateway>
-        {% if open_banking.gateway.request_router is defined %}
-        <RequestRouter>{{open_banking.gateway.request_router}}</RequestRouter>
+        {% if financial_services.gateway.request_router is defined %}
+        <RequestRouter>{{financial_services.gateway.request_router}}</RequestRouter>
         {% else %}
-        <RequestRouter>com.wso2.openbanking.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
-        {% endif %}
-        {% if open_banking.gateway.throttling.throttling_data_publisher is defined %}
-        <CustomThrottleDataPublisher>{{open_banking.gateway.throttling.throttling_data_publisher}}</CustomThrottleDataPublisher>
+        <RequestRouter>org.wso2.financial.services.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
         {% endif %}
-        <OpenBankingGatewayExecutors>
-            {% for type in open_banking.gateway.openbanking_gateway_executors.type %}
+        <FinancialServicesGatewayExecutors>
+            {% for type in financial_services.gateway.openbanking_gateway_executors.type %}
                 <{{type.name}}>
                     {% for executor in type.executors %}
                        <Executor class="{{executor.name}}" priority="{{executor.priority}}"/>
                         {% endfor %}
                  </{{type.name}}>
             {% endfor %}
-        </OpenBankingGatewayExecutors>
-        {% if open_banking.gateway.consent.validation.endpoint is defined %}
-        <ConsentValidationEndpoint>{{open_banking.gateway.consent.validation.endpoint}}</ConsentValidationEndpoint>
+        </FinancialServicesGatewayExecutors>
+        {% if financial_services.gateway.consent.validation.endpoint is defined %}
+        <ConsentValidationEndpoint>{{financial_services.gateway.consent.validation.endpoint}}</ConsentValidationEndpoint>
         {% else %}
-        <ConsentValidationEndpoint>https://localhost:9446/api/openbanking/consent/validate</ConsentValidationEndpoint>
+        <ConsentValidationEndpoint>https://localhost:9446/api/fs/consent/validate</ConsentValidationEndpoint>
         {% endif %}
         <Cache>
             <GatewayCache>
-                {% if open_banking.gateway.cache.cache_access_expiry_minutes is defined %}
-                    <CacheAccessExpiry>{{open_banking.gateway.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
+                {% if financial_services.gateway.cache.cache_access_expiry_minutes is defined %}
+                    <CacheAccessExpiry>{{financial_services.gateway.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
                 {% endif %}
-                {% if open_banking.gateway.cache.cache_modified_expiry_minutes is defined %}
-                    <CacheModifiedExpiry>{{open_banking.gateway.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
+                {% if financial_services.gateway.cache.cache_modified_expiry_minutes is defined %}
+                    <CacheModifiedExpiry>{{financial_services.gateway.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
                 {% endif %}
             </GatewayCache>
         </Cache>
-
-        <CertificateManagement>
-
-                <!-- Expiry time for the cache (in seconds) for storing the validation result of the certificates-->
-        		{% if open_banking.gateway.certificate_management.certificate.cache_expiry is defined %}
-                <ClientCertificateCacheExpiry>{{open_banking.gateway.certificate_management.certificate.cache_expiry}}</ClientCertificateCacheExpiry>
-        		{% else %}
-        		<ClientCertificateCacheExpiry>3600</ClientCertificateCacheExpiry>
-        		{% endif %}
-
-                <!-- Enable certificate OCSP and CRL validation -->
-        		{% if open_banking.gateway.certificate_management.certificate.revocation.enabled is defined %}
-                <CertificateRevocationValidationEnabled>{{open_banking.gateway.certificate_management.certificate.revocation.enabled}}</CertificateRevocationValidationEnabled>
-        		{% else %}
-        		<CertificateRevocationValidationEnabled>true</CertificateRevocationValidationEnabled>
-        		{% endif %}
-
-        		<!-- Enable certificate issuer validation -->
-        		{% if open_banking.gateway.certificate_management.certificate.issuer.validation.enabled is defined %}
-                <TransportCertIssuerValidationEnabled>{{open_banking.gateway.certificate_management.certificate.issuer.validation.enabled}}</TransportCertIssuerValidationEnabled>
-        		{% else %}
-        		<TransportCertIssuerValidationEnabled>true</TransportCertIssuerValidationEnabled>
-        		{% endif %}
-
-                <!-- Proxy server configuration to do TPP certificate revocation checks -->
-                <CertificateRevocationProxy>
-        			{% if open_banking.gateway.certificate_management.certificate.revocation.proxy.enabled is defined %}
-                    <Enabled>{{open_banking.gateway.certificate_management.certificate.revocation.proxy.enabled}}</Enabled>
-        			{% else %}
-        			<Enabled>false</Enabled>
-        			{% endif %}
-
-        			{% if open_banking.gateway.certificate_management.certificate.revocation.proxy.host is defined %}
-                    <ProxyHost>{{open_banking.gateway.certificate_management.certificate.revocation.proxy.host}}</ProxyHost>
-                    {% else %}
-        			<ProxyHost>PROXY_HOSTNAME</ProxyHost>
-        			{% endif %}
-
-        			{% if open_banking.gateway.certificate_management.certificate.revocation.proxy.port is defined %}
-        			<ProxyPort>{{open_banking.gateway.certificate_management.certificate.revocation.proxy.port}}</ProxyPort>
-        			{% else %}
-        			<ProxyPort>8080</ProxyPort>
-        			{% endif %}
-                </CertificateRevocationProxy>
-
-        		<!-- Set OCSP and CRL validation order -->
-        		<RevocationValidators>
-        			{% for validator in open_banking.gateway.certificate_management.certificate.revocation.validator %}
-        				<RevocationValidator type="{{validator.type}}" priority="{{validator.priority}}" />
-                    {% endfor %}
-        		</RevocationValidators>
-
-                <!-- Retry count for validating certificate OCSP and CRL revocation status -->
-        		{% if open_banking.gateway.certificate_management.certificate.revocation.retry_count is defined %}
-                <CertificateRevocationValidationRetryCount>{{open_banking.gateway.certificate_management.certificate.revocation.retry_count}}</CertificateRevocationValidationRetryCount>
-        		{% else %}
-        		<CertificateRevocationValidationRetryCount>3</CertificateRevocationValidationRetryCount>
-        		{% endif %}
-
-                <!-- ConnectTimeout for validating certificate OCSP and CRL revocation status -->
-                {% if open_banking.gateway.certificate_management.certificate.revocation.connect_timeout is defined %}
-                <CertificateRevocationValidationConnectTimeout>{{open_banking.gateway.certificate_management.certificate.revocation.connect_timeout}}</CertificateRevocationValidationConnectTimeout>
-                {% else %}
-                <CertificateRevocationValidationConnectTimeout>10000</CertificateRevocationValidationConnectTimeout>
-                {% endif %}
-
-                <!-- ConnectionRequestTimeout for validating certificate OCSP and CRL revocation status -->
-                {% if open_banking.gateway.certificate_management.certificate.revocation.connection_request_timeout is defined %}
-                <CertificateRevocationValidationConnectionRequestTimeout>{{open_banking.gateway.certificate_management.certificate.revocation.connection_request_timeout}}</CertificateRevocationValidationConnectionRequestTimeout>
-                {% else %}
-                <CertificateRevocationValidationConnectionRequestTimeout>10000</CertificateRevocationValidationConnectionRequestTimeout>
-                {% endif %}
-
-                <!-- SocketTimeout for validating certificate OCSP and CRL revocation status -->
-                {% if open_banking.gateway.certificate_management.certificate.revocation.socket_timeout is defined %}
-                <CertificateRevocationValidationSocketTimeout>{{open_banking.gateway.certificate_management.certificate.revocation.socket_timeout}}</CertificateRevocationValidationSocketTimeout>
-                {% else %}
-                <CertificateRevocationValidationSocketTimeout>10000</CertificateRevocationValidationSocketTimeout>
-                {% endif %}
-
-                <!-- List of issuer DNs whose issued certificates needs to be skipped from certificate revocation
-                validation.
-                e.g. <IssuerDN>CN=Test Pre-Production Issuing CA, O=Test, C=GB</IssuerDN>
-                -->
-                <RevocationValidationExcludedIssuers>
-                    {% for excluded in open_banking.gateway.certificate_management.certificate.revocation.excluded %}
-        			<IssuerDN>{{excluded.issuer_dn}}</IssuerDN>
-        			{% endfor %}
-                </RevocationValidationExcludedIssuers>
-
-                <!--Truststore dynamic loading interval (in seconds). Default value has been set to 86400 seconds-->
-        		{% if open_banking.gateway.certificate_management.truststore.dynamic_loading_interval is defined %}
-                <TrustStoreDynamicLoadingInterval>{{open_banking.gateway.certificate_management.truststore.dynamic_loading_interval}}</TrustStoreDynamicLoadingInterval>
-        		{% else %}
-        		<TrustStoreDynamicLoadingInterval>86400</TrustStoreDynamicLoadingInterval>
-        		{% endif %}
-        		{% if open_banking.gateway.certificate_management.client_transport_cert_header_name is defined %}
-                <ClientTransportCertHeaderName>{{open_banking.gateway.certificate_management.client_transport_cert_header_name}}</ClientTransportCertHeaderName>
-                {% else %}
-                <ClientTransportCertHeaderName>x-wso2-mutual-auth-cert</ClientTransportCertHeaderName>
-                {% endif %}
-                {% if open_banking.gateway.certificate_management.url_encode_client_transport_cert_header_enabled is defined %}
-                <UrlEncodeClientTransportCertHeaderEnabled>{{open_banking.gateway.certificate_management.url_encode_client_transport_cert_header_enabled}}</UrlEncodeClientTransportCertHeaderEnabled>
-                {% else %}
-                <UrlEncodeClientTransportCertHeaderEnabled>true</UrlEncodeClientTransportCertHeaderEnabled>
-                {% endif %}
-            </CertificateManagement>
-
-            <TPPManagement>
-
-            	<TPPValidation>
-
-        			{% if open_banking.gateway.tpp_management.tpp_validation.cache_expiry is defined %}
-            		<TPPValidationCacheExpiry>{{open_banking.gateway.tpp_management.tpp_validation.cache_expiry}}</TPPValidationCacheExpiry>
-            		{% else %}
-        			<TPPValidationCacheExpiry>3600</TPPValidationCacheExpiry>
-        			{% endif %}
-
-        			{% if open_banking.gateway.tpp_management.tpp_validation.enabled is defined %}
-            		<Enabled>{{open_banking.gateway.tpp_management.tpp_validation.enabled}}</Enabled>
-            		{% else %}
-        			<Enabled>false</Enabled>
-        			{% endif %}
-
-        			{% if open_banking.gateway.tpp_management.tpp_validation.implementation_path is defined %}
-        			<ServiceImplClass>{{open_banking.gateway.tpp_management.tpp_validation.implementation_path}}</ServiceImplClass>
-        			{% else %}
-        			<ServiceImplClass>path.to.impl.class</ServiceImplClass>
-        			{% endif %}
-            	</TPPValidation>
-
-            	<PSD2RoleValidation>
-        			{% if open_banking.gateway.tpp_management.psd2_role_validation.enabled is defined %}
-            		<Enabled>{{open_banking.gateway.tpp_management.psd2_role_validation.enabled}}</Enabled>
-        			{% else %}
-        			<Enabled>true</Enabled>
-        			{% endif %}
-            	</PSD2RoleValidation>
-
-            	<AllowedScopes>
-        			{% for scope in open_banking.gateway.tpp_management.allowed_scopes %}
-            	    <Scope name="{{scope.name}}" roles="{{scope.roles}}" />
-        			{% endfor %}
-            	</AllowedScopes>
-
-            </TPPManagement>
     </Gateway>
-    <DCR>
-        <APIMRESTEndPoints>
-            {% if open_banking.dcr.apim_rest_endpoints.app_creation is defined %}
-                <AppCreation>{{open_banking.dcr.apim_rest_endpoints.app_creation}}</AppCreation>
-            {% else %}
-                <AppCreation>api/am/devportal/v2/applications</AppCreation>
-            {% endif %}
-            {% if open_banking.dcr.apim_rest_endpoints.key_generation is defined %}
-                <KeyGeneration>{{open_banking.dcr.apim_rest_endpoints.key_generation}}</KeyGeneration>
-            {% else %}
-                <KeyGeneration>api/am/devportal/v2/applications/application-id/map-keys</KeyGeneration>
-            {% endif %}
-            {% if open_banking.dcr.apim_rest_endpoints.api_retrieve is defined %}
-                <RetrieveAPIS>{{open_banking.dcr.apim_rest_endpoints.api_retrieve}}</RetrieveAPIS>
-            {% else %}
-                <RetrieveAPIS>api/am/devportal/v2/apis</RetrieveAPIS>
-            {% endif %}
-            {% if open_banking.dcr.apim_rest_endpoints.api_subscribe is defined %}
-                <SubscribeAPIs>{{open_banking.dcr.apim_rest_endpoints.api_subscribe}}</SubscribeAPIs>
-            {% else %}
-                <SubscribeAPIs>api/am/devportal/v2/subscriptions/multiple</SubscribeAPIs>
-            {% endif %}
-            {% if open_banking.dcr.apim_rest_endpoints.retrieve_subscribe is defined %}
-                <RetrieveSubscribedAPIs>{{open_banking.dcr.apim_rest_endpoints.retrieve_subscribe}}</RetrieveSubscribedAPIs>
-            {% else %}
-                <RetrieveSubscribedAPIs>api/am/devportal/v2/subscriptions</RetrieveSubscribedAPIs>
-            {% endif %}
-        </APIMRESTEndPoints>
-        <RegulatoryAPINames>
-        {% for api in open_banking.dcr.regulatory_api %}
-            <API name = "{{api.api_name}}"  roles = "{{api.roles}}"/>
-        {% endfor %}
-        </RegulatoryAPINames>
-        {% if open_banking.dcr.jwks_endpoint_name is defined %}
-        <JWKSEndpointName>{{open_banking.dcr.jwks_endpoint_name}}</JWKSEndpointName>
-        {% else %}
-        <JWKSEndpointName>software_jwks_endpoint</JWKSEndpointName>
-        {% endif %}
-        {% if open_banking.dcr.app_name_claim is defined %}
-        <ApplicationName>{{open_banking.dcr.app_name_claim}}</ApplicationName>
-        {% else %}
-        <ApplicationName>software_client_name</ApplicationName>
-        {% endif %}
-        {% if open_banking.dcr.token_endpoint is defined %}
-        <TokenEndpoint>{{open_banking.dcr.token_endpoint}}</TokenEndpoint>
-        {% else %}
-        <TokenEndpoint>https://localhost:9443/oauth2/token</TokenEndpoint>
-        {% endif %}
-        <JWKS-Retriever>
-            {% if open_banking.dcr.jwks_retriever.connection_timeout is defined %}
-            <ConnectionTimeout>{{open_banking.dcr.jwks_retriever.connection_timeout}}</ConnectionTimeout>
-            {% else %}
-            <ConnectionTimeout>0</ConnectionTimeout>
-            {% endif %}
-            {% if open_banking.dcr.jwks_retriever.read_timeout is defined %}
-            <ReadTimeout>{{open_banking.dcr.jwks_retriever.read_timeout}}</ReadTimeout>
-            {% else %}
-            <ReadTimeout>0</ReadTimeout>
-            {% endif %}
-        </JWKS-Retriever>
-        {% if open_banking.dcr.use_softwareIdForAppName is defined %}
-        <UseSoftwareIdAsAppName>{{open_banking.dcr.use_softwareIdForAppName}}</UseSoftwareIdAsAppName>
-        {% else %}
-        <UseSoftwareIdAsAppName>true</UseSoftwareIdAsAppName>
-        {% endif %}
-        {% if open_banking.dcr.isRequestJWT is defined %}
-        <RequestJWTValidation>{{open_banking.dcr.isRequestJWT}}</RequestJWTValidation>
-        {% else %}
-        <RequestJWTValidation>true</RequestJWTValidation>
-        {% endif %}
-        <RegistrationRequestParams>
-            <SoftwareEnvironmentIdentification>
-                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_name is defined %}
-                    <PropertyName>{{open_banking.dcr.registration.software_environment_identification.ssa_property_name}}</PropertyName>
-                {% else %}
-                    <PropertyName>software_environment</PropertyName>
-                {% endif %}
-                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox is defined %}
-                    <PropertyValueForSandbox>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox}}</PropertyValueForSandbox>
-                {% else %}
-                    <PropertyValueForSandbox>sandbox</PropertyValueForSandbox>
-                {% endif %}
-                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production is defined %}
-                    <PropertyValueForProduction>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production}}</PropertyValueForProduction>
-                {% else %}
-                    <PropertyValueForProduction>production</PropertyValueForProduction>
-                {% endif %}
-            </SoftwareEnvironmentIdentification>
-        </RegistrationRequestParams>
-    </DCR>
-    <KeyManagerName>{{open_banking.keyManager.name}}</KeyManagerName>
-    {% if open_banking.publisher.hostname is defined %}
-    <PublisherURL>{{open_banking.publisher.hostname}}</PublisherURL>
+    {% if financial_services.publisher_url is defined %}
+    <PublisherURL>{{financial_services.publisher_url}}</PublisherURL>
     {% else %}
     <PublisherURL>https://localhost:9443</PublisherURL>
     {% endif %}
-    <APIMAnalytics>
-    {% if open_banking.apim.analytics.enable is defined %}
-        <Enabled>{{open_banking.apim.analytics.enable}}</Enabled>
-    {% else %}
-        <Enabled>false</Enabled>
-    {% endif %}
-    </APIMAnalytics>
-    <ELKAnalytics>
-        {% if open_banking.analytics.elk is defined %}
-            <Enabled>{{open_banking.analytics.elk.enabled}}</Enabled>
-        {% else %}
-            <Enabled>false</Enabled>
-        {% endif %}
-    </ELKAnalytics>
-    <DataPublishing>
-    {% if open_banking.data_publishing.enable is defined %}
-        <Enabled>{{open_banking.data_publishing.enable}}</Enabled>
-    {% else %}
-        <Enabled>false</Enabled>
-    {% endif %}
-        <!-- Administrator username to login to the SI server for data publishing. -->
-    {% if open_banking.data_publishing.username is defined %}
-        <Username>{{open_banking.data_publishing.username}}</Username>
-    {% else %}
-        <Username>admin@wso2.com@carbon.super</Username>
-    {% endif %}
-        <!-- Administrator password to login to the SI server for data publishing. -->
-    {% if open_banking.data_publishing.password is defined %}
-        <Password>{{open_banking.data_publishing.password}}</Password>
-    {% else %}
-        <Password>wso2123</Password>
-    {% endif %}
-        <!-- Server URL of the remote SI server used to collect statistics. Must
-        be specified in {protocol://hostname:port/} format. -->
-    {% if open_banking.data_publishing.server_url is defined %}
-        <ServerURL>{{open_banking.data_publishing.server_url}}</ServerURL>
-    {% else %}
-        <ServerURL>{tcp://ANALYTICS_HOSTNAME:7612}</ServerURL>
-    {% endif %}
-    {% if open_banking.data_publishing.auth_url is defined %}
-        <AuthURL>{{open_banking.data_publishing.auth_url}}</AuthURL>
-    {% endif %}
-        <!-- Allowed values: Thrift -->
-    {% if open_banking.data_publishing.protocol is defined %}
-        <Protocol>{{open_banking.data_publishing.protocol}}</Protocol>
-    {% else %}
-        <Protocol>Thrift</Protocol>
-    {% endif %}
-    {% if open_banking.data_publishing.pool_size is defined %}
-        <PoolSize>{{open_banking.data_publishing.pool_size}}</PoolSize>
-    {% else %}
-        <PoolSize>10</PoolSize>
-    {% endif %}
-    {% if open_banking.data_publishing.queue_size is defined %}
-        <QueueSize>{{open_banking.data_publishing.queue_size}}</QueueSize>
-    {% else %}
-        <QueueSize>32768</QueueSize>
-    {% endif %}
-    {% if open_banking.data_publishing.worker_thread_count is defined %}
-        <WorkerThreadCount>{{open_banking.data_publishing.worker_thread_count}}</WorkerThreadCount>
-    {% else %}
-        <WorkerThreadCount>10</WorkerThreadCount>
-    {% endif %}
-    {% if open_banking.data_publishing.pool_wait_time_Ms is defined %}
-        <PoolWaitTimeMs>{{open_banking.data_publishing.pool_wait_time_Ms}}</PoolWaitTimeMs>
-    {% else %}
-        <PoolWaitTimeMs>60000</PoolWaitTimeMs>
-    {% endif %}
-
-    {% if open_banking.data_publishing.protocol == "Thrift" or open_banking.data_publishing.protocol is not defined%}
-        <Thrift>
-        {% if open_banking.data_publishing.thrift.publishing_timeout is defined %}
-            <PublishingTimeout>{{open_banking.data_publishing.thrift.publishing_timeout}}</PublishingTimeout>
-        {% else %}
-            <PublishingTimeout>2000</PublishingTimeout>
-        {% endif %}
-            <Streams>
-            {% for stream in open_banking.data_publishing.thrift.stream %}
-                <{{stream.name}}>
-                    {% for attribute in stream.attributes %}
-                        {% if attribute.required is defined %}
-                            {% set required = "{{attribute.required}}" %}
-                        {% else %}
-                            {% set required = "false" %}
-                        {% endif %}
-                        {% if attribute.type is defined %}
-                            {% set type = "{{attribute.type}}" %}
-                        {% else %}
-                            {% set type = "string" %}
-                        {% endif %}
-                    <Attribute name="{{attribute.name}}" priority="{{attribute.priority}}" required="{{required}}" type="{{type}}"/>
-                    {% endfor %}
-                </{{stream.name}}>
-            {% endfor %}
-            </Streams>
-        </Thrift>
-    {% endif %}
-        <DisputeResolution>
-            {% if open_banking.data_publishing.dispute_resolution.enable is defined %}
-                <Enabled>{{open_banking.data_publishing.dispute_resolution.enable}}</Enabled>
-            {% else %}
-                <Enabled>false</Enabled>
-            {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.publishNonErrorDisputeResolutionData is defined %}
-                <PublishNonErrorDisputeResolutionData>{{open_banking.data_publishing.dispute_resolution.publishNonErrorDisputeResolutionData}}</PublishNonErrorDisputeResolutionData>
-            {% else %}
-                <PublishNonErrorDisputeResolutionData>false</PublishNonErrorDisputeResolutionData>
-            {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.maxRequestBodyLength is defined %}
-                <MaxRequestBodyLength>{{open_banking.data_publishing.dispute_resolution.maxRequestBodyLength}}</MaxRequestBodyLength>
-            {% else %}
-                <MaxRequestBodyLength>4096</MaxRequestBodyLength>
-            {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.maxResponseBodyLength is defined %}
-                <MaxResponseBodyLength>{{open_banking.data_publishing.dispute_resolution.maxResponseBodyLength}}</MaxResponseBodyLength>
-            {% else %}
-                <MaxResponseBodyLength>4096</MaxResponseBodyLength>
-            {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.maxHeaderLength is defined %}
-                <MaxHeaderLength>{{open_banking.data_publishing.dispute_resolution.maxHeaderLength}}</MaxHeaderLength>
-            {% else %}
-                <MaxHeaderLength>2048</MaxHeaderLength>
-            {% endif %}
-        </DisputeResolution>
-    </DataPublishing>
-    <Identity>
-        {% if open_banking.identity.consent_id_claim_name is defined %}
-            <ConsentIDClaimName>{{open_banking.identity.consent_id_claim_name}}</ConsentIDClaimName>
-        {% else %}
-            <ConsentIDClaimName>consent_id</ConsentIDClaimName>
-        {% endif %}
-    </Identity>
     <HTTPConnectionPool>
-        {% if open_banking.http_connection_pool.max_connections is defined %}
-        <MaxConnections>{{open_banking.http_connection_pool.max_connections}}</MaxConnections>
+        {% if financial_services.http_connection_pool.max_connections is defined %}
+        <MaxConnections>{{financial_services.http_connection_pool.max_connections}}</MaxConnections>
         {% endif %}
-        {% if open_banking.http_connection_pool.max_connections_per_route is defined %}
-        <MaxConnectionsPerRoute>{{open_banking.http_connection_pool.max_connections_per_route}}</MaxConnectionsPerRoute>
+        {% if financial_services.http_connection_pool.max_connections_per_route is defined %}
+        <MaxConnectionsPerRoute>{{financial_services.http_connection_pool.max_connections_per_route}}</MaxConnectionsPerRoute>
         {% endif %}
     </HTTPConnectionPool>
-    <Event>
-    {% if open_banking.event.queue_size is defined %}
-        <QueueSize>{{open_banking.event.queue_size}}</QueueSize>
-    {% else %}
-        <QueueSize>32768</QueueSize>
-    {% endif %}
-    {% if open_banking.event.worker_thread_count is defined %}
-        <WorkerThreadCount>{{open_banking.event.worker_thread_count}}</WorkerThreadCount>
-    {% else %}
-        <WorkerThreadCount>10</WorkerThreadCount>
-    {% endif %}
-        <EventExecutors>
-	{% if open_banking.event.event_executors is defined %}
-            {% for executor in open_banking.event.event_executors %}
-                   <Executor class="{{executor.name}}" priority="{{executor.priority}}"/>
-            {% endfor %}
- 	{% else %}
-            {% if open_banking.event.event_executor is defined %}
-                <Executor class="{{open_banking.event.event_executor}}"/>
-            {% else %}
-                <Executor class="com.wso2.openbanking.accelerator.common.event.executor.DefaultOBEventExecutor"/>
-            {% endif %}
- 	{% endif %}
-        </EventExecutors>
-    </Event>
-    <KeyManager>
-        {% if open_banking.keymanager.extension.impl is defined %}
-    	<KeyManagerExtensionImpl>{{open_banking.keymanager.extension.impl.class}}</KeyManagerExtensionImpl>
-    	{% endif %}
-        <KeyManagerAdditionalProperties>
-            {% if open_banking.keymanager.application.type.attributes is defined %}
-                {% for attribute in open_banking.keymanager.application.type.attributes %}
-                    <Property name="{{attribute.name}}" label="{{attribute.label}}" type="{{attribute.type}}" tooltip="{{attribute.tooltip}}" values="{{attribute.values}}" default="{{attribute.default}}" required="{{attribute.required}}" mask="{{attribute.mask}}" multiple="{{attribute.multiple}}" priority="{{attribute.priority}}" />
-                {% endfor %}
-            {% endif %}
-        </KeyManagerAdditionalProperties>
-    </KeyManager>
-    <!--This configuration applies for Request Validation and Response Signing for `x-jws-signature`.  -->
-    <JwsSignatureConfiguration>
-        <!-- Configs for  Signature Validation -->
-        <SignatureValidation>
-        {% if open_banking.jws_signature.signature_validation.enabled is defined %}
-            <Enable>{{open_banking.jws_signature.signature_validation.enabled}}</Enable>
-        {% else %}
-            <Enable>false</Enable>
-        {% endif %}
-            <AllowedAlgorithms>
-            {% if open_banking.jws_signature.signature_validation.allowed_algorithms is defined %}
-                {% for algorithm in open_banking.jws_signature.signature_validation.allowed_algorithms %}
-                <Algorithm>{{algorithm}}</Algorithm>
-                {% endfor %}
-            {% else %}
-                <Algorithm>PS256</Algorithm>
-            {% endif %}
-            </AllowedAlgorithms>
-        </SignatureValidation>
-        <!-- Configs for Response Signing -->
-        <ResponseSigning>
-        {% if open_banking.jws_signature.response_signing.enabled is defined %}
-            <Enable>{{open_banking.jws_signature.response_signing.enabled}}</Enable>
-        {% else %}
-            <Enable>false</Enable>
-        {% endif %}
-        {% if open_banking.jws_signature.response_signing.allowed_algorithm is defined %}
-            <AllowedAlgorithm>{{open_banking.jws_signature.response_signing.allowed_algorithm}}</AllowedAlgorithm>
-        {% else %}
-            <AllowedAlgorithm>PS256</AllowedAlgorithm>
-        {% endif %}
-        </ResponseSigning>
-    </JwsSignatureConfiguration>
-
-    <OBIdentityRetriever>
-        <Server>
-            <!-- Signing certificate alias for primary environment-->
-        {% if open_banking.ob_identity_retriever.server.signing_cert_alias is defined %}
-            <SigningCertificateAlias>{{open_banking.ob_identity_retriever.server.signing_cert_alias}}</SigningCertificateAlias>
-        {% else %}
-            <SigningCertificateAlias>wso2carbon</SigningCertificateAlias>
-        {% endif %}
-            <!-- Signing certificate alias for sandbox environment-->
-        {% if open_banking.ob_identity_retriever.server.sandbox_signing_cert_alias is defined %}
-            <SandboxSigningCertificateAlias>{{open_banking.ob_identity_retriever.server.sandbox_signing_cert_alias}}</SandboxSigningCertificateAlias>
-        {% else %}
-            <SandboxSigningCertificateAlias>wso2carbon-sandbox</SandboxSigningCertificateAlias>
-        {% endif %}
-        <!-- KID value for primary signing certificate -->
-        {% if open_banking.ob_identity_retriever.server.signing_cert_kid is defined %}
-            <SigningCertificateKid>{{open_banking.ob_identity_retriever.server.signing_cert_kid}}</SigningCertificateKid>
-        {% else %}
-            <SigningCertificateKid>1234</SigningCertificateKid>
-        {% endif %}
-        <!-- KID value for sandbox signing certificate -->
-        {% if open_banking.ob_identity_retriever.server.sandbox_signing_cert_kid is defined %}
-            <SandboxCertificateKid>{{open_banking.ob_identity_retriever.server.sandbox_signing_cert_kid}}</SandboxCertificateKid>
-        {% else %}
-            <SandboxCertificateKid>5678</SandboxCertificateKid>
-        {% endif %}
-        </Server>
-        <JWKSRetriever>
-        {% if open_banking.ob_identity_retriever.jwks_retriever.size_limit is defined %}
-            <SizeLimit>{{open_banking.ob_identity_retriever.jwks_retriever.size_limit}}</SizeLimit>
-        {% else %}
-            <SizeLimit>51200</SizeLimit>
-        {% endif %}
-        {% if open_banking.ob_identity_retriever.jwks_retriever.connection_timeout is defined %}
-            <ConnectionTimeout>{{open_banking.ob_identity_retriever.jwks_retriever.connection_timeout}}</ConnectionTimeout>
-        {% else %}
-            <ConnectionTimeout>2000</ConnectionTimeout>
-        {% endif %}
-        {% if open_banking.ob_identity_retriever.jwks_retriever.read_timeout is defined %}
-            <ReadTimeout>{{open_banking.ob_identity_retriever.jwks_retriever.read_timeout}}</ReadTimeout>
-        {% else %}
-            <ReadTimeout>2000</ReadTimeout>
-        {% endif %}
-        </JWKSRetriever>
-    </OBIdentityRetriever>
 </Server>
diff --git a/financial-services-accelerator/accelerators/fs-apim/pom.xml b/financial-services-accelerator/accelerators/fs-apim/pom.xml
index 637aa483..47dc76e1 100644
--- a/financial-services-accelerator/accelerators/fs-apim/pom.xml
+++ b/financial-services-accelerator/accelerators/fs-apim/pom.xml
@@ -29,7 +29,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wso2-financial-services-am-accelerator</artifactId>
+    <artifactId>wso2-fsam-accelerator</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Financial Services - API Manager Accelerator Module</name>
     <url>http://wso2.org</url>
@@ -41,8 +41,9 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${maven.clean.plugin.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -72,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>${maven.antrun.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>create-solution</id>
@@ -94,27 +95,6 @@
                                                 regex="org.wso2.financial.services.accelerator.gateway-(\d.*?)\.jar$"/>
                                     </fileset>
                                 </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
-                                    <fileset
-                                            dir="../../components/org.wso2.financial.services.accelerator.data.publisher/org.wso2.financial.services.accelerator.data.publisher.common/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.data.publisher.common-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
-                                    <fileset
-                                            dir="../../components/org.wso2.financial.services.accelerator.keymanager/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.keymanager-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/deployment/server/webapps" overwrite="true">
-                                    <fileset
-                                            dir="../../internal-apis/internal-webapps/org.wso2.financial.services.accelerator.demo.backend/target">
-                                        <filename
-                                                regex="api#financialservices#backend.war$"/>
-                                    </fileset>
-                                </copy>
                             </target>
                         </configuration>
                         <goals>
@@ -145,5 +125,4 @@
         </plugins>
     </build>
 
-
 </project>
diff --git a/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties b/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties
index 7a75ed4c..4ff00a89 100644
--- a/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties
+++ b/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties
@@ -30,12 +30,10 @@ DB_PASS=root
 DB_HOST=localhost
 DB_DRIVER=com.mysql.jdbc.Driver
 
-DB_APIMGT=openbank_apimgtdb
-DB_USER_STORE=openbank_userdb
-DB_AM_CONFIG=openbank_am_configdb
-DB_GOV=openbank_govdb
-DB_IS_CONFIG=openbank_iskm_configdb
-DB_OPEN_BANKING_STORE=openbank_openbankingdb
-DB_OB_REPORTING=openbank_ob_reporting_statsdb
-DB_OB_REPORTING_SUMMARIZED=openbank_ob_reporting_summarizeddb
+DB_APIMGT=fs_apimgtdb
+DB_USER_STORE=fs_userdb
+DB_AM_CONFIG=fs_am_configdb
+DB_GOV=fs_govdb
+DB_IS_CONFIG=fs_iskm_configdb
+DB_FS_STORE=fs_consentdb
 
diff --git a/financial-services-accelerator/accelerators/fs-is/README.md b/financial-services-accelerator/accelerators/fs-is/README.md
index db3008f2..5938970f 100644
--- a/financial-services-accelerator/accelerators/fs-is/README.md
+++ b/financial-services-accelerator/accelerators/fs-is/README.md
@@ -1,25 +1,25 @@
-### **WSO2 Open Banking IS Accelerator 3.0.0**
+### **WSO2 Financial Services IS Accelerator 4.0.0**
 
 **Try Locally:**
 
 Prerequisites:
 1. Download WSO2 Identity Server product 
 2. Build the repository completely using the below command to create accelerator zip files.
-   <code>mvn clean install -PSolution</code>
-3. Locate the Accelerator Zip file (wso2-obiam-accelerator-3.0.0.zip) from
+   <code>mvn clean install -P Solution</code>
+3. Locate the Accelerator Zip file (wso2-fsiam-accelerator-4.0.0.zip) from
    the <code>target</code> folder in this directory
 4. Setup MySQL database server
 5. Install Java on your local machine
 
-Below are the simplified steps to install the WSO2 Open Banking Accelerator. For more information,
+Below are the simplified steps to install the WSO2 Financial Services Accelerator. For more information,
 please refer to [Quick Start Guide](https://ob.docs.wso2.com/en/latest/get-started/quick-start-guide/) or
 to [ Complete install and Setup Guide ](https://ob.docs.wso2.com/en/latest/install-and-setup/)
 
 
 Steps:
 1. Extract the Base product (WSO2 Identity Server product) to a preferred location (<WSO2_IS_HOME>)
-2. Extract WSO2 OB IAM Accelerator (wso2-obiam-accelerator-3.0.0.zip) to WSO2_IS_HOME
-3. Run <WSO2_OB_IS_ACC_HOME>/bin/merge.sh. This will copy the artifacts to the WSO2 IS
-4. Run <WSO2_OB_IS_ACC_HOME>/bin/configure.sh. This will configure the server and create databases and  tables.
+2. Extract WSO2 FS IAM Accelerator (wso2-fsiam-accelerator-4.0.0.zip) to WSO2_IS_HOME
+3. Run <WSO2_FS_IS_ACC_HOME>/bin/merge.sh. This will copy the artifacts to the WSO2 IS
+4. Run <WSO2_FS_IS_ACC_HOME>/bin/configure.sh. This will configure the server and create databases and  tables.
 5. Run <WSO2_IS_HOME>/bin/wso2server.sh to start the server
 
diff --git a/financial-services-accelerator/accelerators/fs-is/bin/configure.sh b/financial-services-accelerator/accelerators/fs-is/bin/configure.sh
index ed6b8b05..920099bd 100755
--- a/financial-services-accelerator/accelerators/fs-is/bin/configure.sh
+++ b/financial-services-accelerator/accelerators/fs-is/bin/configure.sh
@@ -16,10 +16,10 @@
  # under the License.
 
 # command to execute
-# ./configure.sh <WSO2_OB_IS_HOME>
+# ./configure.sh <WSO2_IS_HOME>
 
 source $(pwd)/../repository/conf/configure.properties
-WSO2_OB_IS_HOME=$1
+WSO2_IS_HOME=$1
 
 # set accelerator home
 cd ../
@@ -27,15 +27,15 @@ ACCELERATOR_HOME=$(pwd)
 echo "Accelerator Home: ${ACCELERATOR_HOME}"
 
 # set product home
-if [ "${WSO2_OB_IS_HOME}" == "" ]
+if [ "${WSO2_IS_HOME}" == "" ]
   then
     cd ../
-    WSO2_OB_IS_HOME=$(pwd)
-    echo "Product Home: ${WSO2_OB_IS_HOME}"
+    WSO2_IS_HOME=$(pwd)
+    echo "Product Home: ${WSO2_IS_HOME}"
 fi
 
 # validate product home
-if [ ! -d "${WSO2_OB_IS_HOME}/repository/components" ]; then
+if [ ! -d "${WSO2_IS_HOME}/repository/components" ]; then
   echo -e "\n\aERROR:specified product path is not a valid carbon product path\n";
   exit 2;
 else
@@ -54,7 +54,7 @@ configure_datasources() {
             sed -i -e 's|DB_IS_CONFIG_URL|jdbc:mysql://'${DB_HOST}':3306/'${DB_IS_CONFIG}'?autoReconnect=true\&amp;useSSL=false|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_GOV_URL|jdbc:mysql://'${DB_HOST}':3306/'${DB_GOV}'?autoReconnect=true\&amp;useSSL=false|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_USER_STORE_URL|jdbc:mysql://'${DB_HOST}':3306/'${DB_USER_STORE}'?autoReconnect=true\&amp;useSSL=false|g' ${DEPLOYMENT_TOML_FILE}
-            sed -i -e 's|DB_OB_STORE_URL|jdbc:mysql://'${DB_HOST}':3306/'${DB_OPEN_BANKING_STORE}'?autoReconnect=true\&amp;useSSL=false|g' ${DEPLOYMENT_TOML_FILE}
+            sed -i -e 's|DB_FS_STORE_URL|jdbc:mysql://'${DB_HOST}':3306/'${DB_FS_STORE}'?autoReconnect=true\&amp;useSSL=false|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_USER|'${DB_USER}'|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_PASS|'${DB_PASS}'|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_DRIVER|'${DB_DRIVER}'|g' ${DEPLOYMENT_TOML_FILE}
@@ -65,7 +65,7 @@ configure_datasources() {
             sed -i -e 's|DB_IS_CONFIG_URL|jdbc:sqlserver://'${DB_HOST}':1433;databaseName='${DB_IS_CONFIG}';encrypt=false|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_GOV_URL|jdbc:sqlserver://'${DB_HOST}':1433;databaseName='${DB_GOV}';encrypt=false|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_USER_STORE_URL|jdbc:sqlserver://'${DB_HOST}':1433;databaseName='${DB_USER_STORE}';encrypt=false|g' ${DEPLOYMENT_TOML_FILE}
-            sed -i -e 's|DB_OB_STORE_URL|jdbc:sqlserver://'${DB_HOST}':1433;databaseName='${DB_OPEN_BANKING_STORE}';encrypt=false|g' ${DEPLOYMENT_TOML_FILE}
+            sed -i -e 's|DB_FS_STORE_URL|jdbc:sqlserver://'${DB_HOST}':1433;databaseName='${DB_FS_STORE}';encrypt=false|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_USER|'${DB_USER}'|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_PASS|'${DB_PASS}'|g' ${DEPLOYMENT_TOML_FILE}
             sed -i -e 's|DB_DRIVER|'${DB_DRIVER}'|g' ${DEPLOYMENT_TOML_FILE}
@@ -98,30 +98,29 @@ create_mysql_databases() {
     mysql -u${DB_USER} ${DB_MYSQL_PASS} -h${DB_HOST} -e "DROP DATABASE IF EXISTS ${DB_IS_CONFIG}; CREATE DATABASE ${DB_IS_CONFIG};
     ALTER DATABASE ${DB_IS_CONFIG} CHARACTER SET latin1 COLLATE latin1_swedish_ci";
     echo "Database Created: ${DB_IS_CONFIG}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -h${DB_HOST} -e "DROP DATABASE IF EXISTS ${DB_OPEN_BANKING_STORE}; CREATE DATABASE ${DB_OPEN_BANKING_STORE};
-    ALTER DATABASE ${DB_OPEN_BANKING_STORE} CHARACTER SET latin1 COLLATE latin1_swedish_ci";
-    echo "Database Created: ${DB_OPEN_BANKING_STORE}"
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -h${DB_HOST} -e "DROP DATABASE IF EXISTS ${DB_FS_STORE}; CREATE DATABASE ${DB_FS_STORE};
+    ALTER DATABASE ${DB_FS_STORE} CHARACTER SET latin1 COLLATE latin1_swedish_ci";
+    echo "Database Created: ${DB_FS_STORE}"
 };
 
 create_mysql_database_tables() {
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_IS_CONFIG} -h${DB_HOST} -e "SOURCE ${WSO2_OB_IS_HOME}/dbscripts/mysql.sql";
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_IS_CONFIG} -h${DB_HOST} -e "SOURCE ${WSO2_IS_HOME}/dbscripts/mysql.sql";
     echo "Database tables Created for: ${DB_IS_CONFIG}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_OPEN_BANKING_STORE} -h${DB_HOST} -e "SOURCE ${WSO2_OB_IS_HOME}/dbscripts/open-banking/consent/mysql.sql";
-    echo "Database tables Created for: ${DB_OPEN_BANKING_STORE}"
+    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_FS_STORE} -h${DB_HOST} -e "SOURCE ${WSO2_IS_HOME}/dbscripts/financial-services/consent/mysql.sql";
+    echo "Database tables Created for: ${DB_FS_STORE}"
 };
 
 configure_iskm_connector() {
     wget https://apim.docs.wso2.com/en/3.2.0/assets/attachments/administer/${ISKM_CONNECTOR}.zip
     unzip "${ISKM_CONNECTOR}.zip"
-    cp ${ISKM_CONNECTOR_FOLDER}/dropins/* ${WSO2_OB_IS_HOME}/repository/components/dropins/
-    cp ${ISKM_CONNECTOR_FOLDER}/webapps/* ${WSO2_OB_IS_HOME}/repository/deployment/server/webapps
+    cp ${ISKM_CONNECTOR_FOLDER}/dropins/* ${WSO2_IS_HOME}/repository/components/dropins/
+    cp ${ISKM_CONNECTOR_FOLDER}/webapps/* ${WSO2_IS_HOME}/repository/deployment/server/webapps
 };
 
 echo -e "\nReplace hostnames \n"
 echo -e "================================================\n"
 sed -i -e 's|IS_HOSTNAME|'${IS_HOSTNAME}'|g' ${DEPLOYMENT_TOML_FILE}
 sed -i -e 's|APIM_HOSTNAME|'${APIM_HOSTNAME}'|g' ${DEPLOYMENT_TOML_FILE}
-sed -i -e 's|BI_HOSTNAME|'${BI_HOSTNAME}'|g' ${DEPLOYMENT_TOML_FILE}
 
 
 echo -e "\nConfigure datasources \n"
@@ -138,6 +137,6 @@ echo -e "================================================\n"
 
 echo -e "\nCopy deployment.toml file to repository/conf \n"
 echo -e "================================================\n"
-cp ${DEPLOYMENT_TOML_FILE} ${WSO2_OB_IS_HOME}/repository/conf/
+cp ${DEPLOYMENT_TOML_FILE} ${WSO2_IS_HOME}/repository/conf/
 rm ${DEPLOYMENT_TOML_FILE}
 rm -f ${DEPLOYMENT_TOML_FILE}-e
diff --git a/financial-services-accelerator/accelerators/fs-is/bin/merge.ps1 b/financial-services-accelerator/accelerators/fs-is/bin/merge.ps1
index 38c7fe13..6502d6f2 100644
--- a/financial-services-accelerator/accelerators/fs-is/bin/merge.ps1
+++ b/financial-services-accelerator/accelerators/fs-is/bin/merge.ps1
@@ -43,12 +43,12 @@ Function Exit-Clean {
 
 # Get the root directory location of the accelerator. Which is <BASE_PRODUCT>/<ACCELERATOR>/
 Set-Location (Join-Path $PSScriptRoot ".\..\")
-$WSO2_OB_ACCELERATOR_HOME = (Get-Location).path
-Write-Output "[INFO] Accelerator Home : $WSO2_OB_ACCELERATOR_HOME"
+$WSO2_ACCELERATOR_HOME = (Get-Location).path
+Write-Output "[INFO] Accelerator Home : $WSO2_ACCELERATOR_HOME"
 
 # Get the root directory of the base product.
 if ($null -eq $WSO2_BASE_PRODUCT_HOME) {
-    Set-Location (Join-Path $WSO2_OB_ACCELERATOR_HOME ".\..\")
+    Set-Location (Join-Path $WSO2_ACCELERATOR_HOME ".\..\")
     $WSO2_BASE_PRODUCT_HOME = (Get-Location).path
 }
 Write-Output "[INFO] Base Product Home : $WSO2_BASE_PRODUCT_HOME"
@@ -65,17 +65,17 @@ if (-NOT(Test-Path (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components")))
 }
 
 # Remove old open-banking artifacts
-Write-Output "[INFO] Removing old open-banking artifacts..."
-Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\dropins") | Where-Object{$_.Name -Match "com.wso2.openbanking.accelerator.*"} | Remove-Item
-Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\lib") | Where-Object{$_.Name -Match "com.wso2.openbanking.accelerator.*"} | Remove-Item
-Write-Output "[INFO] All previous OB artifacts have been deleted!"
+Write-Output "[INFO] Removing old financial services artifacts..."
+Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\dropins") | Where-Object{$_.Name -Match "org.wso2.financial.services.accelerator.*"} | Remove-Item
+Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\lib") | Where-Object{$_.Name -Match "org.wso2.financial.services.accelerator.*"} | Remove-Item
+Write-Output "[INFO] All previous FS artifacts have been deleted!"
 
-# Copying all the new OB artifacts to the base product
-# Copy-Item -Force -Recurse -Verbose (Join-Path $WSO2_OB_ACCELERATOR_HOME "carbon-home\*") -Destination $WSO2_BASE_PRODUCT_HOME
+# Copying all the new FS artifacts to the base product
+# Copy-Item -Force -Recurse -Verbose (Join-Path $WSO2_ACCELERATOR_HOME "carbon-home\*") -Destination $WSO2_BASE_PRODUCT_HOME
 # Using Robocopy.exe becuase powershell Copy-Item cmdlet doesn't do recursive copying after a certain number of subdirectories.
-Write-Output "[INFO] Copying new open-banking artifacts..."
-Robocopy.exe (Join-Path $WSO2_OB_ACCELERATOR_HOME "carbon-home") $WSO2_BASE_PRODUCT_HOME * /E /NFL /NDL /NJH /NJS /nc /ns /np
-Write-Output "[INFO] All the new OB artifacts has been copied!"
+Write-Output "[INFO] Copying new financial services artifacts..."
+Robocopy.exe (Join-Path $WSO2_ACCELERATOR_HOME "carbon-home") $WSO2_BASE_PRODUCT_HOME * /E /NFL /NDL /NJH /NJS /nc /ns /np
+Write-Output "[INFO] All the new FS artifacts has been copied!"
 
 $WEB_APPS_PATH = (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\deployment\server\webapps")
 
@@ -118,8 +118,6 @@ if (Test-Path $CONSENTMGR_RUNTIME_JS_BACKUP_PATH -PathType Leaf) {
 
 Remove-Item -LiteralPath $CONSENTMGR_PATH_ZIP -Force
 
-Get-ChildItem (Join-Path $WSO2_BASE_PRODUCT_HOME "repository\components\dropins") | Where-Object{$_.Name -Match "org.wso2.carbon.identity.application.authentication.handler.identifier-*"} | Remove-Item
-
 Write-Output "[INFO] Completed!"
 
 Exit-Clean
diff --git a/financial-services-accelerator/accelerators/fs-is/bin/merge.sh b/financial-services-accelerator/accelerators/fs-is/bin/merge.sh
index 5145beb0..14606348 100755
--- a/financial-services-accelerator/accelerators/fs-is/bin/merge.sh
+++ b/financial-services-accelerator/accelerators/fs-is/bin/merge.sh
@@ -15,7 +15,7 @@
  # specific language governing permissions and limitations
  # under the License.
 
-WSO2_OB_IS_HOME=$1
+WSO2_IS_HOME=$1
 
 # set accelerator home
 cd ../
@@ -23,15 +23,15 @@ ACCELERATOR_HOME=$(pwd)
 echo "Accelerator home is: ${ACCELERATOR_HOME}"
 
 # set product home
-if [ "${WSO2_OB_IS_HOME}" == "" ];
+if [ "${WSO2_IS_HOME}" == "" ];
   then
     cd ../
-    WSO2_OB_IS_HOME=$(pwd)
-    echo "Product home is: ${WSO2_OB_IS_HOME}"
+    WSO2_IS_HOME=$(pwd)
+    echo "Product home is: ${WSO2_IS_HOME}"
 fi
 
 # validate product home
-if [ ! -d "${WSO2_OB_IS_HOME}/repository/components" ]; then
+if [ ! -d "${WSO2_IS_HOME}/repository/components" ]; then
   echo -e "\n\aERROR:specified product path is not a valid carbon product path\n";
   exit 2;
 else
@@ -41,7 +41,7 @@ fi
 echo -e "================================================\n"
 
 # Setting path for webapps folder and consentmgr folder
-WEBAPPS_PATH=${WSO2_OB_IS_HOME}/repository/deployment/server/webapps
+WEBAPPS_PATH=${WSO2_IS_HOME}/repository/deployment/server/webapps
 CONSENTMGR_PATH=${WEBAPPS_PATH}/consentmgr
 
 # Checking if consent manager app exists
@@ -62,24 +62,21 @@ fi
 
 echo -e "\nCopying open banking artifacts\n"
 echo -e "================================================\n"
-cp -r ${ACCELERATOR_HOME}/carbon-home/* "${WSO2_OB_IS_HOME}"/
+cp -r ${ACCELERATOR_HOME}/carbon-home/* "${WSO2_IS_HOME}"/
 
 # Updating consent manager app
 echo -e "\nUpdating Consentmgr webapp...\n"
 echo -e "\nWARNING: This will replace the current consentmgr web-app with the updated one\n"
 echo -e "\nMake sure to rebuild the web app if you have any customizations in the toolkit/src directory.\n"
-echo -e "\nPlease refer to the ReadMe file in ${WSO2_OB_IS_HOME}/repository/deployment/server/webapps/consentmgr/self-care-portal-frontend\n"
+echo -e "\nPlease refer to the ReadMe file in ${WSO2_IS_HOME}/repository/deployment/server/webapps/consentmgr/self-care-portal-frontend\n"
 
 echo -e "\nExtracting consentmgr.war\n"
 echo -e "================================================\n"
-unzip -q "${WSO2_OB_IS_HOME}/repository/deployment/server/webapps/consentmgr.war" -d "${WSO2_OB_IS_HOME}/repository/deployment/server/webapps/consentmgr"
-rm -f "${WSO2_OB_IS_HOME}/repository/deployment/server/webapps/consentmgr.war"
+unzip -q "${WSO2_IS_HOME}/repository/deployment/server/webapps/consentmgr.war" -d "${WSO2_IS_HOME}/repository/deployment/server/webapps/consentmgr"
+rm -f "${WSO2_IS_HOME}/repository/deployment/server/webapps/consentmgr.war"
 
 # Restoring runtime-config.js
 if [ -f "${WEBAPPS_PATH}/runtime-config.js" ]; then
   mv -f ${WEBAPPS_PATH}/runtime-config.js ${CONSENTMGR_PATH}
   echo -e "Restoring backup runtime-config.js file complete!"
 fi
-
-find "${WSO2_OB_IS_HOME}"/repository/components/dropins -name "org.wso2.carbon.identity.application.authentication.handler.identifier-*" -exec rm -rf {} \;
-echo -e "\nComplete! \n"
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/h2.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/h2.sql
similarity index 64%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/h2.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/h2.sql
index 43b9e981..64fdcb51 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/h2.sql
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/h2.sql
@@ -20,7 +20,7 @@
 -- Since the database systems does not support adding default unix time to the database columns, the default data
 -- storing is handled within the database queries.
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT (
+CREATE TABLE IF NOT EXISTS FS_CONSENT (
   CONSENT_ID            VARCHAR(255) NOT NULL,
   RECEIPT               CLOB NOT NULL,
   CREATED_TIME          BIGINT NOT NULL,
@@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT (
   PRIMARY KEY (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_AUTH_RESOURCE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_AUTH_RESOURCE (
   AUTH_ID           VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   AUTH_TYPE         VARCHAR(255) NOT NULL,
@@ -42,20 +42,20 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT_AUTH_RESOURCE (
   AUTH_STATUS       VARCHAR(255) NOT NULL,
   UPDATED_TIME      BIGINT NOT NULL,
   PRIMARY KEY(AUTH_ID),
-  CONSTRAINT FK_ID_OB_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_ID_FS_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_MAPPING (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_MAPPING (
   MAPPING_ID        VARCHAR(255) NOT NULL,
   AUTH_ID           VARCHAR(255) NOT NULL,
   ACCOUNT_ID        VARCHAR(255) NOT NULL,
   PERMISSION        VARCHAR(255) NOT NULL,
   MAPPING_STATUS    VARCHAR(255) NOT NULL,
   PRIMARY KEY(MAPPING_ID),
-  CONSTRAINT FK_OB_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES OB_CONSENT_AUTH_RESOURCE (AUTH_ID)
+  CONSTRAINT FK_FS_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES FS_CONSENT_AUTH_RESOURCE (AUTH_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_STATUS_AUDIT (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_STATUS_AUDIT (
   STATUS_AUDIT_ID   VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CURRENT_STATUS    VARCHAR(255) NOT NULL,
@@ -64,39 +64,20 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT_STATUS_AUDIT (
   ACTION_BY         VARCHAR(255),
   PREVIOUS_STATUS   VARCHAR(255),
   PRIMARY KEY(STATUS_AUDIT_ID),
-  CONSTRAINT FK_OB_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_FILE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_FILE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CONSENT_FILE      CLOB,
   PRIMARY KEY(CONSENT_ID),
-  CONSTRAINT FK_OB_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_ATTRIBUTE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_ATTRIBUTE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   ATT_KEY           VARCHAR(255) NOT NULL,
   ATT_VALUE         VARCHAR(255) NOT NULL,
   PRIMARY KEY(CONSENT_ID, ATT_KEY),
-  CONSTRAINT FK_OB_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS OB_THROTTLE_DATA (
-  THROTTLE_GROUP VARCHAR(100) NOT NULL,
-  THROTTLE_PARAM VARCHAR(100) NOT NULL,
-  LAST_UPDATE_TIMESTAMP DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UNLOCK_TIMESTAMP DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  OCCURRENCES INTEGER NOT NULL,
-  PRIMARY KEY (THROTTLE_GROUP,THROTTLE_PARAM)
-);
-
-CREATE TABLE IF NOT EXISTS OB_CONSENT_HISTORY (
-    TABLE_ID VARCHAR(10) NOT NULL,
-    RECORD_ID VARCHAR(255) NOT NULL,
-    HISTORY_ID VARCHAR(255) NOT NULL,
-    CHANGED_VALUES CLOB NOT NULL,
-    REASON VARCHAR(255) NOT NULL,
-    EFFECTIVE_TIMESTAMP BIGINT NOT NULL,
-    PRIMARY KEY (TABLE_ID,RECORD_ID,HISTORY_ID)
+  CONSTRAINT FK_FS_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mssql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/mssql.sql
similarity index 64%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mssql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/mssql.sql
index 6fbd85e6..556761ca 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mssql.sql
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/mssql.sql
@@ -21,7 +21,7 @@
 -- Since the database systems does not support adding default unix time to the database columns, the default data
 -- storing is handled within the database querieS.
 
-CREATE TABLE OB_CONSENT (
+CREATE TABLE FS_CONSENT (
   CONSENT_ID            VARCHAR(255) NOT NULL,
   RECEIPT               NVARCHAR(MAX) NOT NULL,
   CREATED_TIME          BIGINT NOT NULL,
@@ -35,7 +35,7 @@ CREATE TABLE OB_CONSENT (
   PRIMARY KEY (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_AUTH_RESOURCE (
+CREATE TABLE FS_CONSENT_AUTH_RESOURCE (
   AUTH_ID           VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   AUTH_TYPE         VARCHAR(255) NOT NULL,
@@ -43,20 +43,20 @@ CREATE TABLE OB_CONSENT_AUTH_RESOURCE (
   AUTH_STATUS       VARCHAR(255) NOT NULL,
   UPDATED_TIME      BIGINT NOT NULL,
   PRIMARY KEY(AUTH_ID),
-  CONSTRAINT FK_ID_OB_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_ID_FS_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_MAPPING (
+CREATE TABLE FS_CONSENT_MAPPING (
   MAPPING_ID        VARCHAR(255) NOT NULL,
   AUTH_ID           VARCHAR(255) NOT NULL,
   ACCOUNT_ID        VARCHAR(255) NOT NULL,
   PERMISSION        VARCHAR(255) NOT NULL,
   MAPPING_STATUS    VARCHAR(255) NOT NULL,
   PRIMARY KEY(MAPPING_ID),
-  CONSTRAINT FK_OB_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES OB_CONSENT_AUTH_RESOURCE (AUTH_ID)
+  CONSTRAINT FK_FS_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES FS_CONSENT_AUTH_RESOURCE (AUTH_ID)
 );
 
-CREATE TABLE OB_CONSENT_STATUS_AUDIT (
+CREATE TABLE FS_CONSENT_STATUS_AUDIT (
   STATUS_AUDIT_ID   VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CURRENT_STATUS    VARCHAR(255) NOT NULL,
@@ -65,40 +65,20 @@ CREATE TABLE OB_CONSENT_STATUS_AUDIT (
   ACTION_BY         VARCHAR(255),
   PREVIOUS_STATUS   VARCHAR(255),
   PRIMARY KEY(STATUS_AUDIT_ID),
-  CONSTRAINT FK_OB_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_FILE (
+CREATE TABLE FS_CONSENT_FILE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CONSENT_FILE      NVARCHAR(MAX),
   PRIMARY KEY(CONSENT_ID),
-  CONSTRAINT FK_OB_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_ATTRIBUTE (
+CREATE TABLE FS_CONSENT_ATTRIBUTE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   ATT_KEY           VARCHAR(255) NOT NULL,
   ATT_VALUE         VARCHAR(1023) NOT NULL,
   PRIMARY KEY(CONSENT_ID, ATT_KEY),
-  CONSTRAINT FK_OB_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE OB_THROTTLE_DATA (
-  THROTTLE_GROUP VARCHAR(100) NOT NULL,
-  THROTTLE_PARAM VARCHAR(100) NOT NULL,
-  LAST_UPDATE_TIMESTAMP DATETIME NOT NULL DEFAULT getdate(),
-  UNLOCK_TIMESTAMP DATETIME NOT NULL DEFAULT getdate(),
-  OCCURRENCES INT NOT NULL,
-  PRIMARY KEY (THROTTLE_GROUP,THROTTLE_PARAM)
-);
-
-CREATE TABLE OB_CONSENT_HISTORY (
-  TABLE_ID VARCHAR(10) NOT NULL,
-  RECORD_ID VARCHAR(255) NOT NULL,
-  HISTORY_ID VARCHAR(255) NOT NULL,
-  CHANGED_VALUES NVARCHAR(max) NOT NULL
-  	CONSTRAINT [IS JSON check] CHECK (ISJSON(CHANGED_VALUES) > 0),
-  REASON VARCHAR(255) NOT NULL,
-  EFFECTIVE_TIMESTAMP BIGINT NOT NULL,
-  PRIMARY KEY (TABLE_ID,RECORD_ID,HISTORY_ID)
+  CONSTRAINT FK_FS_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID) ON DELETE CASCADE
 );
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mysql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/mysql.sql
similarity index 63%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mysql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/mysql.sql
index b44e54ff..4d08319d 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mysql.sql
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/mysql.sql
@@ -20,7 +20,7 @@
 -- Since the database systems does not support adding default unix time to the database columns, the default data
 -- storing is handled within the database queries.
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT (
+CREATE TABLE IF NOT EXISTS FS_CONSENT (
   CONSENT_ID            VARCHAR(255) NOT NULL,
   RECEIPT               JSON NOT NULL,
   CREATED_TIME          BIGINT NOT NULL,
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT (
 )
 ENGINE INNODB;
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_AUTH_RESOURCE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_AUTH_RESOURCE (
   AUTH_ID           VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   AUTH_TYPE         VARCHAR(255) NOT NULL,
@@ -43,22 +43,22 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT_AUTH_RESOURCE (
   AUTH_STATUS       VARCHAR(255) NOT NULL,
   UPDATED_TIME      BIGINT NOT NULL,
   PRIMARY KEY(AUTH_ID),
-  CONSTRAINT FK_ID_OB_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_ID_FS_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 )
 ENGINE INNODB;
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_MAPPING (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_MAPPING (
   MAPPING_ID        VARCHAR(255) NOT NULL,
   AUTH_ID           VARCHAR(255) NOT NULL,
   ACCOUNT_ID        VARCHAR(255) NOT NULL,
   PERMISSION        VARCHAR(255) NOT NULL,
   MAPPING_STATUS    VARCHAR(255) NOT NULL,
   PRIMARY KEY(MAPPING_ID),
-  CONSTRAINT FK_OB_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES OB_CONSENT_AUTH_RESOURCE (AUTH_ID)
+  CONSTRAINT FK_FS_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES FS_CONSENT_AUTH_RESOURCE (AUTH_ID)
 )
 ENGINE INNODB;
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_STATUS_AUDIT (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_STATUS_AUDIT (
   STATUS_AUDIT_ID   VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CURRENT_STATUS    VARCHAR(255) NOT NULL,
@@ -67,44 +67,23 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT_STATUS_AUDIT (
   ACTION_BY         VARCHAR(255),
   PREVIOUS_STATUS   VARCHAR(255),
   PRIMARY KEY(STATUS_AUDIT_ID),
-  CONSTRAINT FK_OB_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 )
 ENGINE INNODB;
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_FILE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_FILE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CONSENT_FILE      BLOB NOT NULL,
   PRIMARY KEY(CONSENT_ID),
-  CONSTRAINT FK_OB_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 )
 ENGINE INNODB;
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_ATTRIBUTE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_ATTRIBUTE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   ATT_KEY           VARCHAR(255) NOT NULL,
   ATT_VALUE         VARCHAR(1023) NOT NULL,
   PRIMARY KEY(CONSENT_ID, ATT_KEY),
-  CONSTRAINT FK_OB_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID) ON DELETE CASCADE
-)
-ENGINE INNODB;
-
-CREATE TABLE IF NOT EXISTS OB_THROTTLE_DATA (
-  THROTTLE_GROUP VARCHAR(100) NOT NULL,
-  THROTTLE_PARAM VARCHAR(100) NOT NULL,
-  LAST_UPDATE_TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UNLOCK_TIMESTAMP TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-  OCCURRENCES INT(11) NOT NULL,
-  PRIMARY KEY (THROTTLE_GROUP,THROTTLE_PARAM)
-)
-ENGINE INNODB;
-
-CREATE TABLE IF NOT EXISTS OB_CONSENT_HISTORY (
-  TABLE_ID VARCHAR(10) NOT NULL,
-  RECORD_ID VARCHAR(255) NOT NULL,
-  HISTORY_ID VARCHAR(255) NOT NULL,
-  CHANGED_VALUES JSON NOT NULL,
-  REASON VARCHAR(255) NOT NULL,
-  EFFECTIVE_TIMESTAMP BIGINT NOT NULL,
-  PRIMARY KEY (TABLE_ID,RECORD_ID,HISTORY_ID)
+  CONSTRAINT FK_FS_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID) ON DELETE CASCADE
 )
 ENGINE INNODB;
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/oracle.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/oracle.sql
similarity index 64%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/oracle.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/oracle.sql
index c363ac8a..771c0655 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/oracle.sql
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/oracle.sql
@@ -20,7 +20,7 @@
 -- Since the database systems does not support adding default unix time to the database columns, the default data
 -- storing is handled within the database queries.
 
-CREATE TABLE OB_CONSENT (
+CREATE TABLE FS_CONSENT (
   CONSENT_ID            VARCHAR(255) NOT NULL,
   RECEIPT               CLOB NOT NULL,
   CREATED_TIME          NUMBER NOT NULL,
@@ -34,7 +34,7 @@ CREATE TABLE OB_CONSENT (
   PRIMARY KEY (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_AUTH_RESOURCE (
+CREATE TABLE FS_CONSENT_AUTH_RESOURCE (
   AUTH_ID           VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   AUTH_TYPE         VARCHAR(255) NOT NULL,
@@ -42,20 +42,20 @@ CREATE TABLE OB_CONSENT_AUTH_RESOURCE (
   AUTH_STATUS       VARCHAR(255) NOT NULL,
   UPDATED_TIME      NUMBER NOT NULL,
   PRIMARY KEY(AUTH_ID),
-  CONSTRAINT FK_OB_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_MAPPING (
+CREATE TABLE FS_CONSENT_MAPPING (
   MAPPING_ID        VARCHAR(255) NOT NULL,
   AUTH_ID           VARCHAR(255) NOT NULL,
   ACCOUNT_ID        VARCHAR(255) NOT NULL,
   PERMISSION        VARCHAR(255) NOT NULL,
   MAPPING_STATUS    VARCHAR(255) NOT NULL,
   PRIMARY KEY(MAPPING_ID),
-  CONSTRAINT FK_OB_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES OB_CONSENT_AUTH_RESOURCE (AUTH_ID)
+  CONSTRAINT FK_FS_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES FS_CONSENT_AUTH_RESOURCE (AUTH_ID)
 );
 
-CREATE TABLE OB_CONSENT_STATUS_AUDIT (
+CREATE TABLE FS_CONSENT_STATUS_AUDIT (
   STATUS_AUDIT_ID   VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CURRENT_STATUS    VARCHAR(255) NOT NULL,
@@ -64,40 +64,20 @@ CREATE TABLE OB_CONSENT_STATUS_AUDIT (
   ACTION_BY         VARCHAR(255),
   PREVIOUS_STATUS   VARCHAR(255),
   PRIMARY KEY(STATUS_AUDIT_ID),
-  CONSTRAINT FK_OB_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_FILE (
+CREATE TABLE FS_CONSENT_FILE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CONSENT_FILE      CLOB,
   PRIMARY KEY(CONSENT_ID),
-  CONSTRAINT FK_OB_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE OB_CONSENT_ATTRIBUTE (
+CREATE TABLE FS_CONSENT_ATTRIBUTE (
   CONSENT_ID      VARCHAR(255) NOT NULL,
   ATT_KEY         VARCHAR(255) NOT NULL,
   ATT_VALUE       VARCHAR(1023) NOT NULL,
   PRIMARY KEY(CONSENT_ID, ATT_KEY),
-  CONSTRAINT FK_OB_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE OB_THROTTLE_DATA (
-  THROTTLE_GROUP VARCHAR(100) NOT NULL,
-  THROTTLE_PARAM VARCHAR(100) NOT NULL,
-  LAST_UPDATE_TIMESTAMP TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
-  UNLOCK_TIMESTAMP TIMESTAMP DEFAULT CURRENT_TIMESTAMP NULL,
-  OCCURRENCES NUMBER(11) NOT NULL,
-  PRIMARY KEY (THROTTLE_GROUP,THROTTLE_PARAM)
-);
-
-CREATE TABLE OB_CONSENT_HISTORY (
-  TABLE_ID VARCHAR(10) NOT NULL,
-  RECORD_ID VARCHAR(255) NOT NULL,
-  HISTORY_ID VARCHAR(255) NOT NULL,
-  CHANGED_VALUES CLOB NOT NULL,
-  REASON VARCHAR(255) NOT NULL,
-  EFFECTIVE_TIMESTAMP NUMBER NOT NULL,
-  CONSTRAINT ensure_json CHECK (CHANGED_VALUES IS JSON),
-  PRIMARY KEY (TABLE_ID,RECORD_ID,HISTORY_ID)
+  CONSTRAINT FK_FS_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID) ON DELETE CASCADE
 );
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/postgresql.sql
similarity index 63%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/postgresql.sql
index dc6d66be..fafef9e8 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/consent/postgresql.sql
@@ -18,7 +18,7 @@
 -- All the data related to time are stored in unix time stamp and therefore, the data types for the time related data are represented in LONG.
 -- Since the database systems does not support adding default unix time to the database columns, the default data storing is handled within the database queries.
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT (
+CREATE TABLE IF NOT EXISTS FS_CONSENT (
   CONSENT_ID            VARCHAR(255) NOT NULL,
   RECEIPT               TEXT NOT NULL,
   CREATED_TIME          BIGINT NOT NULL,
@@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT (
   PRIMARY KEY (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_AUTH_RESOURCE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_AUTH_RESOURCE (
   AUTH_ID           VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   AUTH_TYPE         VARCHAR(255) NOT NULL,
@@ -40,20 +40,20 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT_AUTH_RESOURCE (
   AUTH_STATUS       VARCHAR(255) NOT NULL,
   UPDATED_TIME      BIGINT NOT NULL,
   PRIMARY KEY(AUTH_ID),
-  CONSTRAINT FK_ID_OB_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_ID_FS_CONSENT_AUTH_RESOURCE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_MAPPING (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_MAPPING (
   MAPPING_ID        VARCHAR(255) NOT NULL,
   AUTH_ID           VARCHAR(255) NOT NULL,
   ACCOUNT_ID        VARCHAR(255) NOT NULL,
   PERMISSION        VARCHAR(255) NOT NULL,
   MAPPING_STATUS    VARCHAR(255) NOT NULL,
   PRIMARY KEY(MAPPING_ID),
-  CONSTRAINT FK_OB_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES OB_CONSENT_AUTH_RESOURCE (AUTH_ID)
+  CONSTRAINT FK_FS_CONSENT_MAPPING FOREIGN KEY (AUTH_ID) REFERENCES FS_CONSENT_AUTH_RESOURCE (AUTH_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_STATUS_AUDIT (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_STATUS_AUDIT (
   STATUS_AUDIT_ID   VARCHAR(255) NOT NULL,
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CURRENT_STATUS    VARCHAR(255) NOT NULL,
@@ -62,40 +62,20 @@ CREATE TABLE IF NOT EXISTS OB_CONSENT_STATUS_AUDIT (
   ACTION_BY         VARCHAR(255),
   PREVIOUS_STATUS   VARCHAR(255),
   PRIMARY KEY(STATUS_AUDIT_ID),
-  CONSTRAINT FK_OB_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_STATUS_AUDIT FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_FILE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_FILE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   CONSENT_FILE      TEXT,
   PRIMARY KEY(CONSENT_ID),
-  CONSTRAINT FK_OB_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID)
+  CONSTRAINT FK_FS_CONSENT_FILE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID)
 );
 
-CREATE TABLE IF NOT EXISTS OB_CONSENT_ATTRIBUTE (
+CREATE TABLE IF NOT EXISTS FS_CONSENT_ATTRIBUTE (
   CONSENT_ID        VARCHAR(255) NOT NULL,
   ATT_KEY           VARCHAR(255) NOT NULL,
   ATT_VALUE         VARCHAR(1023) NOT NULL,
   PRIMARY KEY(CONSENT_ID, ATT_KEY),
-  CONSTRAINT FK_OB_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES OB_CONSENT (CONSENT_ID) ON DELETE CASCADE
+  CONSTRAINT FK_FS_CONSENT_ATTRIBUTE FOREIGN KEY (CONSENT_ID) REFERENCES FS_CONSENT (CONSENT_ID) ON DELETE CASCADE
 );
-
-CREATE TABLE IF NOT EXISTS OB_THROTTLE_DATA (
-  THROTTLE_GROUP VARCHAR(100) NOT NULL,
-  THROTTLE_PARAM VARCHAR(100) NOT NULL,
-  LAST_UPDATE_TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UNLOCK_TIMESTAMP TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
-  OCCURRENCES INT NOT NULL,
-  PRIMARY KEY (THROTTLE_GROUP,THROTTLE_PARAM)
-);
-
-CREATE TABLE IF NOT EXISTS OB_CONSENT_HISTORY (
-  TABLE_ID VARCHAR(10) NOT NULL,
-  RECORD_ID VARCHAR(255) NOT NULL,
-  HISTORY_ID VARCHAR(255) NOT NULL,
-  CHANGED_VALUES JSON NOT NULL,
-  REASON VARCHAR(255) NOT NULL,
-  EFFECTIVE_TIMESTAMP BIGINT NOT NULL,
-  PRIMARY KEY (TABLE_ID,RECORD_ID,HISTORY_ID)
-);
-
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mssql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/mssql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mssql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/mssql.sql
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mysql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/mysql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mysql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/mysql.sql
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/oracle.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/oracle.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/oracle.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/oracle.sql
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/postgresql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/postgresql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/postgresql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/financial-services/event-notifications/postgresql.sql
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql
deleted file mode 100644
index 040ec055..00000000
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2024, 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.
- */
-
---For account metadata feature run the following queries against the openbank_openbankingdb--
-CREATE TABLE IF NOT EXISTS OB_ACCOUNT_METADATA (
-    ACCOUNT_ID VARCHAR(100) NOT NULL,
-    USER_ID VARCHAR(100) NOT NULL,
-    METADATA_KEY VARCHAR(100) NOT NULL,
-    METADATA_VALUE VARCHAR(100) NOT NULL,
-    LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
-    PRIMARY KEY (USER_ID,ACCOUNT_ID,METADATA_KEY)
-);
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql
deleted file mode 100644
index 2d109b3e..00000000
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2024, 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.
- */
-
---For account metadata feature run the following queries against the openbank_openbankingdb--
-CREATE TABLE IF NOT EXISTS OB_ACCOUNT_METADATA (
-    ACCOUNT_ID VARCHAR(100) NOT NULL,
-    USER_ID VARCHAR(100) NOT NULL,
-    METADATA_KEY VARCHAR(100) NOT NULL,
-    METADATA_VALUE VARCHAR(100) NOT NULL,
-    LAST_UPDATE_TIMESTAMP DATETIME NOT NULL DEFAULT getdate(),
-    PRIMARY KEY (USER_ID,ACCOUNT_ID,METADATA_KEY)
-);
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql
deleted file mode 100644
index ca01fa7d..00000000
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2024, 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.
- */
--- For account metadata feature run the following queries against the openbank_openbankingdb
-CREATE TABLE IF NOT EXISTS OB_ACCOUNT_METADATA (
-    ACCOUNT_ID VARCHAR(100) NOT NULL,
-    USER_ID VARCHAR(100) NOT NULL,
-    METADATA_KEY VARCHAR(100) NOT NULL,
-    METADATA_VALUE VARCHAR(100) NOT NULL,
-    LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
-    PRIMARY KEY (USER_ID,ACCOUNT_ID,METADATA_KEY)
-);
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql
deleted file mode 100644
index 3e65ac5e..00000000
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2024, 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.
- */
-
---For account metadata feature run the following queries against the openbank_openbankingdb--
-CREATE TABLE IF NOT EXISTS OB_ACCOUNT_METADATA (
-    ACCOUNT_ID varchar(100) NOT NULL,
-    USER_ID varchar(100) NOT NULL,
-    METADATA_KEY varchar(100) NOT NULL,
-    METADATA_VALUE varchar(100) NOT NULL,
-    LAST_UPDATE_TIMESTAMP timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    PRIMARY KEY (USER_ID,ACCOUNT_ID,METADATA_KEY)
-);
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql
deleted file mode 100644
index 57c3aa2f..00000000
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2024, 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.
- */
-
---For account metadata feature run the following queries against the openbank_openbankingdb--
-CREATE TABLE IF NOT EXISTS OB_ACCOUNT_METADATA (
-    ACCOUNT_ID varchar(100) NOT NULL,
-    USER_ID varchar(100) NOT NULL,
-    METADATA_KEY varchar(100) NOT NULL,
-    METADATA_VALUE varchar(100) NOT NULL,
-    LAST_UPDATE_TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (USER_ID,ACCOUNT_ID,METADATA_KEY)
-);
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/dropins/classmate-1.5.1.jar b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/dropins/classmate-1.5.1.jar
new file mode 100644
index 00000000..819f5eaf
Binary files /dev/null and b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/dropins/classmate-1.5.1.jar differ
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/commons-beanutils-1.9.4.jar b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/commons-beanutils-1.9.4.jar
new file mode 100644
index 00000000..b73543cb
Binary files /dev/null and b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/commons-beanutils-1.9.4.jar differ
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/hibernate-validator-6.0.20.Final.jar b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/hibernate-validator-6.0.20.Final.jar
new file mode 100644
index 00000000..cf09a081
Binary files /dev/null and b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/hibernate-validator-6.0.20.Final.jar differ
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/validation-api-2.0.1.Final.jar b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/validation-api-2.0.1.Final.jar
new file mode 100644
index 00000000..2368e10a
Binary files /dev/null and b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/components/libs/validation-api-2.0.1.Final.jar differ
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/common.auth.script.js b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/common.auth.script.js
deleted file mode 100644
index 107478b2..00000000
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/common.auth.script.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var psuChannel = 'Online Banking';
-
-var onLoginRequest = function(context) {
-    publishAuthData(context, "AuthenticationAttempted", {'psuChannel': psuChannel});
-    executeStep(1, {
-        onSuccess: function (context) {
-            Log.info("Authentication Successful");
-            publishAuthData(context, "AuthenticationSuccessful", {'psuChannel': psuChannel});
-        },
-        onFail: function (context) {
-            Log.info("Authentication Failed");
-            publishAuthData(context, "AuthenticationFailed", {'psuChannel': psuChannel});
-        }
-    });
-};
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
index 83095050..ba50d4db 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
@@ -17,221 +17,75 @@
  ~ under the License.
  -->
 
-<Server xmlns="http://wso2.org/projects/carbon/open-banking.xml">
-
+<Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
+    <Common>
+        <Cache>
+            <CacheAccessExpiry>60</CacheAccessExpiry>
+            <CacheModifiedExpiry>60</CacheModifiedExpiry>
+        </Cache>
+    </Common>
     <JDBCPersistenceManager>
         <DataSource>
-            <!-- Include a data source name (jndiConfigName) from the set of data
-                sources defined in master-datasources.xml -->
-            <Name>jdbc/WSO2OB_DB</Name>
+            <Name>jdbc/WSO2FS_DB</Name>
         </DataSource>
-        <!-- The time for the driver to verify the database connection in seconds -->
         <ConnectionVerificationTimeout>1</ConnectionVerificationTimeout>
     </JDBCPersistenceManager>
-
-    <Identity>
-        <Extensions>
-            <RequestObjectValidator>
-                com.wso2.openbanking.accelerator.identity.auth.extensions.request.validator.OBRequestObjectValidator
-            </RequestObjectValidator>
-            <ClaimProvider>com.wso2.openbanking.accelerator.identity.claims.OBDefaultClaimProvider</ClaimProvider>
-            <IntrospectionDataProvider>com.wso2.openbanking.accelerator.identity.interceptor.OBDefaultIntrospectionDataProvider</IntrospectionDataProvider>
-            <ResponseTypeHandler>
-                com.wso2.openbanking.accelerator.identity.auth.extensions.response.handler.impl.OBDefaultResponseTypeHandlerImpl
-            </ResponseTypeHandler>
-        </Extensions>
-        <Filters>
-            <TokenFilter>com.wso2.openbanking.accelerator.identity.token.DefaultTokenFilter</TokenFilter>
-        </Filters>
-        <TokenFilterValidators>
-            <Validator>com.wso2.openbanking.accelerator.identity.token.validators.MTLSEnforcementValidator</Validator>
-            <Validator>com.wso2.openbanking.accelerator.identity.token.validators.SignatureAlgorithmEnforcementValidator</Validator>
-            <Validator>com.wso2.openbanking.accelerator.identity.token.validators.ClientAuthenticatorValidator</Validator>
-        </TokenFilterValidators>
-        <AuthenticationWebApp>
-            <ServletExtension>com.wso2.openbanking.accelerator.consent.extensions.authservlet.impl.OBDefaultAuthServletImpl</ServletExtension>
-        </AuthenticationWebApp>
-        <ApplicationInformationEndpoint>
-            <SPMetadataFilterExtension>
-                com.wso2.openbanking.accelerator.identity.sp.metadata.extension.impl.DefaultSPMetadataFilter
-            </SPMetadataFilterExtension>
-        </ApplicationInformationEndpoint>
-        <Cache>
-            <IdentityCache>
-                <CacheAccessExpiry>60</CacheAccessExpiry>
-                <CacheModifiedExpiry>60</CacheModifiedExpiry>
-            </IdentityCache>
-        </Cache>
-        <MutualTLS>
-            <TransportCertificateJWKS>software_jwks_endpoint</TransportCertificateJWKS>
-        </MutualTLS>
-    </Identity>
     <Consent>
-        <PeriodicalExpiration>
-            <Enabled>false</Enabled>
-            <CronValue>0 0 0 * * ?</CronValue>
-            <ExpiredConsentStatusValue>Expired</ExpiredConsentStatusValue>
-            <EligibleStatuses>authorised</EligibleStatuses>
-        </PeriodicalExpiration>
+        <ManageHandler>org.wso2.financial.services.accelerator.consent.mgt.extensions.manage.impl.DefaultConsentManageHandler</ManageHandler>
         <AuthorizeSteps>
             <Retrieve>
-                <Step class="com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.NonRegulatoryConsentStep" priority="1"/>
-                <Step class="com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.DefaultConsentRetrievalStep" priority="2"/>
+                <Step class="org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.impl.DefaultConsentRetrievalStep" priority="1"/>
             </Retrieve>
             <Persist>
-                <Step class="com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.DefaultConsentPersistStep" priority="1"/>
+                <Step class="org.wso2.financial.services.accelerator.consent.mgt.extensions.authorize.impl.DefaultConsentPersistStep" priority="1"/>
             </Persist>
         </AuthorizeSteps>
-        <ManageHandler>com.wso2.openbanking.accelerator.consent.extensions.manage.impl.DefaultConsentManageHandler</ManageHandler>
         <Validation>
-            <Validator>com.wso2.openbanking.accelerator.consent.extensions.validate.impl.DefaultConsentValidator</Validator>
-            <RequestSignatureAlias>apim</RequestSignatureAlias>
+            <Validator>org.wso2.financial.services.accelerator.consent.mgt.extensions.validate.impl.DefaultConsentValidator</Validator>
+            <RequestSignatureAlias>wso2carbon</RequestSignatureAlias>
             <JWTPayloadValidation>true</JWTPayloadValidation>
         </Validation>
-        <AdminHandler>com.wso2.openbanking.accelerator.consent.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
+        <AdminHandler>org.wso2.financial.services.accelerator.consent.mgt.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
+        <ConsentAPICredentials>
+            <Username>admin</Username>
+            <Password>admin</Password>
+        </ConsentAPICredentials>
+        <Payments>
+            <MaximumInstructedAmount>1000</MaximumInstructedAmount>
+        </Payments>
+        <Portal>
+            <ClientCredentials>
+                <ClientId>0NXYPMnh9mxSPCVjvvsVh17LWDca</ClientId>
+                <ClientSecret>pfVkfiEUvQqmZdYQuruauOs6SS0wd7yggkR2of58NXsa</ClientSecret>
+            </ClientCredentials>
+            <Params>
+                <IdentityServerBaseUrl>https://localhost:9443</IdentityServerBaseUrl>
+                <ApiManagerServerBaseUrl>https://localhost:8243</ApiManagerServerBaseUrl>
+            </Params>
+        </Portal>
+        <PreserveConsentLink>false</PreserveConsentLink>
+        <Idempotency>
+            <IsEnabled>false</IsEnabled>
+            <AllowedTimeDuration>1440</AllowedTimeDuration>
+        </Idempotency>
     </Consent>
-    <DCR>
-        <Validator>com.wso2.openbanking.accelerator.identity.dcr.validation.DefaultRegistrationValidatorImpl</Validator>
-        <JwksUrlSandbox>https://keystore.openbankingtest.org.uk/0015800001HQQrZAAX/9b5usDpbNtmxDcTzs7GzKp.jwks</JwksUrlSandbox>
-        <JwksUrlProduction>https://keystore.openbanking.org.uk/keystore/openbanking.jwks</JwksUrlProduction>
-        <ModifyResponse>false</ModifyResponse>
-        <Scope>cdr-registration</Scope>
-        <RegistrationClientURI>https://gateway/register/</RegistrationClientURI>
-        <JWKS-Retriever>
-            <ConnectionTimeout>0</ConnectionTimeout>
-            <ReadTimeout>0</ReadTimeout>
-        </JWKS-Retriever>
-        <RegulatoryIssuers>
-            <Issuer>OpenBanking Ltd</Issuer>
-            <Issuer>CDR</Issuer>
-        </RegulatoryIssuers>
-        <ApplicationUpdaterImpl>com.wso2.openbanking.accelerator.identity.listener.application.ApplicationUpdaterImpl</ApplicationUpdaterImpl>
-        <RegistrationRequestParams>
-            <GrantTypes>
-                <Required>true</Required>
-            </GrantTypes>
-            <ResponseTypes>
-                <Required>false</Required>
-            </ResponseTypes>
-            <Issuer>
-                <Required>true</Required>
-            </Issuer>
-            <Audience>
-                <Required>true</Required>
-            </Audience>
-            <SoftwareStatement>
-                <Required>true</Required>
-            </SoftwareStatement>
-            <TokenEndPointAuthentication>
-                <Required>true</Required>
-            </TokenEndPointAuthentication>
-            <IdTokenSignedResponseAlg>
-                <Required>true</Required>
-            </IdTokenSignedResponseAlg>
-            <CallbackUris>
-                <Required>false</Required>
-            </CallbackUris>
-            <TokenEndPointAuthSigningAlg>
-                <Required>false</Required>
-            </TokenEndPointAuthSigningAlg>
-            <SoftwareId>
-                <Required>false</Required>
-            </SoftwareId>
-            <Scope>
-                <Required>false</Required>
-            </Scope>
-            <ApplicationType>
-                <Required>false</Required>
-            </ApplicationType>
-            <IdTokenEncryptionResponseAlg>
-                <Required>false</Required>
-            </IdTokenEncryptionResponseAlg>
-            <IdTokenEncryptionResponseEnc>
-                <Required>false</Required>
-            </IdTokenEncryptionResponseEnc>
-            <RequestObjectSigningAlg>
-                <Required>false</Required>
-            </RequestObjectSigningAlg>
-            <TLSClientAuthSubjectDn>
-                <Required>false</Required>
-            </TLSClientAuthSubjectDn>
-            <BackchannelTokenDeliveryMode>
-                <Required>false</Required>
-            </BackchannelTokenDeliveryMode>
-            <BackchannelAuthenticationRequestSigningAlg>
-                <Required>false</Required>
-            </BackchannelAuthenticationRequestSigningAlg>
-            <BackchannelClientNotificationEndpoint>
-                <Required>false</Required>
-            </BackchannelClientNotificationEndpoint>
-            <BackchannelUserCodeParameterSupported>
-                <Required>false</Required>
-            </BackchannelUserCodeParameterSupported>
-        </RegistrationRequestParams>
-    </DCR>
-    <SignatureValidation>
-        <AllowedAlgorithms>
-            <Algorithm>PS256</Algorithm>
-            <Algorithm>ES256</Algorithm>
-        </AllowedAlgorithms>
-    </SignatureValidation>
-    <DataPublishing>
-        <Enabled>true</Enabled>
-        <Username>admin</Username>
-        <Password>admin</Password>
-        <ServerURL>{tcp://localhost:7612}</ServerURL>
-        <AuthURL></AuthURL>
-        <!-- Allowed values: Thrift -->
-        <Protocol>Thrift</Protocol>
-        <PoolSize>10</PoolSize>
-        <QueueSize>32768</QueueSize>
-        <WorkerThreadCount>10</WorkerThreadCount>
-        <PoolWaitTimeMs>60000</PoolWaitTimeMs>
-        <Thrift>
-            <PublishingTimeout>2000</PublishingTimeout>
-            <Streams>
-                <APIInputStream>
-                    <Attribute name="consentId" priority="1"/>
-                    <Attribute name="userId" priority="2"/>
-                    <Attribute name="clientId" priority="3"/>
-                    <Attribute name="userAgent" priority="4"/>
-                    <Attribute name="statusCode" priority="5"/>
-                    <Attribute name="statusMessage" priority="6"/>
-                    <Attribute name="httpMethod" priority="7"/>
-                    <Attribute name="responsePayloadSize" priority="8"/>
-                    <Attribute name="electedResource" priority="9"/>
-                    <Attribute name="apiName" priority="10"/>
-                    <Attribute name="apiSpecVersion" priority="11"/>
-                    <Attribute name="timestamp" priority="12"/>
-                </APIInputStream>
-                <AuthenticationInputStream>
-                    <Attribute name="userId" priority="1"/>
-                    <Attribute name="authenticationStep" priority="2"/>
-                    <Attribute name="authenticationStatus" priority="3"/>
-                    <Attribute name="authenticationApproach" priority="4"/>
-                    <Attribute name="psuChannel" priority="5"/>
-                    <Attribute name="timestamp" priority="6"/>
-                </AuthenticationInputStream>
-                <AccessTokenInputStream>
-                    <Attribute name="accessToken" priority="1"/>
-                </AccessTokenInputStream>
-            </Streams>
-        </Thrift>
-        <AuthDataPublisher>com.wso2.openbanking.accelerator.authentication.data.publisher.extension.DefaultAuthDataPublisher</AuthDataPublisher>
-    </DataPublishing>
-    <SCA>
-        <PrimaryAuthenticator>
-            <Name>BasicAuthenticator</Name>
-            <DisplayName>basic</DisplayName>
-        </PrimaryAuthenticator>
-        <IdpName>SMSAuthentication</IdpName>
-    </SCA>
+    <Identity>
+        <AuthenticationWebApp>
+            <ServletExtension>org.wso2.financial.services.accelerator.consent.mgt.extensions.authservlet.impl.FSDefaultAuthServletImpl</ServletExtension>
+        </AuthenticationWebApp>
+        <ConsentIDClaimName>consent_id</ConsentIDClaimName>
+        <Extensions>
+            <RequestObjectValidator>org.wso2.financial.services.accelerator.identity.extensions.auth.extensions.request.validator.DefaultFSRequestObjectValidator</RequestObjectValidator>
+            <ResponseTypeHandler>org.wso2.financial.services.accelerator.identity.extensions.auth.extensions.response.handler.impl.FSDefaultResponseTypeHandlerImpl</ResponseTypeHandler>
+            <ClaimProvider>org.wso2.financial.services.accelerator.identity.extensions.claims.FSDefaultClaimProvider</ClaimProvider>
+        </Extensions>
+        <TokenSubject>
+            <RemoveUserStoreDomainFromSubject>true</RemoveUserStoreDomainFromSubject>
+            <RemoveTenantDomainFromSubject>true</RemoveTenantDomainFromSubject>
+        </TokenSubject>
+    </Identity>
     <HTTPConnectionPool>
         <MaxConnections>2000</MaxConnections>
         <MaxConnectionsPerRoute>1500</MaxConnectionsPerRoute>
     </HTTPConnectionPool>
-    <PSUFederatedAuthentication>
-        <Enabled>false</Enabled>
-        <IDPName></IDPName>
-    </PSUFederatedAuthentication>
 </Server>
diff --git a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
index 83e38080..1cb69ba2 100644
--- a/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
+++ b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -17,1089 +17,207 @@
  ~ under the License.
  -->
 
-<Server xmlns="http://wso2.org/projects/carbon/open-banking.xml">
+<Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
+    <Common>
+        <Cache>
+            {% if financial_services.common.cache.cache_access_expiry_minutes is defined %}
+            <CacheAccessExpiry>{{financial_services.common.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
+            {% else %}
+            <CacheAccessExpiry>60</CacheAccessExpiry>
+            {% endif %}
+            {% if financial_services.common.cache.cache_modified_expiry_minutes is defined %}
+            <CacheModifiedExpiry>{{financial_services.common.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
+            {% else %}
+            <CacheModifiedExpiry>60</CacheModifiedExpiry>
+            {% endif %}
+        </Cache>
+    </Common>
     <JDBCPersistenceManager>
         <DataSource>
             <!-- Include a data source name (jndiConfigName) from the set of data
                 sources defined in master-datasources.xml -->
-            {% if open_banking.jdbc_persistence_manager.data_source is defined %}
-            <Name>jdbc/{{open_banking.jdbc_persistence_manager.data_source.name}}</Name>
+            {% if financial_services.jdbc_persistence_manager.data_source is defined %}
+            <Name>jdbc/{{financial_services.jdbc_persistence_manager.data_source.name}}</Name>
             {% else %}
-            <Name>jdbc/WSO2OB_DB</Name>
+            <Name>jdbc/WSO2FS_DB</Name>
         {% endif %}
         </DataSource>
-        {% if open_banking.jdbc_persistence_manager.connection_verification_timeout is defined %}
-        <ConnectionVerificationTimeout>{{open_banking.jdbc_persistence_manager.connection_verification_timeout}}</ConnectionVerificationTimeout>
+        {% if financial_services.jdbc_persistence_manager.connection_verification_timeout is defined %}
+        <ConnectionVerificationTimeout>{{financial_services.jdbc_persistence_manager.connection_verification_timeout}}</ConnectionVerificationTimeout>
         {% else %}
         <ConnectionVerificationTimeout>1</ConnectionVerificationTimeout>
         {% endif %}
     </JDBCPersistenceManager>
-    <JDBCRetentionDataPersistenceManager>
-        <DataSource>
-            <!-- Include a data source name (jndiConfigName) from the set of data
-                sources defined in master-datasources.xml -->
-            {% if open_banking.jdbc_retention_data_persistence_manager.data_source is defined %}
-            <Name>jdbc/{{open_banking.jdbc_retention_data_persistence_manager.data_source.name}}</Name>
-            {% else %}
-            <Name>jdbc/WSO2OB_RET_DB</Name>
-        {% endif %}
-        </DataSource>
-        {% if open_banking.jdbc_retention_data_persistence_manager.connection_verification_timeout is defined %}
-        <ConnectionVerificationTimeout>{{open_banking.jdbc_retention_data_persistence_manager.connection_verification_timeout}}</ConnectionVerificationTimeout>
-        {% else %}
-        <ConnectionVerificationTimeout>1</ConnectionVerificationTimeout>
-        {% endif %}
-    </JDBCRetentionDataPersistenceManager>
-    <Identity>
-        <Extensions>
-            {% if open_banking.identity.extensions.request_object_validator is defined %}
-                <RequestObjectValidator>{{open_banking.identity.extensions.request_object_validator}}</RequestObjectValidator>
-            {% else %}
-                <RequestObjectValidator>com.wso2.openbanking.accelerator.identity.auth.extensions.request.validator.OBRequestObjectValidator</RequestObjectValidator>
-            {% endif %}
-            {% if open_banking.identity.extensions.push_auth_request_validator is defined %}
-                <PushAuthRequestValidator>{{open_banking.identity.extensions.push_auth_request_validator}}</PushAuthRequestValidator>
-            {% else %}
-                <PushAuthRequestValidator>com.wso2.openbanking.accelerator.identity.push.auth.extension.request.validator.PushAuthRequestValidator</PushAuthRequestValidator>
-            {% endif %}
-            {% if open_banking.identity.extensions.claim_provider is defined %}
-            <ClaimProvider>{{open_banking.identity.extensions.claim_provider}}</ClaimProvider>
-            {% else %}
-            <ClaimProvider>com.wso2.openbanking.accelerator.identity.claims.OBDefaultClaimProvider</ClaimProvider>
-            {% endif %}
-            {% if open_banking.identity.extensions.introspection_data_provider is defined %}
-                <IntrospectionDataProvider>{{open_banking.identity.extensions.introspection_data_provider}}</IntrospectionDataProvider>
-            {% else %}
-                <IntrospectionDataProvider>com.wso2.openbanking.accelerator.identity.interceptor.OBDefaultIntrospectionDataProvider</IntrospectionDataProvider>
-            {% endif %}
-
-            {% if open_banking.identity.extensions.response_type_handler is defined %}
-                <ResponseTypeHandler>{{open_banking.identity.extensions.response_type_handler}}</ResponseTypeHandler>
-            {% else %}
-                <ResponseTypeHandler>com.wso2.openbanking.accelerator.identity.auth.extensions.response.handler.impl.OBDefaultResponseTypeHandlerImpl</ResponseTypeHandler>
-            {% endif %}
-        </Extensions>
-        <Filters>
-            {% if open_banking.identity.filters.token_filter is defined %}
-            <TokenFilter>{{open_banking.identity.filters.token_filter}}</TokenFilter>
-            {% else %}
-            <TokenFilter>com.wso2.openbanking.accelerator.identity.token.DefaultTokenFilter</TokenFilter>
-            {% endif %}
-        </Filters>
-        <TokenFilterValidators>
-            {% if open_banking.identity.token_filter_validators is defined %}
-                {% for validator in open_banking.identity.token_filter_validators %}
-                <Validator>{{validator.class}}</Validator>
-                {% endfor %}
-            {% else %}
-                <Validator>com.wso2.openbanking.accelerator.identity.token.validators.MTLSEnforcementValidator</Validator>
-                <Validator>com.wso2.openbanking.accelerator.identity.token.validators.MTLSCertificateValidator</Validator>
-                <Validator>com.wso2.openbanking.accelerator.identity.token.validators.SignatureAlgorithmEnforcementValidator</Validator>
-                <Validator>com.wso2.openbanking.accelerator.identity.token.validators.ClientAuthenticatorValidator</Validator>
-            {% endif %}
-        </TokenFilterValidators>
-        {% if open_banking.identity.client_transport_cert_as_header_enabled is defined %}
-            <ClientTransportCertAsHeaderEnabled>{{open_banking.identity.client_transport_cert_as_header_enabled}}</ClientTransportCertAsHeaderEnabled>
-        {% else %}
-            <ClientTransportCertAsHeaderEnabled>true</ClientTransportCertAsHeaderEnabled>
-        {% endif %}
-        {% if open_banking.identity.signing_certificate_kid is defined %}
-            <SigningCertificateKid>{{open_banking.identity.signing_certificate_kid}}</SigningCertificateKid>
-        {% endif %}
-        {% if open_banking.identity.enable_PPID is defined %}
-             <EnableSubjectPPID>{{open_banking.identity.enable_PPID}}</EnableSubjectPPID>
-        {% else %}
-             <EnableSubjectPPID>false</EnableSubjectPPID>
-        {% endif %}
-        <TokenSubject>
-            {% if open_banking.identity.token.remove_user_store_domain_from_subject is defined %}
-                 <RemoveUserStoreDomainFromSubject>{{open_banking.identity.token.remove_user_store_domain_from_subject}}</RemoveUserStoreDomainFromSubject>
-            {% else %}
-                 <RemoveUserStoreDomainFromSubject>false</RemoveUserStoreDomainFromSubject>
-            {% endif %}
-            {% if open_banking.identity.token.remove_tenant_domain_from_subject is defined %}
-                 <RemoveTenantDomainFromSubject>{{open_banking.identity.token.remove_tenant_domain_from_subject}}</RemoveTenantDomainFromSubject>
-            {% else %}
-                 <RemoveTenantDomainFromSubject>false</RemoveTenantDomainFromSubject>
-            {% endif %}
-        </TokenSubject>
-        <Cache>
-            <IdentityCache>
-                {% if open_banking.identity.cache.cache_access_expiry_minutes is defined %}
-                    <CacheAccessExpiry>{{open_banking.identity.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
-                {% endif %}
-                {% if open_banking.identity.cache.cache_modified_expiry_minutes is defined %}
-                    <CacheModifiedExpiry>{{open_banking.identity.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
-                {% endif %}
-            </IdentityCache>
-        </Cache>
-
-        <CIBAAuthenticationEndpointWebApp>
-            {% if open_banking.identity.ciba_webapp.servlet_extension is defined %}
-                <ServletExtension>
-                    {{open_banking.identity.ciba_webapp.servlet_extension}}
-                </ServletExtension>
-            {% else %}
-                <ServletExtension>
-                    com.wso2.openbanking.accelerator.consent.extensions.ciba.impl.CIBAAuthenticationEndpointDefaultImpl
-                </ServletExtension>
-            {% endif %}
-        </CIBAAuthenticationEndpointWebApp>
-        <AuthenticationWebApp>
-            {% if open_banking.identity.authentication_webapp.servlet_extension is defined %}
-                <ServletExtension>
-                    {{open_banking.identity.authentication_webapp.servlet_extension}}
-                </ServletExtension>
-            {% else %}
-                <ServletExtension>
-                    com.wso2.openbanking.accelerator.consent.extensions.authservlet.impl.OBDefaultAuthServletImpl
-                </ServletExtension>
-            {% endif %}
-        </AuthenticationWebApp>
-        <ApplicationInformationEndpoint>
-            {% if open_banking.identity.application_information_webapp.sp_metadata_filter is defined %}
-                <SPMetadataFilterExtension>
-                    {{open_banking.identity.application_information_webapp.sp_metadata_filter}}
-                </SPMetadataFilterExtension>
-            {% else %}
-                <SPMetadataFilterExtension>
-                    com.wso2.openbanking.accelerator.identity.sp.metadata.extension.impl.DefaultSPMetadataFilter
-                </SPMetadataFilterExtension>
-            {% endif %}
-        </ApplicationInformationEndpoint>
-        {% if open_banking.identity.consent_id_claim_name is defined %}
-            <ConsentIDClaimName>{{open_banking.identity.consent_id_claim_name}}</ConsentIDClaimName>
-        {% else %}
-            <ConsentIDClaimName>consent_id</ConsentIDClaimName>
-        {% endif %}
-        <MutualTLS>
-        {% if open_banking.identity.mutualtls.client_certificate_encode is defined %}
-            <ClientCertificateEncode>{{open_banking.identity.mutualtls.client_certificate_encode}}</ClientCertificateEncode>
-        {% else %}
-            <ClientCertificateEncode>true</ClientCertificateEncode>
-        {% endif %}
-        {% if open_banking.identity.mutualtls.transport_jwks_uri is defined %}
-            <TransportCertificateJWKS>{{open_banking.identity.mutualtls.transport_jwks_uri}}</TransportCertificateJWKS>
-        {% else %}
-            <TransportCertificateJWKS>software_jwks_endpoint</TransportCertificateJWKS>
-        {% endif %}
-        </MutualTLS>
-    </Identity>
     <Consent>
-        {% if open_banking.consent.preserve_consent_link.enable is defined %}
-        <PreserveConsentLink>{{open_banking.consent.preserve_consent_link.enable}}</PreserveConsentLink>
-        {% else %}
-        <PreserveConsentLink>false</PreserveConsentLink>
-        {% endif %}
-
-        {% if open_banking.consent.account_consent_self_link is defined %}
-        <AccountAPIURL>{{open_banking.consent.account_consent_self_link}}</AccountAPIURL>
-        {% else %}
-        <AccountAPIURL>https://localhost:8243/open-banking/{version}/aisp/</AccountAPIURL>
-        {% endif %}
-        {% if open_banking.consent.payment_consent_self_link is defined %}
-        <PaymentAPIURL>{{open_banking.consent.payment_consent_self_link}}</PaymentAPIURL>
-        {% else %}
-        <PaymentAPIURL>https://localhost:8243/open-banking/{version}/pisp/</PaymentAPIURL>
-        {% endif %}
-        {% if open_banking.consent.cof_consent_self_link is defined %}
-        <FundsConfirmationAPIURL>{{open_banking.consent.cof_consent_self_link}}</FundsConfirmationAPIURL>
+        {% if financial_services.consent.manage.handler is defined %}
+        <ManageHandler>{{financial_services.consent.manage.handler}}</ManageHandler>
         {% else %}
-        <FundsConfirmationAPIURL>https://localhost:8243/open-banking/{version}/cbpii/</FundsConfirmationAPIURL>
+        <ManageHandler>org..wso2.financial.services.accelerator.consent.extensions.manage.impl.DefaultConsentManageHandler</ManageHandler>
         {% endif %}
-        {% if open_banking.consent.vrp_consent_self_link is defined %}
-        <VRPAPIURL>{{open_banking.consent.vrp_consent_self_link}}</VRPAPIURL>
-        {% else %}
-        <VRPAPIURL>https://localhost:8243/open-banking/{version}/vrp/</VRPAPIURL>
-        {% endif %}
-        <DataRetention>
-            {% if open_banking.consent.data_retention.enabled is defined %}
-                <Enabled>{{open_banking.consent.data_retention.enabled}}</Enabled>
-            {% else %}
-                <Enabled>false</Enabled>
-            {% endif %}
-            {% if open_banking.consent.data_retention.enable_db_sync_periodical_job is defined %}
-                <DBSyncEnabled>{{open_banking.consent.data_retention.enable_db_sync_periodical_job}}</DBSyncEnabled>
-            {% else %}
-                <DBSyncEnabled>false</DBSyncEnabled>
-            {% endif %}
-            {% if open_banking.consent.data_retention.db_sync_cron_value is defined %}
-                <CronValue>{{open_banking.consent.data_retention.db_sync_cron_value}}</CronValue>
-            {% else %}
-                <CronValue>0 0 0 * * ?</CronValue>
-            {% endif %}
-        </DataRetention>
-        <PeriodicalExpiration>
-            {% if open_banking.consent.periodical_expiration.enabled is defined %}
-                <Enabled>{{open_banking.consent.periodical_expiration.enabled}}</Enabled>
-            {% else %}
-                <Enabled>false</Enabled>
-            {% endif %}
-            {% if open_banking.consent.periodical_expiration.cron_value is defined %}
-                <CronValue>{{open_banking.consent.periodical_expiration.cron_value}}</CronValue>
-            {% else %}
-                <CronValue>0 0 0 * * ?</CronValue>
-            {% endif %}
-            {% if open_banking.consent.periodical_expiration.expired_consent_status_value is defined %}
-                <ExpiredConsentStatusValue>{{open_banking.consent.periodical_expiration.expired_consent_status_value}}</ExpiredConsentStatusValue>
-            {% else %}
-                <ExpiredConsentStatusValue>Expired</ExpiredConsentStatusValue>
-            {% endif %}
-            {% if open_banking.consent.periodical_expiration.eligible_statuses is defined %}
-                <EligibleStatuses>{{open_banking.consent.periodical_expiration.eligible_statuses}}</EligibleStatuses>
-            {% else %}
-                <EligibleStatuses>authorised</EligibleStatuses>
-            {% endif %}
-        </PeriodicalExpiration>
-        <AmendmentHistory>
-            {% if open_banking.consent.amendment_history.enabled is defined %}
-                <Enabled>{{open_banking.consent.amendment_history.enabled}}</Enabled>
-            {% else %}
-                <Enabled>false</Enabled>
-            {% endif %}
-        </AmendmentHistory>
         <AuthorizeSteps>
             <Retrieve>
-                {% if open_banking.consent.authorize_steps.retrieve is defined %}
-                    {% for step in open_banking.consent.authorize_steps.retrieve %}
+                {% if financial_services.consent.authorize_steps.retrieve is defined %}
+                    {% for step in financial_services.consent.authorize_steps.retrieve %}
                     <Step class="{{step.class}}"
                           priority="{{step.priority}}"/>
                     {% endfor %}
                 {% else %}
-                <Step class="com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.NonRegulatoryConsentStep" priority="1"/>
-                <Step class="com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.DefaultConsentRetrievalStep" priority="2"/>
+                <Step class="org..wso2.financial.services.accelerator.consent.extensions.authorize.impl.DefaultConsentRetrievalStep" priority="2"/>
                 {% endif %}
             </Retrieve>
             <Persist>
-                {% if open_banking.consent.authorize_steps.persist is defined %}
-                    {% for step in open_banking.consent.authorize_steps.persist %}
+                {% if financial_services.consent.authorize_steps.persist is defined %}
+                    {% for step in financial_services.consent.authorize_steps.persist %}
                     <Step class="{{step.class}}"
                           priority="{{step.priority}}"/>
                     {% endfor %}
                 {% else %}
-                <Step class="com.wso2.openbanking.accelerator.consent.extensions.authorize.impl.DefaultConsentPersistStep" priority="1"/>
+                <Step class="org..wso2.financial.services.accelerator.consent.extensions.authorize.impl.DefaultConsentPersistStep" priority="1"/>
                 {% endif %}
             </Persist>
-        </AuthorizeSteps>
-        {% if open_banking.consent.manage.handler is defined %}
-        <ManageHandler>{{open_banking.consent.manage.handler}}</ManageHandler>
-        {% else %}
-        <ManageHandler>com.wso2.openbanking.accelerator.consent.extensions.manage.impl.DefaultConsentManageHandler</ManageHandler>
-        {% endif %}
+        </AuthorizeSteps
         <Validation>
-            {% if open_banking.consent.validation.validator is defined %}
-            <Validator>{{open_banking.consent.validation.validator}}</Validator>
+            {% if financial_services.consent.validation.validator is defined %}
+            <Validator>{{financial_services.consent.validation.validator}}</Validator>
             {% else %}
-            <Validator>com.wso2.openbanking.accelerator.consent.extensions.validate.impl.DefaultConsentValidator</Validator>
+            <Validator>org..wso2.financial.services.accelerator.consent.extensions.validate.impl.DefaultConsentValidator</Validator>
             {% endif %}
 
-            {% if open_banking.consent.validation.signature.alias is defined %}
-            <RequestSignatureAlias>{{open_banking.consent.validation.signature.alias}}</RequestSignatureAlias>
+            {% if financial_services.consent.validation.signature.alias is defined %}
+            <RequestSignatureAlias>{{financial_services.consent.validation.signature.alias}}</RequestSignatureAlias>
             {% else %}
             <RequestSignatureAlias>wso2carbon</RequestSignatureAlias>
             {% endif %}
 
-            {% if open_banking.consent.validation.jwt.payload.enabled is defined %}
-            <JWTPayloadValidation>{{open_banking.consent.validation.jwt.payload.enabled}}</JWTPayloadValidation>
+            {% if financial_services.consent.validation.jwt.payload.enabled is defined %}
+            <JWTPayloadValidation>{{financial_services.consent.validation.jwt.payload.enabled}}</JWTPayloadValidation>
             {% else %}
             <JWTPayloadValidation>true</JWTPayloadValidation>
             {% endif %}
         </Validation>
-        {% if open_banking.consent.admin.handler is defined %}
-        <AdminHandler>{{open_banking.consent.admin.handler}}</AdminHandler>
+        {% if financial_services.consent.admin.handler is defined %}
+        <AdminHandler>{{financial_services.consent.admin.handler}}</AdminHandler>
         {% else %}
-        <AdminHandler>com.wso2.openbanking.accelerator.consent.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
+        <AdminHandler>org..wso2.financial.services.accelerator.consent.extensions.admin.impl.DefaultConsentAdminHandler</AdminHandler>
         {% endif %}
 
-         <PaymentRestrictions>
-            {% if open_banking.consent.payment_restrictions.max_instructed_amount is defined %}
-            <MaximumInstructedAmount>{{open_banking.consent.payment_restrictions.max_instructed_amount}}</MaximumInstructedAmount>
-            {% else %}
-            <MaximumInstructedAmount>1000.00</MaximumInstructedAmount>
-            {% endif %}
-            {% if open_banking.consent.payment_restrictions.max_future_days is defined %}
-            <MaximumFuturePaymentDays>{{open_banking.consent.payment_restrictions.max_future_days}}</MaximumFuturePaymentDays>
-            {% else %}
-            <MaximumFuturePaymentDays>900</MaximumFuturePaymentDays>
-            {% endif %}
-
-            <CutOffDateTime>
-                {% if open_banking.consent.payment_restrictions.cutoff_date.enabled is defined %}
-                <Enabled>{{open_banking.consent.payment_restrictions.cutoff_date.enabled}}</Enabled>
-                {% else %}
-                <Enabled>false</Enabled>
-                {% endif %}
-                {% if open_banking.consent.payment_restrictions.cutoff_date.policy is defined %}
-                <CutOffDateTimePolicy>{{open_banking.consent.payment_restrictions.cutoff_date.policy}}</CutOffDateTimePolicy>
-                {% else %}
-                <CutOffDateTimePolicy>ACCEPT</CutOffDateTimePolicy>
-                {% endif %}
-                {% if open_banking.consent.payment_restrictions.cutoff_date.daily_cutoff is defined %}
-                <DailyCutOffTime>{{open_banking.consent.payment_restrictions.cutoff_date.daily_cutoff}}</DailyCutOffTime>
-                {% else %}
-                <DailyCutOffTime>6:30:00+00:00</DailyCutOffTime>
-                {% endif %}
-                {% if open_banking.consent.payment_restrictions.cutoff_date.execution_time is defined %}
-                <ExpectedExecutionTime>{{open_banking.consent.payment_restrictions.cutoff_date.execution_time}}</ExpectedExecutionTime>
-                {% else %}
-                <ExpectedExecutionTime>10:00:00+00:00</ExpectedExecutionTime>
-                {% endif %}
-                {% if open_banking.consent.payment_restrictions.cutoff_date.settlement_time is defined %}
-                <ExpectedSettlementTime>{{open_banking.consent.payment_restrictions.cutoff_date.settlement_time}}</ExpectedSettlementTime>
-                {% else %}
-                <ExpectedSettlementTime>11:00:00+00:00</ExpectedSettlementTime>
-                {% endif %}
-            </CutOffDateTime>
-         </PaymentRestrictions>
-
-         {% if open_banking.consent.custom_local_instruments is defined %}
-         <CustomLocalInstrumentValues>{{open_banking.consent.custom_local_instruments}}</CustomLocalInstrumentValues>
-         {% else %}
-         <CustomLocalInstrumentValues></CustomLocalInstrumentValues>
-         {% endif %}
-
         <ConsentAPICredentials>
-            {% if open_banking.consent.api_credentials.username is defined %}
-                <Username>{{open_banking.consent.api_credentials.username}}</Username>
+            {% if financial_services.consent.api_credentials.username is defined %}
+                <Username>{{financial_services.consent.api_credentials.username}}</Username>
             {% else %}
                 <Username>admin@wso2.com</Username>
             {% endif %}
-            {% if open_banking.consent.api_credentials.password is defined %}
-                <Password>{{open_banking.consent.api_credentials.password}}</Password>
+            {% if financial_services.consent.api_credentials.password is defined %}
+                <Password>{{financial_services.consent.api_credentials.password}}</Password>
             {% else %}
                 <Password>wso2123</Password>
             {% endif %}
         </ConsentAPICredentials>
         <Portal>
             <ClientCredentials>
-                {% if open_banking.consent.portal.client_credentials.client_id is defined %}
-                    <ClientId>{{open_banking.consent.portal.client_credentials.client_id}}</ClientId>
+                {% if financial_services.consent.portal.client_credentials.client_id is defined %}
+                    <ClientId>{{financial_services.consent.portal.client_credentials.client_id}}</ClientId>
                 {% else %}
                     <ClientId>consent_management_portal_client_id</ClientId>
                 {% endif %}
-                {% if open_banking.consent.portal.client_credentials.client_secret is defined %}
-                    <ClientSecret>{{open_banking.consent.portal.client_credentials.client_secret}}</ClientSecret>
+                {% if financial_services.consent.portal.client_credentials.client_secret is defined %}
+                    <ClientSecret>{{financial_services.consent.portal.client_credentials.client_secret}}</ClientSecret>
                 {% else %}
                     <ClientSecret>consent_management_portal_client_secret</ClientSecret>
                 {% endif %}
             </ClientCredentials>
             <Params>
-                {% if open_banking.consent.portal.params.identity_server_base_url is defined %}
-                    <IdentityServerBaseUrl>{{open_banking.consent.portal.params.identity_server_base_url}}</IdentityServerBaseUrl>
+                {% if financial_services.consent.portal.params.identity_server_base_url is defined %}
+                    <IdentityServerBaseUrl>{{financial_services.consent.portal.params.identity_server_base_url}}</IdentityServerBaseUrl>
                 {% else %}
                     <IdentityServerBaseUrl>https://localhost:9446</IdentityServerBaseUrl>
                 {% endif %}
-                {% if open_banking.consent.portal.params.api_manager_server_base_url is defined %}
-                    <ApiManagerServerBaseUrl>{{open_banking.consent.portal.params.api_manager_server_base_url}}</ApiManagerServerBaseUrl>
+                {% if financial_services.consent.portal.params.api_manager_server_base_url is defined %}
+                    <ApiManagerServerBaseUrl>{{financial_services.consent.portal.params.api_manager_server_base_url}}</ApiManagerServerBaseUrl>
                 {% else %}
                     <ApiManagerServerBaseUrl>https://localhost:8243</ApiManagerServerBaseUrl>
                 {% endif %}
             </Params>
         </Portal>
+        <Payments>
+            {% if financial_services.consent.preserve_consent_link.enable is defined %}
+            <MaximumInstructedAmount>{{financial_services.consent.preserve_consent_link.enable}}</MaximumInstructedAmount>
+            {% else %}
+            <MaximumInstructedAmount>1000</MaximumInstructedAmount>
+            {% endif %}
+        </Payments>
         <Idempotency>
-            {% if open_banking.consent.idempotency.enabled is defined %}
-                <Enabled>{{open_banking.consent.idempotency.enabled}}</Enabled>
+            {% if financial_services.consent.idempotency.enabled is defined %}
+                <Enabled>{{financial_services.consent.idempotency.enabled}}</Enabled>
             {% else %}
                 <IsEnabled>false</IsEnabled>
             {% endif %}
 
-            {% if open_banking.consent.idempotency.allowed_time_duration is defined %}
-                <AllowedTimeDuration>{{open_banking.consent.idempotency.allowed_time_duration}}</AllowedTimeDuration>
+            {% if financial_services.consent.idempotency.allowed_time_duration is defined %}
+                <AllowedTimeDuration>{{financial_services.consent.idempotency.allowed_time_duration}}</AllowedTimeDuration>
             {% else %}
                 <AllowedTimeDuration>1440</AllowedTimeDuration>
             {% endif %}
         </Idempotency>
-    </Consent>
-    <DCR>
-        {% if open_banking.dcr.validator is defined %}
-        <Validator>{{open_banking.dcr.validator}}</Validator>
-        {% else %}
-        <Validator>com.wso2.openbanking.accelerator.identity.dcr.validation.DefaultRegistrationValidatorImpl</Validator>
-        {% endif %}
-        {% if open_banking.dcr.jwks_url_sandbox is defined %}
-        <JwksUrlSandbox>{{open_banking.dcr.jwks_url_sandbox}}</JwksUrlSandbox>
-        {% else %}
-        <JwksUrlSandbox>https://keystore.openbankingtest.org.uk/0015800001HQQrZAAX/9b5usDpbNtmxDcTzs7GzKp.jwks</JwksUrlSandbox>
-        {% endif %}
-        {% if open_banking.dcr.jwks_url_production is defined %}
-        <JwksUrlProduction>{{open_banking.dcr.jwks_url_production}}</JwksUrlProduction>
-        {% else %}
-        <JwksUrlProduction>https://keystore.openbanking.org.uk/keystore/openbanking.jwks</JwksUrlProduction>
-        {% endif %}
-        <JWKS-Retriever>
-            {% if open_banking.dcr.jwks_retriever.connection_timeout is defined %}
-            <ConnectionTimeout>{{open_banking.dcr.jwks_retriever.connection_timeout}}</ConnectionTimeout>
-            {% else %}
-            <ConnectionTimeout>0</ConnectionTimeout>
-            {% endif %}
-            {% if open_banking.dcr.jwks_retriever.read_timeout is defined %}
-            <ReadTimeout>{{open_banking.dcr.jwks_retriever.read_timeout}}</ReadTimeout>
-            {% else %}
-            <ReadTimeout>0</ReadTimeout>
-            {% endif %}
-        </JWKS-Retriever>
-        <RegulatoryIssuers>
-            {% for iss in open_banking.dcr.regulatory_issuers.iss %}
-               <Issuer>{{iss.name}}</Issuer>
-            {% endfor %}
-        </RegulatoryIssuers>
-        {% if open_banking.dcr.applicationupdater is defined %}
-        <ApplicationUpdaterImpl>{{open_banking.dcr.applicationupdater}}</ApplicationUpdaterImpl>
+        {% if financial_services.consent.preserve_consent_link.enable is defined %}
+        <PreserveConsentLink>{{financial_services.consent.preserve_consent_link.enable}}</PreserveConsentLink>
         {% else %}
-        <ApplicationUpdaterImpl>com.wso2.openbanking.accelerator.identity.listener.application.ApplicationUpdaterImpl</ApplicationUpdaterImpl>
+        <PreserveConsentLink>false</PreserveConsentLink>
         {% endif %}
-       {% if open_banking.dcr.use_softwareIdForAppName is defined %}
-       <UseSoftwareIdAsAppName>{{open_banking.dcr.use_softwareIdForAppName}}</UseSoftwareIdAsAppName>
-       {% else %}
-       <UseSoftwareIdAsAppName>true</UseSoftwareIdAsAppName>
-       {% endif %}
-       {% if open_banking.dcr.jwks_endpoint_name is defined %}
-       <JWKSEndpointName>{{open_banking.dcr.jwks_endpoint_name}}</JWKSEndpointName>
-       {% else %}
-       <JWKSEndpointName>software_jwks_endpoint</JWKSEndpointName>
-       {% endif %}
-       {% if open_banking.dcr.append_registration_attributes_in_response is defined %}
-       <ModifyResponse>{{open_banking.dcr.append_registration_attributes_in_response}}</ModifyResponse>
-       {% else %}
-       <ModifyResponse>false</ModifyResponse>
-       {% endif %}
-       {% if open_banking.dcr.scope is defined %}
-       <Scope>{{open_banking.dcr.scope}}</Scope>
-       {% else %}
-       <Scope>cdr-registration</Scope>
-       {% endif %}
-       {% if open_banking.dcr.registration_client_uri is defined %}
-       <RegistrationClientURI>{{open_banking.dcr.registration_client_uri}}</RegistrationClientURI>
-       {% else %}
-       <RegistrationClientURI>https://localhost:8243/open-banking/0.1/register/</RegistrationClientURI>
-       {% endif %}
-       <RegistrationRequestParams>
-            <SoftwareEnvironmentIdentification>
-                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_name is defined %}
-                    <PropertyName>{{open_banking.dcr.registration.software_environment_identification.ssa_property_name}}</PropertyName>
-                {% else %}
-                    <PropertyName>software_environment</PropertyName>
-                {% endif %}
-                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox is defined %}
-                    <PropertyValueForSandbox>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox}}</PropertyValueForSandbox>
-                {% else %}
-                    <PropertyValueForSandbox>sandbox</PropertyValueForSandbox>
-                {% endif %}
-                {% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production is defined %}
-                    <PropertyValueForProduction>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production}}</PropertyValueForProduction>
-                {% else %}
-                    <PropertyValueForProduction>production</PropertyValueForProduction>
-                {% endif %}
-            </SoftwareEnvironmentIdentification>
-            <GrantTypes>
-                {% if open_banking.dcr.registration.grant_types.required is defined %}
-                <Required>{{open_banking.dcr.registration.grant_types.required}}</Required>
-                {% else %}
-                <Required>true</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.grant_types.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.grant_types.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </GrantTypes>
-            <Issuer>
-                {% if open_banking.dcr.registration.issuer.required is defined %}
-                <Required>{{open_banking.dcr.registration.issuer.required}}</Required>
-                {% else %}
-                <Required>true</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.issuer.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.issuer.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </Issuer>
-            <Audience>
-                {% if open_banking.dcr.registration.audience.required is defined %}
-                <Required>{{open_banking.dcr.registration.audience.required}}</Required>
-                {% else %}
-                <Required>true</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.audience.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.audience.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </Audience>
-            <TokenEndPointAuthentication>
-                {% if open_banking.dcr.registration.token_endpoint_authentication.required is defined %}
-                <Required>{{open_banking.dcr.registration.token_endpoint_authentication.required}}</Required>
-                {% else %}
-                <Required>true</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.token_endpoint_authentication.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.token_endpoint_authentication.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </TokenEndPointAuthentication>
-            <IdTokenSignedResponseAlg>
-                {% if open_banking.dcr.registration.id_token_signed_response_alg.required is defined %}
-                <Required>{{open_banking.dcr.registration.id_token_signed_response_alg.required}}</Required>
-                {% else %}
-                <Required>true</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.id_token_signed_response_alg.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.id_token_signed_response_alg.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </IdTokenSignedResponseAlg>
-            <SoftwareStatement>
-                {% if open_banking.dcr.registration.software_statement.required is defined %}
-                <Required>{{open_banking.dcr.registration.software_statement.required}}</Required>
-                {% else %}
-                <Required>true</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.software_statement.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.software_statement.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </SoftwareStatement>
-            <ResponseTypes>
-                {% if open_banking.dcr.registration.response_types.required is defined %}
-                <Required>{{open_banking.dcr.registration.response_types.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.response_types.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.response_types.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </ResponseTypes>
-            <CallbackUris>
-                {% if open_banking.dcr.registration.callback_uris.required is defined %}
-                <Required>{{open_banking.dcr.registration.callback_uris.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.callback_uris.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.callback_uris.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </CallbackUris>
-            <TokenEndPointAuthSigningAlg>
-                {% if open_banking.dcr.registration.token_endpoint_auth_signing_alg.required is defined %}
-                <Required>{{open_banking.dcr.registration.token_endpoint_auth_signing_alg.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.token_endpoint_auth_signing_alg.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.token_endpoint_auth_signing_alg.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </TokenEndPointAuthSigningAlg>
-            <SoftwareId>
-                {% if open_banking.dcr.registration.software_id.required is defined %}
-                <Required>{{open_banking.dcr.registration.software_id.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.software_id.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.software_id.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </SoftwareId>
-            <Scope>
-                {% if open_banking.dcr.registration.scope.required is defined %}
-                <Required>{{open_banking.dcr.registration.scope.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.scope.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.scope.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </Scope>
-            <ApplicationType>
-                {% if open_banking.dcr.registration.application_type.required is defined %}
-                <Required>{{open_banking.dcr.registration.application_type.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.application_type.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.application_type.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </ApplicationType>
-            <IdTokenEncryptionResponseAlg>
-                {% if open_banking.dcr.registration.id_token_encryption_response_alg.required is defined %}
-                <Required>{{open_banking.dcr.registration.id_token_encryption_response_alg.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.id_token_encryption_response_alg.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.id_token_encryption_response_alg.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </IdTokenEncryptionResponseAlg>
-            <IdTokenEncryptionResponseEnc>
-                {% if open_banking.dcr.registration.id_token_encryption_response_enc.required is defined %}
-                <Required>{{open_banking.dcr.registration.id_token_encryption_response_enc.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.id_token_encryption_response_enc.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.id_token_encryption_response_enc.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </IdTokenEncryptionResponseEnc>
-            <RequestObjectSigningAlg>
-                {% if open_banking.dcr.registration.request_object_signing_algorithm.required is defined %}
-                <Required>{{open_banking.dcr.registration.request_object_signing_algorithm.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.request_object_signing_algorithm.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.request_object_signing_algorithm.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </RequestObjectSigningAlg>
-            <TLSClientAuthSubjectDn>
-                {% if open_banking.dcr.registration.tls_client_auth_subject_dn.required is defined %}
-                <Required>{{open_banking.dcr.registration.tls_client_auth_subject_dn.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.tls_client_auth_subject_dn.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.tls_client_auth_subject_dn.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </TLSClientAuthSubjectDn>
-            <BackchannelTokenDeliveryMode>
-                {% if open_banking.dcr.registration.backchannel_token_delivery_mode.required is defined %}
-                <Required>{{open_banking.dcr.registration.backchannel_token_delivery_mode.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.backchannel_token_delivery_mode.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.backchannel_token_delivery_mode.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </BackchannelTokenDeliveryMode>
-            <BackchannelAuthenticationRequestSigningAlg>
-                {% if open_banking.dcr.registration.backchannel_authentication_request_signing_alg.required is defined %}
-                <Required>{{open_banking.dcr.registration.backchannel_authentication_request_signing_alg.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.backchannel_authentication_request_signing_alg.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.backchannel_authentication_request_signing_alg.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </BackchannelAuthenticationRequestSigningAlg>
-            <BackchannelClientNotificationEndpoint>
-                {% if open_banking.dcr.registration.backchannel_client_notification_endpoint.required is defined %}
-                <Required>{{open_banking.dcr.registration.backchannel_client_notification_endpoint.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.backchannel_client_notification_endpoint.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.backchannel_client_notification_endpoint.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </BackchannelClientNotificationEndpoint>
-            <BackchannelUserCodeParameterSupported>
-                {% if open_banking.dcr.registration.backchannel_user_code_parameter_supported.required is defined %}
-                <Required>{{open_banking.dcr.registration.backchannel_user_code_parameter_supported.required}}</Required>
-                {% else %}
-                <Required>false</Required>
-                {% endif %}
-                {% if open_banking.dcr.registration.backchannel_user_code_parameter_supported.allowed_values is defined %}
-                <AllowedValues>
-                    {% for value in open_banking.dcr.registration.backchannel_user_code_parameter_supported.allowed_values %}
-                        <Value>{{value}}</Value>
-                    {% endfor %}
-                </AllowedValues>
-                {% endif %}
-            </BackchannelUserCodeParameterSupported>
-        </RegistrationRequestParams>
-    </DCR>
-    <SignatureValidation>
-        <AllowedAlgorithms>
-             {% if open_banking.signature_validation.allowed_algorithms is defined %}
-               {% for algorithm in open_banking.signature_validation.allowed_algorithms %}
-                  <Algorithm>{{algorithm.name}}</Algorithm>
-                {% endfor %}
+    </Consent>
+    <Identity>
+        <AuthenticationWebApp>
+            {% if financial_services.identity.authentication_webapp.servlet_extension is defined %}
+            <ServletExtension>
+                {{financial_services.identity.authentication_webapp.servlet_extension}}
+            </ServletExtension>
             {% else %}
-            <Algorithm>PS256</Algorithm>
-            <Algorithm>ES256</Algorithm>
+            <ServletExtension>
+                org..wso2.financial.services.accelerator.consent.extensions.authservlet.impl.OFSDefaultAuthServletImpl
+            </ServletExtension>
             {% endif %}
-        </AllowedAlgorithms>
-    </SignatureValidation>
-    <SCA>
-        <PrimaryAuthenticator>
-        {% if open_banking.sca.primaryauth.name is defined %}
-            <Name>{{open_banking.sca.primaryauth.name}}</Name>
-        {% else %}
-            <Name>BasicAuthenticator</Name>
-        {% endif %}
-        {% if open_banking.sca.primaryauth.display is defined %}
-            <DisplayName>{{open_banking.sca.primaryauth.display}}</DisplayName>
-        {% else %}
-            <DisplayName>basic</DisplayName>
-        {% endif %}
-        </PrimaryAuthenticator>
-        {% if open_banking.sca.idp.name is defined %}
-        <IdpName>{{open_banking.sca.idp.name}}</IdpName>
-        {% endif %}
-        {% if open_banking.sca.idp.step is defined %}
-        <IdpStep>{{open_banking.sca.idp.step}}</IdpStep>
-        {% endif %}
-    </SCA>
-    <ELKAnalytics>
-        {% if open_banking.analytics.elk is defined %}
-            <Enabled>{{open_banking.analytics.elk.enabled}}</Enabled>
-        {% else %}
-            <Enabled>false</Enabled>
-        {% endif %}
-    </ELKAnalytics>
-    <DataPublishing>
-    {% if open_banking.data_publishing.enable is defined %}
-        <Enabled>{{open_banking.data_publishing.enable}}</Enabled>
-    {% else %}
-        <Enabled>false</Enabled>
-    {% endif %}
-        <!-- Administrator username to login to the SI server for data publishing. -->
-    {% if open_banking.data_publishing.username is defined %}
-        <Username>{{open_banking.data_publishing.username}}</Username>
-    {% else %}
-        <Username>admin@wso2.com@carbon.super</Username>
-    {% endif %}
-        <!-- Administrator password to login to the SI server for data publishing. -->
-    {% if open_banking.data_publishing.password is defined %}
-        <Password>{{open_banking.data_publishing.password}}</Password>
-    {% else %}
-        <Password>wso2123</Password>
-    {% endif %}
-        <!-- Server URL of the remote SI server used to collect statistics. Must
-        be specified in {protocol://hostname:port/} format. -->
-    {% if open_banking.data_publishing.server_url is defined %}
-        <ServerURL>{{open_banking.data_publishing.server_url}}</ServerURL>
-    {% else %}
-        <ServerURL>{tcp://ANALYTICS_HOSTNAME:7612}</ServerURL>
-    {% endif %}
-    {% if open_banking.data_publishing.auth_url is defined %}
-        <AuthURL>{{open_banking.data_publishing.auth_url}}</AuthURL>
-    {% endif %}
-        <!-- Allowed values: Thrift -->
-    {% if open_banking.data_publishing.protocol is defined %}
-        <Protocol>{{open_banking.data_publishing.protocol}}</Protocol>
-    {% else %}
-        <Protocol>Thrift</Protocol>
-    {% endif %}
-    {% if open_banking.data_publishing.pool_size is defined %}
-        <PoolSize>{{open_banking.data_publishing.pool_size}}</PoolSize>
-    {% else %}
-        <PoolSize>10</PoolSize>
-    {% endif %}
-    {% if open_banking.data_publishing.queue_size is defined %}
-        <QueueSize>{{open_banking.data_publishing.queue_size}}</QueueSize>
-    {% else %}
-        <QueueSize>32768</QueueSize>
-    {% endif %}
-    {% if open_banking.data_publishing.worker_thread_count is defined %}
-        <WorkerThreadCount>{{open_banking.data_publishing.worker_thread_count}}</WorkerThreadCount>
-    {% else %}
-        <WorkerThreadCount>10</WorkerThreadCount>
-    {% endif %}
-    {% if open_banking.data_publishing.pool_wait_time_Ms is defined %}
-        <PoolWaitTimeMs>{{open_banking.data_publishing.pool_wait_time_Ms}}</PoolWaitTimeMs>
-    {% else %}
-        <PoolWaitTimeMs>60000</PoolWaitTimeMs>
-    {% endif %}
-
-    {% if open_banking.data_publishing.protocol == "Thrift" or open_banking.data_publishing.protocol is not defined%}
-        <Thrift>
-        {% if open_banking.data_publishing.thrift.publishing_timeout is defined %}
-            <PublishingTimeout>{{open_banking.data_publishing.thrift.publishing_timeout}}</PublishingTimeout>
+        </AuthenticationWebApp>
+        {% if financial_services.identity.consent_id_claim_name is defined %}
+        <ConsentIDClaimName>{{financial_services.identity.consent_id_claim_name}}</ConsentIDClaimName>
         {% else %}
-            <PublishingTimeout>2000</PublishingTimeout>
+        <ConsentIDClaimName>consent_id</ConsentIDClaimName>
         {% endif %}
-            <Streams>
-            {% for stream in open_banking.data_publishing.thrift.stream %}
-                <{{stream.name}}>
-                    {% for attribute in stream.attributes %}
-                        {% if attribute.required is defined %}
-                            {% set required = "{{attribute.required}}" %}
-                        {% else %}
-                            {% set required = "false" %}
-                        {% endif %}
-                        {% if attribute.type is defined %}
-                            {% set type = "{{attribute.type}}" %}
-                        {% else %}
-                            {% set type = "string" %}
-                        {% endif %}
-                    <Attribute name="{{attribute.name}}" priority="{{attribute.priority}}" required="{{required}}" type="{{type}}"/>
-                    {% endfor %}
-                </{{stream.name}}>
-            {% endfor %}
-            </Streams>
-        </Thrift>
-    {% endif %}
-        <!-- Configure authentication data publishing at toolkit level -->
-    {% if open_banking.data_publishing.auth_data_publisher is defined %}
-        <AuthDataPublisher>{{open_banking.data_publishing.auth_data_publisher}}</AuthDataPublisher>
-    {% else %}
-        <AuthDataPublisher>com.wso2.openbanking.accelerator.authentication.data.publisher.extension.DefaultAuthDataPublisher</AuthDataPublisher>
-    {% endif %}
-        <DisputeResolution>
-            {% if open_banking.data_publishing.dispute_resolution.enable is defined %}
-                <Enabled>{{open_banking.data_publishing.dispute_resolution.enable}}</Enabled>
+        <Extensions>
+            {% if financial_services.identity.extensions.request_object_validator is defined %}
+            <RequestObjectValidator>{{financial_services.identity.extensions.request_object_validator}}</RequestObjectValidator>
             {% else %}
-                <Enabled>false</Enabled>
+            <RequestObjectValidator>org..wso2.financial.services.accelerator.identity.auth.extensions.request.validator.OBRequestObjectValidator</RequestObjectValidator>
             {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.publishNonErrorDisputeResolutionData is defined %}
-                <PublishNonErrorDisputeResolutionData>{{open_banking.data_publishing.dispute_resolution.publishNonErrorDisputeResolutionData}}</PublishNonErrorDisputeResolutionData>
+            {% if financial_services.identity.extensions.response_type_handler is defined %}
+            <ResponseTypeHandler>{{financial_services.identity.extensions.response_type_handler}}</ResponseTypeHandler>
             {% else %}
-                <PublishNonErrorDisputeResolutionData>false</PublishNonErrorDisputeResolutionData>
+            <ResponseTypeHandler>org..wso2.financial.services.accelerator.identity.auth.extensions.response.handler.impl.OBDefaultResponseTypeHandlerImpl</ResponseTypeHandler>
             {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.maxRequestBodyLength is defined %}
-                <MaxRequestBodyLength>{{open_banking.data_publishing.dispute_resolution.maxRequestBodyLength}}</MaxRequestBodyLength>
+            {% if financial_services.identity.extensions.claim_provider is defined %}
+            <ClaimProvider>{{financial_services.identity.extensions.claim_provider}}</ClaimProvider>
             {% else %}
-                <MaxRequestBodyLength>4096</MaxRequestBodyLength>
+            <ClaimProvider>org..wso2.financial.services.accelerator.identity.claims.OBDefaultClaimProvider</ClaimProvider>
             {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.maxResponseBodyLength is defined %}
-                <MaxResponseBodyLength>{{open_banking.data_publishing.dispute_resolution.maxResponseBodyLength}}</MaxResponseBodyLength>
+        </Extensions>
+        <TokenSubject>
+            {% if financial_services.identity.token.remove_user_store_domain_from_subject is defined %}
+                 <RemoveUserStoreDomainFromSubject>{{financial_services.identity.token.remove_user_store_domain_from_subject}}</RemoveUserStoreDomainFromSubject>
             {% else %}
-                <MaxResponseBodyLength>4096</MaxResponseBodyLength>
+                 <RemoveUserStoreDomainFromSubject>false</RemoveUserStoreDomainFromSubject>
             {% endif %}
-            {% if open_banking.data_publishing.dispute_resolution.maxHeaderLength is defined %}
-                <MaxHeaderLength>{{open_banking.data_publishing.dispute_resolution.maxHeaderLength}}</MaxHeaderLength>
+            {% if financial_services.identity.token.remove_tenant_domain_from_subject is defined %}
+                 <RemoveTenantDomainFromSubject>{{financial_services.identity.token.remove_tenant_domain_from_subject}}</RemoveTenantDomainFromSubject>
             {% else %}
-                <MaxHeaderLength>2048</MaxHeaderLength>
+                 <RemoveTenantDomainFromSubject>false</RemoveTenantDomainFromSubject>
             {% endif %}
-        </DisputeResolution>
-    </DataPublishing>
+        </TokenSubject>
+    </Identity>
     <HTTPConnectionPool>
-        {% if open_banking.http_connection_pool.max_connections is defined %}
-        <MaxConnections>{{open_banking.http_connection_pool.max_connections}}</MaxConnections>
+        {% if financial_services.http_connection_pool.max_connections is defined %}
+        <MaxConnections>{{financial_services.http_connection_pool.max_connections}}</MaxConnections>
         {% endif %}
-        {% if open_banking.http_connection_pool.max_connections_per_route is defined %}
-        <MaxConnectionsPerRoute>{{open_banking.http_connection_pool.max_connections_per_route}}</MaxConnectionsPerRoute>
+        {% if financial_services.http_connection_pool.max_connections_per_route is defined %}
+        <MaxConnectionsPerRoute>{{financial_services.http_connection_pool.max_connections_per_route}}</MaxConnectionsPerRoute>
         {% endif %}
     </HTTPConnectionPool>
-    <PushAuthorisation>
-    {% if open_banking.push_authorisation.expiry_time is defined %}
-        <ExpiryTime>{{open_banking.push_authorisation.expiry_time}}</ExpiryTime>
-    {% else %}
-        <ExpiryTime>60</ExpiryTime>
-    {% endif %}
-    {% if open_banking.push_authorisation.request_uri_sub_string is defined %}
-        <RequestUriSubString>{{open_banking.push_authorisation.request_uri_sub_string}}</RequestUriSubString>
-    {% else %}
-        <RequestUriSubString>ietf:params:oauth:request_uri</RequestUriSubString>
-    {% endif %}
-    </PushAuthorisation>
-    <ServiceActivator>
-        <Subscribers>
-            {% for subscribers in open_banking.service_activator.subscribers %}
-            <Subscriber>{{subscribers.subscriber}}</Subscriber>
-            {% endfor %}
-        </Subscribers>
-    </ServiceActivator>
-    <Event>
-    {% if open_banking.event.queue_size is defined %}
-        <QueueSize>{{open_banking.event.queue_size}}</QueueSize>
-    {% else %}
-        <QueueSize>32768</QueueSize>
-    {% endif %}
-    {% if open_banking.event.worker_thread_count is defined %}
-        <WorkerThreadCount>{{open_banking.event.worker_thread_count}}</WorkerThreadCount>
-    {% else %}
-        <WorkerThreadCount>10</WorkerThreadCount>
-    {% endif %}
-        <EventExecutors>
-	{% if open_banking.event.event_executors is defined %}
-            {% for executor in open_banking.event.event_executors %}
-                   <Executor class="{{executor.name}}" priority="{{executor.priority}}"/>
-            {% endfor %}
- 	{% else %}
-            {% if open_banking.event.event_executor is defined %}
-                <Executor class="{{open_banking.event.event_executor}}"/>
-            {% else %}
-                <Executor class="com.wso2.openbanking.accelerator.common.event.executor.DefaultOBEventExecutor"/>
-            {% endif %}
- 	{% endif %}
-        </EventExecutors>
-    </Event>
-    <OBEventNotifications>
-        {% if open_banking.event.notifications.token_issuer is defined %}
-            <TokenIssuer>{{open_banking.event.notifications.token_issuer}}</TokenIssuer>
-        {% else %}
-            <TokenIssuer>www.wso2.com</TokenIssuer>
-        {% endif %}
-        {% if open_banking.event.notifications.number_of_sets_to_return %}
-            <NumberOfSetsToReturn>{{open_banking.event.notifications.number_of_sets_to_return}}</NumberOfSetsToReturn>
-        {% else %}
-             <NumberOfSetsToReturn>5</NumberOfSetsToReturn>
-        {% endif %}
-        {% if open_banking.event.notifications.event_creation_handler is defined %}
-            <EventCreationHandler>{{open_banking.event.notifications.event_creation_handler}}</EventCreationHandler>
-        {% else %}
-            <EventCreationHandler>com.wso2.openbanking.accelerator.event.notifications.service.handler.DefaultEventCreationServiceHandler</EventCreationHandler>
-        {% endif %}
-        {% if open_banking.event.notifications.event_polling_handler is defined %}
-            <EventPollingHandler>{{open_banking.event.notifications.event_polling_handler}}</EventPollingHandler>
-        {% else %}
-            <EventPollingHandler>com.wso2.openbanking.accelerator.event.notifications.service.handler.DefaultEventPollingServiceHandler</EventPollingHandler>
-        {% endif %}
-        {% if open_banking.event.notifications.event_subscription_handler is defined %}
-            <EventSubscriptionHandler>{{open_banking.event.notifications.event_subscription_handler}}</EventSubscriptionHandler>
-        {% else %}
-            <EventSubscriptionHandler>com.wso2.openbanking.accelerator.event.notifications.service.handler.DefaultEventSubscriptionServiceHandler</EventSubscriptionHandler>
-        {% endif %}
-         {% if open_banking.event.notifications.event_notification_generator is defined %}
-            <NotificationGenerator>{{open_banking.event.notifications.event_notification_generator}}</NotificationGenerator>
-        {% else %}
-            <NotificationGenerator>com.wso2.openbanking.accelerator.event.notifications.service.service.DefaultEventNotificationGenerator</NotificationGenerator>
-        {% endif %}
-        {% if open_banking.event.notifications.event_subscription_handler is defined %}
-                    <EventSubscriptionHandler>{{open_banking.event.notifications.event_subscription_handler}}</EventSubscriptionHandler>
-        {% else %}
-            <EventSubscriptionHandler>com.wso2.openbanking.accelerator.event.notifications.service.handler.DefaultEventSubscriptionServiceHandler</EventSubscriptionHandler>
-        {% endif %}
-            <PollingResponseParams>
-            {% if open_banking.event.notifications.set_sub_claim_included is defined%}
-                <IsSubClaimAvailable>{{open_banking.event.notifications.set_sub_claim_included}}</IsSubClaimAvailable>
-            {% else %}
-                <IsSubClaimAvailable>true</IsSubClaimAvailable>
-            {% endif %}
-            {% if open_banking.event.notifications.set_txn_claim_included is defined %}
-                <IsTxnClaimAvailable>{{open_banking.event.notifications.set_txn_claim_included}}</IsTxnClaimAvailable>
-            {% else %}
-                <IsTxnClaimAvailable>true</IsTxnClaimAvailable>
-            {% endif %}
-            {% if open_banking.event.notifications.set_toe_cliam_included is defined %}
-                <IsToeClaimAvailable>{{open_banking.event.notifications.set_toe_cliam_included}}</IsToeClaimAvailable>
-            {% else %}
-                <IsToeClaimAvailable>true</IsToeClaimAvailable>
-            {% endif %}
-            </PollingResponseParams>
-    </OBEventNotifications>
-    <AuthenticationWorkers>
-        {% for worker in open_banking.identity.authentication.worker %}
-             <AuthenticationWorker
-                class="{{worker.class}}"
-                name="{{worker.name}}"
-             />
-        {% endfor %}
-    </AuthenticationWorkers>
-    <RealtimeEventNotification>
-        {% if open_banking.event.notifications.realtime.enable is defined %}
-            <Enable>{{open_banking.event.notifications.realtime.enable}}</Enable>
-        {% else %}
-            <Enable>false</Enable>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.periodic_cron_expression is defined %}
-            <PeriodicCronExpression>{{open_banking.event.notifications.realtime.periodic_cron_expression}}</PeriodicCronExpression>
-        {% else %}
-            <PeriodicCronExpression>0 0/1 0 ? * * *</PeriodicCronExpression>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.request_timeout is defined %}
-            <TimeoutInSeconds>{{open_banking.event.notifications.realtime.request_timeout}}</TimeoutInSeconds>
-        {% else %}
-            <TimeoutInSeconds>60</TimeoutInSeconds>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.maximum_retry_count is defined %}
-            <MaxRetries>{{open_banking.event.notifications.realtime.maximum_retry_count}}</MaxRetries>
-        {% else %}
-            <MaxRetries>5</MaxRetries>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.initial_retry_waiting_time is defined %}
-            <InitialBackoffTimeInSeconds>{{open_banking.event.notifications.realtime.initial_retry_waiting_time}}</InitialBackoffTimeInSeconds>
-        {% else %}
-            <InitialBackoffTimeInSeconds>60</InitialBackoffTimeInSeconds>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.retry_function is defined %}
-            <BackoffFunction>{{open_banking.event.notifications.realtime.retry_function}}</BackoffFunction>
-        {% else %}
-            <BackoffFunction>EX</BackoffFunction>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.circuit_breaker_open_timeout is defined %}
-            <CircuitBreakerOpenTimeoutInSeconds>{{open_banking.event.notifications.realtime.circuit_breaker_open_timeout}}</CircuitBreakerOpenTimeoutInSeconds>
-        {% else %}
-            <CircuitBreakerOpenTimeoutInSeconds>600</CircuitBreakerOpenTimeoutInSeconds>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.thread_pool_size is defined %}
-            <EventNotificationThreadPoolSize>{{open_banking.event.notifications.realtime.thread_pool_size}}</EventNotificationThreadPoolSize>
-        {% else %}
-            <EventNotificationThreadPoolSize>20</EventNotificationThreadPoolSize>
-        {% endif %}
-        {% if open_banking.event.notifications.realtime.event_notification_request_generator is defined %}
-            <RequestGenerator>{{open_banking.event.notifications.realtime.event_notification_request_generator}}</RequestGenerator>
-        {% else %}
-            <RequestGenerator>com.wso2.openbanking.accelerator.event.notifications.service.realtime.service.DefaultRealtimeEventNotificationRequestGenerator</RequestGenerator>
-        {% endif %}
-    </RealtimeEventNotification>
-     <PSUFederatedAuthentication>
-            {% if open_banking.psu_federated_auth.enabled %}
-            <Enabled>{{open_banking.psu_federated_auth.enabled}}</Enabled>
-            {% else %}
-            <Enabled>false</Enabled>
-            {% endif %}
-            {% if open_banking.psu_federated_auth.idp_name is defined %}
-            <IDPName>{{open_banking.psu_federated_auth.idp_name}}</IDPName>
-            {% else %}
-            <IDPName></IDPName>
-            {% endif %}
-        </PSUFederatedAuthentication>
 </Server>
diff --git a/financial-services-accelerator/accelerators/fs-is/pom.xml b/financial-services-accelerator/accelerators/fs-is/pom.xml
index 6cd187c9..b8fc7dc6 100644
--- a/financial-services-accelerator/accelerators/fs-is/pom.xml
+++ b/financial-services-accelerator/accelerators/fs-is/pom.xml
@@ -29,17 +29,17 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wso2-financial-services-iam-accelerator</artifactId>
+    <artifactId>wso2-fsiam-accelerator</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Financial Services - Identity Server Accelerator Module</name>
     <url>http://wso2.org</url>
 
-
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${maven.clean.plugin.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -54,19 +54,10 @@
                             <directory>${project.basedir}/carbon-home/repository/components/dropins</directory>
                             <excludes>
                                 <exclude>**/classmate-1.5.1.jar</exclude>
-                                <exclude>**/org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt-2.3.9.jar</exclude>
-                                <exclude>**/quartz_2.1.1.wso2v1.jar</exclude>
-                                <exclude>**/org.wso2.carbon.identity.application.authenticator.push-0.1.1.jar</exclude>
-                                <exclude>**/org.wso2.carbon.identity.application.authenticator.push.common-0.1.1.jar</exclude>
-                                <exclude>**/org.wso2.carbon.identity.application.authenticator.push.device.handler-0.1.1.jar</exclude>
                             </excludes>
                         </fileset>
                         <fileset>
                             <directory>${project.basedir}/carbon-home/repository/deployment/server/webapps/api/WEB-INF/lib</directory>
-                            <excludes>
-                                <exclude>**/org.wso2.carbon.identity.api.user.push.device.common-0.1.1.jar</exclude>
-                                <exclude>**/org.wso2.carbon.identity.api.user.push.device.handler.v1-0.1.1.jar</exclude>
-                            </excludes>
                         </fileset>
                     </filesets>
                 </configuration>
@@ -83,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>${maven.antrun.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>create-solution</id>
@@ -93,9 +84,9 @@
                                 <!-- Copying jars to dropins -->
                                 <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
                                     <fileset
-                                            dir="../../components/org.wso2.financial.services.accelerator.identity/target">
+                                            dir="../../components/org.wso2.financial.services.accelerator.identity.extensions/target">
                                         <filename
-                                                regex="org.wso2.financial.services.accelerator.identity-(\d.*?)\.jar$"/>
+                                                regex="org.wso2.financial.services.accelerator.identity.extensions-(\d.*?)\.jar$"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
@@ -107,85 +98,30 @@
                                 </copy>
                                 <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
                                     <fileset
-                                            dir="../../components/consent-management/org.wso2.financial.services.accelerator.consent.mgt.service/target">
+                                            dir="../../components/org.wso2.financial.services.accelerator.consent.mgt.service/target">
                                         <filename
                                                 regex="org.wso2.financial.services.accelerator.consent.service-(\d.*?)\.jar$"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
                                     <fileset
-                                            dir="../../components/consent-management/org.wso2.financial.services.accelerator.consent.extensions/target">
+                                            dir="../../components/org.wso2.financial.services.accelerator.consent.mgt.extensions/target">
                                         <filename
-                                                regex="org.wso2.financial.services.accelerator.consent.extensions-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/components/lib" overwrite="true">
-                                    <fileset
-                                            dir="../../components/consent-management/org.wso2.financial.services.accelerator.consent.mgt.dao/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.consent.dao-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/components/lib" overwrite="true">
-                                    <fileset
-                                            dir="../../components/ob-throttler/org.wso2.financial.services.accelerator.throttler.dao/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.throttler.dao-(\d.*?)\.jar$"/>
+                                                regex="org.wso2.financial.services.accelerator.consent.mgt.extensions-(\d.*?)\.jar$"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
                                     <fileset
-                                            dir="../../components/ob-throttler/org.wso2.financial.services.accelerator.throttler.service/target">
+                                            dir="../../components/org.wso2.financial.services.accelerator.consent.mgt.dao/target">
                                         <filename
-                                                regex="org.wso2.financial.services.accelerator.throttler.service-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
-                                    <fileset
-                                            dir="../../components/org.wso2.financial.services.accelerator.data.publisher/org.wso2.financial.services.accelerator.data.publisher.common/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.data.publisher.common-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
-                                    <fileset
-                                            dir="../../components/org.wso2.financial.services.accelerator.data.publisher/org.wso2.financial.services.accelerator.authentication.data.publisher/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.authentication.data.publisher-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
-                                <!-- Copying jars to carbon-home/lib -->
-                                <copy todir="${project.basedir}/carbon-home/lib/runtimes/cxf3" overwrite="true">
-                                    <fileset
-                                            dir="../../components/org.wso2.financial.services.accelerator.runtime/org.wso2.financial.services.accelerator.runtime.identity.authn.filter/target">
-                                        <filename
-                                                regex="org.wso2.financial.services.accelerator.runtime.identity.authn.filter-(\d.*?)\.jar$"/>
+                                                regex="org.wso2.financial.services.accelerator.consent.dao-(\d.*?)\.jar$"/>
                                     </fileset>
                                 </copy>
 
-                                <unzip src="../../internal-apis/internal-webapps/org.wso2.financial.services.accelerator.consent.endpoint/target/api#financialservices#consent.war"
-                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/api#financialservices#consent/"/>
-                                <unzip src="../../internal-apis/internal-webapps/org.wso2.financial.services.accelerator.dcr.endpoint/target/api#financialservices#dynamic-client-registration.war"
-                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/api#financialservices#dynamic-client-registration/"/>
-                                <unzip src="../../internal-apis/internal-webapps/org.wso2.financial.services.authentication.webapp/target/ob#authenticationendpoint.war"
-                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/ob#authenticationendpoint/"/>
-                                <unzip src="../../internal-apis/internal-webapps/org.wso2.financial.services.accelerator.application.info.endpoint/target/api#financialservices#application.war"
-                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/api#financialservices#application/"/>
-                                <unzip src="../../../react-apps/self-care-portal/target/consentmgr.war"
-                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/consentmgr/"/>
-                                <unzip src="../../internal-apis/internal-webapps/org.wso2.financial.services.accelerator.push.authorization.endpoint/target/api#financialservices#push-authorization.war"
-                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/api#financialservices#push-authorization/"/>
-
-                                <copy todir="${project.basedir}/repository/resources/internal-apis/" overwrite="true">
-                                    <fileset dir="../../internal-apis/internal-swaggers">
-                                        <filename regex="\.*.yaml$"/>
-                                    </fileset>
-                                </copy>
-                                <copy overwrite="true" todir="${project.basedir}/carbon-home/repository/components/dropins">
-                                    <fileset dir="../../components/org.wso2.financial.services.accelerator.service.activator/target">
-                                        <filename regex="org.wso2.financial.services.accelerator.service.activator-(\d.*?)\.jar$"/>
-                                    </fileset>
-                                </copy>
+                                <unzip src="../../internal-webapps/org.wso2.financial.services.accelerator.consent.mgt.endpoint/target/api#fs#consent.war"
+                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/api#fs#consent/"/>
+                                <unzip src="../../internal-webapps/org.wso2.financial.services.accelerator.authentication.endpoint/target/fs#authenticationendpoint.war"
+                                       dest="${project.basedir}/carbon-home/repository/deployment/server/webapps/fs#authenticationendpoint/"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/financial-services-accelerator/accelerators/fs-is/repository/conf/configure.properties b/financial-services-accelerator/accelerators/fs-is/repository/conf/configure.properties
index 52bd4ac5..642dad63 100644
--- a/financial-services-accelerator/accelerators/fs-is/repository/conf/configure.properties
+++ b/financial-services-accelerator/accelerators/fs-is/repository/conf/configure.properties
@@ -33,12 +33,10 @@ DB_PASS=root
 DB_HOST=localhost
 DB_DRIVER=com.mysql.jdbc.Driver
 
-DB_APIMGT=openbank_apimgtdb
-DB_USER_STORE=openbank_userdb
-DB_AM_CONFIG=openbank_am_configdb
-DB_GOV=openbank_govdb
-DB_IS_CONFIG=openbank_iskm_configdb
-DB_OPEN_BANKING_STORE=openbank_openbankingdb
-DB_OB_REPORTING=openbank_ob_reporting_statsdb
-DB_OB_REPORTING_SUMMARIZED=openbank_ob_reporting_summarizeddb
+DB_APIMGT=fs_apimgtdb
+DB_USER_STORE=fs_userdb
+DB_AM_CONFIG=fs_am_configdb
+DB_GOV=fs_govdb
+DB_IS_CONFIG=fs_iskm_configdb
+DB_FS_STORE=fs_consentdb
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
index adabd8dc..0f3504f2 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/config/FinancialServicesConfigParser.java
@@ -475,13 +475,13 @@ public String getAuthServletExtension() {
     public String getJWKSConnectionTimeOut() {
 
         Optional<String> source = getConfigurationFromKeyAsString(
-                FinancialServicesConstants.DCR_JWKS_CONNECTION_TIMEOUT);
+                FinancialServicesConstants.JWKS_CONNECTION_TIMEOUT);
         return source.map(String::trim).orElse("3000");
     }
 
     public String getJWKSReadTimeOut() {
 
-        Optional<String> source = getConfigurationFromKeyAsString(FinancialServicesConstants.DCR_JWKS_READ_TIMEOUT);
+        Optional<String> source = getConfigurationFromKeyAsString(FinancialServicesConstants.JWKS_READ_TIMEOUT);
         return source.map(String::trim).orElse("3000");
     }
 
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
index 81c24d7f..ccc7707d 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/main/java/org/wso2/financial/services/accelerator/common/constant/FinancialServicesConstants.java
@@ -32,8 +32,8 @@ public class FinancialServicesConstants {
     public static final String DCR_CONFIG_TAG = "DCR";
     public static final String COMMON_IDENTITY_CACHE_ACCESS_EXPIRY = "Common.Identity.Cache.CacheAccessExpiry";
     public static final String COMMON_IDENTITY_CACHE_MODIFY_EXPIRY = "Common.Identity.Cache.CacheModifiedExpiry";
-    public static final String DCR_JWKS_CONNECTION_TIMEOUT = "DCR.JWKS-Retriever.ConnectionTimeout";
-    public static final String DCR_JWKS_READ_TIMEOUT = "DCR.JWKS-Retriever.ReadTimeout";
+    public static final String JWKS_CONNECTION_TIMEOUT = "JWKS-Retriever.ConnectionTimeout";
+    public static final String JWKS_READ_TIMEOUT = "JWKS-Retriever.ReadTimeout";
     public static final String DCR_SOFTWARE_ENV_IDENTIFICATION_PROPERTY_NAME =
             "DCR.RegistrationRequestParams.SoftwareEnvironmentIdentification.PropertyName";
     public static final String DCR_SOFTWARE_ENV_IDENTIFICATION_VALUE_FOR_SANDBOX =
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/test/java/org/wso2/financial/services/accelerator/common/test/FSConfigParserTests.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/test/java/org/wso2/financial/services/accelerator/common/test/FSConfigParserTests.java
index 964aa37b..1f4cc70d 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/test/java/org/wso2/financial/services/accelerator/common/test/FSConfigParserTests.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.common/src/test/java/org/wso2/financial/services/accelerator/common/test/FSConfigParserTests.java
@@ -141,7 +141,7 @@ public void testGetJWKSConnectionTimeout() {
         String connectionTimeOut = FinancialServicesConfigParser.getInstance()
                 .getJWKSConnectionTimeOut();
 
-        Assert.assertEquals(connectionTimeOut, "1000");
+        Assert.assertEquals(connectionTimeOut, "3000");
     }
 
     @Test(priority = 13)
diff --git a/pom.xml b/pom.xml
index 41d64619..9b0ef11f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,6 +560,8 @@
         <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
         <maven.spotbugsplugin.version>4.8.2.0</maven.spotbugsplugin.version>
         <com.h3xstream.findsecbugs.version>1.12.0</com.h3xstream.findsecbugs.version>
+        <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
+        <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
         <!--Third Party Dependencies-->
         <commons.logging.version>1.2</commons.logging.version>
         <commons-lang3.version>3.4</commons-lang3.version>