diff --git a/msteams-platform/assets/images/teams-toolkit-v2/teams toolkit fundamentals/switchTenants.png b/msteams-platform/assets/images/teams-toolkit-v2/teams toolkit fundamentals/switchTenants.png
new file mode 100644
index 00000000000..d09ad705a67
Binary files /dev/null and b/msteams-platform/assets/images/teams-toolkit-v2/teams toolkit fundamentals/switchTenants.png differ
diff --git a/msteams-platform/toolkit/explore-Teams-Toolkit.md b/msteams-platform/toolkit/explore-Teams-Toolkit.md
index dbd5433dd65..2444923f35c 100644
--- a/msteams-platform/toolkit/explore-Teams-Toolkit.md
+++ b/msteams-platform/toolkit/explore-Teams-Toolkit.md
@@ -54,6 +54,7 @@ From the task pane, you can see the following sections:
 :::row:::
    :::column span="":::
       :::image type="content" source="../assets/images/teams-toolkit-v2/teams toolkit fundamentals/accounts1_1.png" alt-text="Screenshot shows the Accounts section.":::
+      :::image type="content" source="../assets/images/teams-toolkit-v2/teams toolkit fundamentals/switchTenants.png" alt-text="Screenshot shows the switch tenant button.":::
    :::column-end:::
    :::column span="":::
 
@@ -62,6 +63,8 @@ From the task pane, you can see the following sections:
          * **Sign in to Microsoft 365**: Use your Microsoft 365 work or school account with a valid E5 subscription for building your app. If you don't have a valid account, you can join [Microsoft 365 developer program](https://developer.microsoft.com/microsoft-365/dev-program) to get a free account before you start.
 
         * **Sign in to Azure**: Use your Azure account for deploying your app on Azure. You can [create a free Azure account](https://azure.microsoft.com/free/) before you start.
+
+        Note: When you sign in to Microsoft 365 or Azure account, your signed in tenant is your home tenant by default. You can switch to other tenants manually by clicking the switch button on signed in account item.
    :::column-end:::
 :::row-end:::
 
diff --git a/msteams-platform/toolkit/tools-prerequisites.md b/msteams-platform/toolkit/tools-prerequisites.md
index 502c75a039a..e0f3b60fabd 100644
--- a/msteams-platform/toolkit/tools-prerequisites.md
+++ b/msteams-platform/toolkit/tools-prerequisites.md
@@ -44,6 +44,13 @@ Ensure that you have the following accounts before you start building your Teams
 |[Azure account](#azure-account)|Back-end resources on Azure.| JavaScript, TypeScript, SPFx, and C# or Blazor. |
 |[SharePoint collection site administrator account](#sharepoint-collection-site-administrator-account) |Deployment for hosting.| SPFx. |
 
+> [!NOTE]
+> If your Microsoft 365 account has multiple tenants, you could switch to either tenant to develop Teams app. But there're several known limitations that should be aware of:
+>
+> * Multi-tenant is not supported by TDP yet. You may not be able to see your Teams app provisioned in non-home tenants from Teams Dev portal.
+> * Publishing Teams app of non-home tenants is not well supported in Teams.
+> * Multi-tenant is only supported for Teams app. Extending Teams app to other hubs(Outlook, Office.com) is not supported under non-home tenants.
+
 ### Microsoft 365 developer program
 
 > [!NOTE]