diff --git a/financial-services-accelerator/accelerators/fs-apim/repository/resources/wso2am-4.4.0-deployment.toml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/wso2am-4.4.0-deployment.toml
index efbc1821..b5a71bde 100755
--- a/financial-services-accelerator/accelerators/fs-apim/repository/resources/wso2am-4.4.0-deployment.toml
+++ b/financial-services-accelerator/accelerators/fs-apim/repository/resources/wso2am-4.4.0-deployment.toml
@@ -201,6 +201,7 @@ enable_lightweight_apikey_generation = true
 #key_validation_handler_type = "default"
 #key_validation_handler_type = "custom"
 #key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler"
+allow_subscription_validation_disabling = false
 
 #[apim.idp]
 #server_url = "https://localhost:${mgt.transport.https.port}"
@@ -222,7 +223,7 @@ enable_lightweight_apikey_generation = true
 
 [apim.oauth_config]
 enable_outbound_auth_header = false
-white_listed_scopes = ["^device_.*", "openid", "^OB_.*", "^TIME_.*"]
+white_listed_scopes = ["^device_.*", "openid", "^FS_.*", "^TIME_.*"]
 #auth_header = "Authorization"
 #revoke_endpoint = "https://localhost:${https.nio.port}/revoke"
 #enable_token_encryption = false
diff --git a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
index f4bfc0d7..3a32af90 100644
--- a/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
+++ b/financial-services-accelerator/accelerators/fs-is/repository/resources/wso2is-7.0.0-deployment.toml
@@ -7,6 +7,9 @@ mode = "single"
 userAgent = "WSO2 IS as KM 7.0.0"
 offset = 3
 
+[tenant_mgt]
+enable_email_domain = true
+
 #================configs related to user-mgt.xml=============
 [super_admin]
 username = "admin@wso2.com"
@@ -130,7 +133,7 @@ pool_options.validationQuery="SELECT 1"
 #validationQuery="SELECT 1 FROM DUAL"
 pool_options.validationInterval="30000"
 pool_options.defaultAutoCommit=false
-pool_options.commitOnReturn=truecommitOnReturn=true
+pool_options.commitOnReturn=true
 
 [keystore.primary]
 file_name = "wso2carbon.jks"