diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
index b4f33cdc947..6c9d171edb5 100644
--- a/modules/api-resources/api-resources-full/pom.xml
+++ b/modules/api-resources/api-resources-full/pom.xml
@@ -23,12 +23,12 @@
org.wso2.is
api-resources
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
api-resources-full
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
war
WSO2 Identity Server - All Rest API
diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
index 60eadcd4c58..62aa93f0515 100644
--- a/modules/api-resources/pom.xml
+++ b/modules/api-resources/pom.xml
@@ -23,12 +23,12 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
api-resources
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
pom
WSO2 Identity Server - Rest API
diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
index 92a58d7c3bd..43b1f5c2af5 100644
--- a/modules/authenticators/pom.xml
+++ b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml
index d5604580868..94b8386ba42 100644
--- a/modules/callhome/pom.xml
+++ b/modules/callhome/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
index 9f23a3275dc..6bfa1526dff 100644
--- a/modules/connectors/pom.xml
+++ b/modules/connectors/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index d04b456ed81..ad6a1f1c8d8 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml
index d3e53d8db81..4d16278ad4f 100644
--- a/modules/distribution/src/repository/resources/conf/deployment.toml
+++ b/modules/distribution/src/repository/resources/conf/deployment.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
index b2dc4653433..3b6289681c0 100644
--- a/modules/features/org.wso2.identity.styles.feature/pom.xml
+++ b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -20,7 +20,7 @@
org.wso2.is
identity-features
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
index dc3ffb90f8d..03af2a58255 100644
--- a/modules/features/org.wso2.identity.ui.feature/pom.xml
+++ b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -20,7 +20,7 @@
org.wso2.is
identity-features
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
index 8353eb964e0..0efa46f2559 100644
--- a/modules/features/org.wso2.identity.utils.feature/pom.xml
+++ b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -20,7 +20,7 @@
org.wso2.is
identity-features
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 1c8f90dd252..15d39383dc5 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -17,7 +17,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index d77e8c2c1f5..54c794dfbfc 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index 6317b159d21..d351be61311 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml
index 2a89d48248c..a5d781434b3 100644
--- a/modules/integration/tests-common/extensions/pom.xml
+++ b/modules/integration/tests-common/extensions/pom.xml
@@ -22,7 +22,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 694bd7ea1e4..d121e9a61c7 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 17d3b08cadd..423a73d706d 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index 97f7d5dd9c3..4f8e1dc0bb4 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 69da5c97df5..0f071b20b8d 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
index 47f7c4bf147..2d479e2c1c6 100644
--- a/modules/integration/tests-integration/tests-backend/pom.xml
+++ b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -18,7 +18,7 @@
org.wso2.is
identity-integration-tests
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
index bbeab44b1f3..f6b3ad134b5 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
index e63705aabea..013fdbda27c 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
index 229c523d043..85ef7af3bc1 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
index c8a598e7df3..85b8bd3ef43 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
index b7ed6b335c2..77d325f5126 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
@@ -4,10 +4,6 @@ node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
disable_addressing = true
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
index f072993a4fc..95d6f563413 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
index 287618bae27..5e721775096 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
@@ -4,10 +4,6 @@ node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
offset = "410"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
index 0fa0fdb3e56..5beb46bf566 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
index 3b154788273..62f1a79b668 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
index b75b328d816..04d0aad2a75 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
index 63b9d786251..a7a3c8337d0 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
index a38cb137a6e..4e7a8eee2a0 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
index 69a84406b0f..cc92fc48874 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
index a17f0a3b1e6..4260c454dfb 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
index e63b264b2a6..5e32413e0be 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
index 39fc435417b..e289772eb65 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
index 8423ab01ff5..45d89179c3e 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
index 1be46f257af..282f9b60f22 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
index fe03bf051b4..8f1c1394259 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
index 77a10b0bf70..ab7cf7b682f 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
index ad060afd047..0aea90dcc5e 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml
index f053d6bff62..14faad863d3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
index 8fa2357f1fe..845fd25aa80 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
index a2776654e8a..1bdebb7f357 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
index a9b79315063..7a33ab8fa53 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
index 97be4fe10bd..001f3b1e880 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
index 394763abc18..e4fd0c3a499 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
index 508ee29c739..f695d98af85 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml
index 94876121388..b4c36cde0d8 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml
index 0b704f610d7..67c09884b6e 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
index d2fb5ef50bd..961caacb042 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
node_ip = "127.0.0.1"
base_path = "https://$ref{server.hostname}:${carbon.management.port}"
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
[super_admin]
username = "admin"
password = "admin"
diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml
index 26cc21f13d0..c439696d903 100644
--- a/modules/local-authenticators/pom.xml
+++ b/modules/local-authenticators/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml
index 5d0bf3b19a4..828be835db1 100644
--- a/modules/oauth2-grant-types/pom.xml
+++ b/modules/oauth2-grant-types/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index a544c16ea59..3b7a486369a 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml
index 2585b6f42d3..39894f69f4c 100644
--- a/modules/provisioning-connectors/pom.xml
+++ b/modules/provisioning-connectors/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml
index 8702ccba81c..9451c31ea6b 100644
--- a/modules/social-authenticators/pom.xml
+++ b/modules/social-authenticators/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index a766ebdc295..cb1bd32e828 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -20,7 +20,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index a4f477bb0fe..e60394697a2 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -20,7 +20,7 @@
org.wso2.is
identity-server-styles-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/tests-utils/admin-services/pom.xml b/modules/tests-utils/admin-services/pom.xml
index 66c28bb6491..74fdfcc36f1 100644
--- a/modules/tests-utils/admin-services/pom.xml
+++ b/modules/tests-utils/admin-services/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-integration-tests-utils
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/tests-utils/admin-stubs/pom.xml b/modules/tests-utils/admin-stubs/pom.xml
index 29c02b2dfde..0ad598e5d37 100644
--- a/modules/tests-utils/admin-stubs/pom.xml
+++ b/modules/tests-utils/admin-stubs/pom.xml
@@ -21,7 +21,7 @@
org.wso2.is
identity-integration-tests-utils
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../pom.xml
diff --git a/modules/tests-utils/pom.xml b/modules/tests-utils/pom.xml
index e2347883afc..15128b36bd9 100644
--- a/modules/tests-utils/pom.xml
+++ b/modules/tests-utils/pom.xml
@@ -19,7 +19,7 @@
org.wso2.is
identity-server-parent
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
../../pom.xml
diff --git a/pom.xml b/pom.xml
index 5c9d12460a5..c8ef1f86d48 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
identity-server-parent
pom
WSO2 Identity Server
- 7.0.0-m4-SNAPSHOT
+ 7.0.0-alpha-SNAPSHOT
WSO2 Identity Server
http://wso2.org/projects/identity
@@ -2298,7 +2298,7 @@
- 5.25.444
+ 5.25.446
[5.14.67, 6.0.0]
@@ -2324,7 +2324,7 @@
5.9.5
5.10.17
5.7.4
- 3.4.34
+ 3.4.36
5.6.0
@@ -2346,7 +2346,7 @@
1.8.13
- 1.7.21
+ 1.7.23
@@ -2429,7 +2429,7 @@
1.2.36
- 2.2.3
+ 2.3.0
2.1.9
2.0.26
1.6.373