diff --git a/v2/mfa/backend-setup.mdx b/v2/mfa/backend-setup.mdx
index 6627a7b39..9ed5abb5c 100644
--- a/v2/mfa/backend-setup.mdx
+++ b/v2/mfa/backend-setup.mdx
@@ -208,14 +208,14 @@ Coming soon. In the meantime, checkout the [legacy method](./legacy-method/how-i
 
 <TabItem value="curl">
 
-<CoreInjector defaultValue="http://localhost:3567" showAppId={false}>
+<CoreInjector defaultValue="http://localhost:3567" showAppId={true} showTenantId={false}>
 
 <CoreVersionSubTabs>
 
 <TabItem value="core-9.1">
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant/v2' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant/v2' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
@@ -229,7 +229,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>
 <TabItem value="core-9.0">
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
@@ -245,7 +245,6 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>
 </CoreVersionSubTabs>
 
 
-
 </CoreInjector>
 
 </TabItem>
@@ -606,14 +605,14 @@ Coming soon. In the meantime, checkout the [legacy method](./legacy-method/how-i
 
 <TabItem value="curl">
 
-<CoreInjector defaultValue="http://localhost:3567" showAppId={false}>
+<CoreInjector defaultValue="http://localhost:3567" showAppId={true} showTenantId={false}>
 
 <CoreVersionSubTabs>
 
 <TabItem value="core-9.1">
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant/v2' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant/v2' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
@@ -628,7 +627,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>
 <TabItem value="core-9.0">
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
diff --git a/v2/mfa/email-sms-otp/otp-for-all-users.mdx b/v2/mfa/email-sms-otp/otp-for-all-users.mdx
index 3d3f212ed..f6a039f19 100644
--- a/v2/mfa/email-sms-otp/otp-for-all-users.mdx
+++ b/v2/mfa/email-sms-otp/otp-for-all-users.mdx
@@ -562,10 +562,10 @@ Coming soon. In the meantime, checkout the [legacy method](../legacy-method/how-
 
 <TabItem value="curl">
 
-<CoreInjector defaultValue="http://localhost:3567" showAppId={false}>
+<CoreInjector defaultValue="http://localhost:3567" showAppId={true} showTenantId={false}>
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant/v2' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant/v2' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
diff --git a/v2/mfa/totp/totp-for-all-users.mdx b/v2/mfa/totp/totp-for-all-users.mdx
index 6d7636e05..a539e28da 100644
--- a/v2/mfa/totp/totp-for-all-users.mdx
+++ b/v2/mfa/totp/totp-for-all-users.mdx
@@ -858,10 +858,10 @@ Coming soon.
 
 <TabItem value="curl">
 
-<CoreInjector defaultValue="http://localhost:3567" showAppId={false}>
+<CoreInjector defaultValue="http://localhost:3567" showAppId={true} showTenantId={false}>
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant/v2' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant/v2' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
diff --git a/v2/multitenancy/new-tenant.mdx b/v2/multitenancy/new-tenant.mdx
index 3af5dbd30..635848a35 100644
--- a/v2/multitenancy/new-tenant.mdx
+++ b/v2/multitenancy/new-tenant.mdx
@@ -139,14 +139,14 @@ else:
 
 <TabItem value="curl">
 
-<CoreInjector defaultValue="http://localhost:3567" showAppId={false}>
+<CoreInjector defaultValue="http://localhost:3567" showAppId={true} showTenantId={false}>
 
 <CoreVersionSubTabs>
 
 <TabItem value="core-9.1">
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant/v2' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant/v2' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
@@ -173,7 +173,7 @@ The built-in Factor IDs that can be used for `firstFactors` are:
 <TabItem value="core-9.0">
 
 ```bash
-curl --location --request PUT '^{coreInjector_uri_without_quotes}/appid-<APP_ID>/recipe/multitenancy/tenant' \
+curl --location --request PUT '^{coreInjector_uri_without_quotes}/recipe/multitenancy/tenant' \
 --header 'api-key: ^{coreInjector_api_key_without_quotes}' \
 --header 'Content-Type: application/json' \
 --data-raw '{
diff --git a/v2/thirdparty/common-customizations/multi-tenancy/custom-provider.mdx b/v2/thirdparty/common-customizations/multi-tenancy/custom-provider.mdx
index 15d5c1292..fda542afe 100644
--- a/v2/thirdparty/common-customizations/multi-tenancy/custom-provider.mdx
+++ b/v2/thirdparty/common-customizations/multi-tenancy/custom-provider.mdx
@@ -238,7 +238,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         "clients": [{
             "clientId": "...",
             "clientSecret": "...",
-            "scope": ["email", "profile"],
+            "scope": ["email", "profile"]
         }],
         "authorizationEndpoint": "https://example.com/oauth/authorize",
         "authorizationEndpointQueryParams": {
@@ -247,7 +247,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         },
         "tokenEndpoint": "https://example.com/oauth/token",
         "tokenEndpointBodyParams": {
-            "someKey1": "value1",
+            "someKey1": "value1"
         },
         "userInfoEndpoint": "https://example.com/oauth/userinfo",
         "userInfoMap": {
@@ -459,7 +459,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         "clients": [{
             "clientId": "...",
             "clientSecret": "...",
-            "scope": ["email", "profile"],
+            "scope": ["email", "profile"]
         }],
         "oidcDiscoveryEndpoint": "https://example.com",
         "authorizationEndpointQueryParams": {
diff --git a/v2/thirdparty/common-customizations/multi-tenancy/new-tenant-config.mdx b/v2/thirdparty/common-customizations/multi-tenancy/new-tenant-config.mdx
index 593602ddf..0ec030789 100644
--- a/v2/thirdparty/common-customizations/multi-tenancy/new-tenant-config.mdx
+++ b/v2/thirdparty/common-customizations/multi-tenancy/new-tenant-config.mdx
@@ -324,7 +324,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdparty/custom-ui/multitenant-login.mdx b/v2/thirdparty/custom-ui/multitenant-login.mdx
index 8f98180df..cf02e00d8 100644
--- a/v2/thirdparty/custom-ui/multitenant-login.mdx
+++ b/v2/thirdparty/custom-ui/multitenant-login.mdx
@@ -355,7 +355,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdparty/pre-built-ui/multitenant-login.mdx b/v2/thirdparty/pre-built-ui/multitenant-login.mdx
index e9cc5b5ba..179488552 100644
--- a/v2/thirdparty/pre-built-ui/multitenant-login.mdx
+++ b/v2/thirdparty/pre-built-ui/multitenant-login.mdx
@@ -352,7 +352,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/custom-provider.mdx b/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/custom-provider.mdx
index 15d5c1292..fda542afe 100644
--- a/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/custom-provider.mdx
+++ b/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/custom-provider.mdx
@@ -238,7 +238,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         "clients": [{
             "clientId": "...",
             "clientSecret": "...",
-            "scope": ["email", "profile"],
+            "scope": ["email", "profile"]
         }],
         "authorizationEndpoint": "https://example.com/oauth/authorize",
         "authorizationEndpointQueryParams": {
@@ -247,7 +247,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         },
         "tokenEndpoint": "https://example.com/oauth/token",
         "tokenEndpointBodyParams": {
-            "someKey1": "value1",
+            "someKey1": "value1"
         },
         "userInfoEndpoint": "https://example.com/oauth/userinfo",
         "userInfoMap": {
@@ -459,7 +459,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         "clients": [{
             "clientId": "...",
             "clientSecret": "...",
-            "scope": ["email", "profile"],
+            "scope": ["email", "profile"]
         }],
         "oidcDiscoveryEndpoint": "https://example.com",
         "authorizationEndpointQueryParams": {
diff --git a/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/new-tenant-config.mdx b/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/new-tenant-config.mdx
index 46b5199af..a942891a9 100644
--- a/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/new-tenant-config.mdx
+++ b/v2/thirdpartyemailpassword/common-customizations/multi-tenancy/new-tenant-config.mdx
@@ -339,7 +339,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdpartyemailpassword/custom-ui/multitenant-login.mdx b/v2/thirdpartyemailpassword/custom-ui/multitenant-login.mdx
index f409c6998..7f4bc394b 100644
--- a/v2/thirdpartyemailpassword/custom-ui/multitenant-login.mdx
+++ b/v2/thirdpartyemailpassword/custom-ui/multitenant-login.mdx
@@ -370,7 +370,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdpartyemailpassword/pre-built-ui/multitenant-login.mdx b/v2/thirdpartyemailpassword/pre-built-ui/multitenant-login.mdx
index f472008f5..9632a21e5 100644
--- a/v2/thirdpartyemailpassword/pre-built-ui/multitenant-login.mdx
+++ b/v2/thirdpartyemailpassword/pre-built-ui/multitenant-login.mdx
@@ -367,7 +367,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdpartypasswordless/common-customizations/multi-tenancy/custom-provider.mdx b/v2/thirdpartypasswordless/common-customizations/multi-tenancy/custom-provider.mdx
index 15d5c1292..fda542afe 100644
--- a/v2/thirdpartypasswordless/common-customizations/multi-tenancy/custom-provider.mdx
+++ b/v2/thirdpartypasswordless/common-customizations/multi-tenancy/custom-provider.mdx
@@ -238,7 +238,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         "clients": [{
             "clientId": "...",
             "clientSecret": "...",
-            "scope": ["email", "profile"],
+            "scope": ["email", "profile"]
         }],
         "authorizationEndpoint": "https://example.com/oauth/authorize",
         "authorizationEndpointQueryParams": {
@@ -247,7 +247,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         },
         "tokenEndpoint": "https://example.com/oauth/token",
         "tokenEndpointBodyParams": {
-            "someKey1": "value1",
+            "someKey1": "value1"
         },
         "userInfoEndpoint": "https://example.com/oauth/userinfo",
         "userInfoMap": {
@@ -459,7 +459,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
         "clients": [{
             "clientId": "...",
             "clientSecret": "...",
-            "scope": ["email", "profile"],
+            "scope": ["email", "profile"]
         }],
         "oidcDiscoveryEndpoint": "https://example.com",
         "authorizationEndpointQueryParams": {
diff --git a/v2/thirdpartypasswordless/common-customizations/multi-tenancy/new-tenant-config.mdx b/v2/thirdpartypasswordless/common-customizations/multi-tenancy/new-tenant-config.mdx
index 73084ebcb..7d756cc6f 100644
--- a/v2/thirdpartypasswordless/common-customizations/multi-tenancy/new-tenant-config.mdx
+++ b/v2/thirdpartypasswordless/common-customizations/multi-tenancy/new-tenant-config.mdx
@@ -348,7 +348,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdpartypasswordless/custom-ui/multitenant-login.mdx b/v2/thirdpartypasswordless/custom-ui/multitenant-login.mdx
index 3df64d8aa..641ff9960 100644
--- a/v2/thirdpartypasswordless/custom-ui/multitenant-login.mdx
+++ b/v2/thirdpartypasswordless/custom-ui/multitenant-login.mdx
@@ -379,7 +379,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"
diff --git a/v2/thirdpartypasswordless/pre-built-ui/multitenant-login.mdx b/v2/thirdpartypasswordless/pre-built-ui/multitenant-login.mdx
index 96fc8674a..1347d10fb 100644
--- a/v2/thirdpartypasswordless/pre-built-ui/multitenant-login.mdx
+++ b/v2/thirdpartypasswordless/pre-built-ui/multitenant-login.mdx
@@ -376,7 +376,7 @@ curl --location --request PUT '^{coreInjector_uri_without_quotes}/<TENANT_ID>/re
     "clients": [
       {
         "clientId": "...",
-        "clientSecret": "...",
+        "clientSecret": "..."
       }
     ],
 	"oidcDiscoveryEndpoint": "https://login.microsoftonline.com/<directoryId>/v2.0"