diff --git a/docs/actionable-messages/email-dev-dashboard.md b/docs/actionable-messages/email-dev-dashboard.md
index 8293161a..b1a752d1 100644
--- a/docs/actionable-messages/email-dev-dashboard.md
+++ b/docs/actionable-messages/email-dev-dashboard.md
@@ -4,7 +4,7 @@ description: The developer dashboard helps you submit and track status of your s
 author: jasonjoh
 ms.topic: article
 ms.service: outlook
-ms.date: 09/07/2021
+ms.date: 05/27/2026
 ms.author: jasonjoh
 ms.localizationpriority: high
 ms.subservice: o365-connectors
@@ -12,6 +12,8 @@ ms.subservice: o365-connectors
 
 # Register your service with the actionable email developer dashboard
 
+[!INCLUDE [legacy-token-deprecation](../includes/actionable-messages/legacy-token-deprecation.md)]
+
 To test and publish actionable messages from your service, you need to provide certain information to Microsoft to enable this functionality for emails from your service. The [developer dashboard](https://aka.ms/publishoam) helps you submit and track status of your submission via the web portal.
 
 > [!NOTE]
@@ -142,7 +144,7 @@ There are some things you need to keep in mind when you submit your solution for
 - Emails must follow the email sender guidelines.
   - See [Sending mail to Office 365](/office365/SecurityCompliance/sending-mail-to-office-365) for Office 365.
   - See [Policies, Practices, and Guidelines](https://sendersupport.olc.protection.outlook.com/pm/policies.aspx) for Outlook.com.
-  - See [M3AAWG Sender Best Practices](https://www.m3aawg.org/sites/default/files/document/M3AAWG_Senders_BCP_Ver3-2015-02.pdf) and [ReturnPath Sending Best Practices](https://help.returnpath.com/hc/articles/221634867-Sending-Best-Practices-PDF-) for industry guidelines.
+  - See [M3AAWG Sender Best Practices](https://www.m3aawg.org/sites/default/files/doc_files/M3AAWG_Senders_BCP_Ver3-2015-02.pdf) and [ReturnPath Sending Best Practices](https://help.returnpath.com/hc/articles/221634867-Sending-Best-Practices-PDF-) for industry guidelines.
 - Consistent history of sending a high volume of mail from your domain (order of hundred emails a day minimum to Office 365) for a few weeks at least.
 - A very low rate of spam complaints from users.
 - High-fidelity, routine and simple actions available for your service should be used. For more complex interactions, `OpenURI` actions can be used.
diff --git a/docs/actionable-messages/enable-entra-token-for-actionable-messages.md b/docs/actionable-messages/enable-entra-token-for-actionable-messages.md
index 4e02ecdd..f278fddf 100644
--- a/docs/actionable-messages/enable-entra-token-for-actionable-messages.md
+++ b/docs/actionable-messages/enable-entra-token-for-actionable-messages.md
@@ -5,7 +5,7 @@ author: vermaanimesh
 ms.topic: how-to
 ms.service: outlook
 ms.subservice: o365-connectors
-ms.date: 11/17/2025
+ms.date: 05/27/2026
 ms.author: vermaanimesh
 ms.localizationpriority: high
 ---
@@ -14,8 +14,31 @@ ms.localizationpriority: high
 
 <!-- cSpell:ignore vermaanimesh -->
 
-> [!IMPORTANT]
-> Actionable Messages (AM) are moving from EAT (External Access Token) to Microsoft Entra ID token authentication. Partners using EAT tokens must update their integration to support AAD tokens for requests from the AM service. Starting November 21st 2025 we will **stop** accepting new registrations with EAT (External Access Token).
+[!INCLUDE [legacy-token-deprecation](../includes/actionable-messages/legacy-token-deprecation.md)]
+
+## Admin Guide: View providers with Auth type
+
+Admins can download the list of all approved providers in their organization along with the token type being used. The data is exported in a .csv format for easy analysis and reporting.
+
+### How to download the provider list
+
+1. Navigate to the Actionable Email Developer Dashboard (Admin Portal).
+1. Use the **Status** filter and select **Approved**.
+1. Select **Search** to load the approved providers.
+
+    :::image type="content" source="images/enabling-entra-token-for-actionable-messages/get-provider-search.png" alt-text="A screenshot of the Actionable Email Developer Dashboard showing the position of the Search button":::
+
+1. Once the approved providers are displayed, the **Get Provider List** button will become visible.
+
+    :::image type="content" source="images/enabling-entra-token-for-actionable-messages/get-provider.png" alt-text="A screenshot of the Actionable Email Developer Dashboard showing the position of the Get Provider List button":::
+
+1. Select **Get Provider List** to export the list in .csv format.
+
+#### Important Notes
+
+- The download button is visible only after filtering by Approved providers.
+- The downloaded file contains provider details along with their token type.
+- In case of a timeout error, the error message is displayed on the UI and disappears automatically after 5 seconds.
 
 ## Register an app in Azure
 
diff --git a/docs/actionable-messages/get-started.md b/docs/actionable-messages/get-started.md
index f26f200d..5127868f 100644
--- a/docs/actionable-messages/get-started.md
+++ b/docs/actionable-messages/get-started.md
@@ -2,9 +2,9 @@
 title: Get started with actionable messages
 description: Learn how to create an actionable message card and send it via Outlook or Microsoft 365 email.
 author: jasonjoh
-ms.topic: conceptual
+ms.topic: article
 ms.service: outlook
-ms.date: 10/09/2024
+ms.date: 05/27/2026
 ms.author: jasonjoh
 ms.localizationpriority: high
 ms.subservice: o365-connectors
@@ -12,6 +12,8 @@ ms.subservice: o365-connectors
 
 # Get started with actionable messages in Office 365
 
+[!INCLUDE [legacy-token-deprecation](../includes/actionable-messages/legacy-token-deprecation.md)]
+
 ## Supported scenarios
 
 Sending actionable messages via email is supported in the following scenarios.
diff --git a/docs/actionable-messages/images/enabling-entra-token-for-actionable-messages/get-provider-search.png b/docs/actionable-messages/images/enabling-entra-token-for-actionable-messages/get-provider-search.png
new file mode 100644
index 00000000..fc61b2ce
Binary files /dev/null and b/docs/actionable-messages/images/enabling-entra-token-for-actionable-messages/get-provider-search.png differ
diff --git a/docs/actionable-messages/images/enabling-entra-token-for-actionable-messages/get-provider.png b/docs/actionable-messages/images/enabling-entra-token-for-actionable-messages/get-provider.png
new file mode 100644
index 00000000..3986b888
Binary files /dev/null and b/docs/actionable-messages/images/enabling-entra-token-for-actionable-messages/get-provider.png differ
diff --git a/docs/actionable-messages/index.md b/docs/actionable-messages/index.md
index 5bd839f4..1a6440c4 100644
--- a/docs/actionable-messages/index.md
+++ b/docs/actionable-messages/index.md
@@ -5,7 +5,7 @@ author: jasonjoh
 ms.topic: article
 ms.service: outlook
 ms.author: jasonjoh
-ms.date: 11/17/2025
+ms.date: 05/27/2026
 nodes_to_expand: get-started
 ms.localizationpriority: high
 ms.subservice: o365-connectors
@@ -13,8 +13,7 @@ ms.subservice: o365-connectors
 
 # Actionable messages in Outlook and Office 365 Groups
 
-> [!IMPORTANT]
-> Actionable Messages (AM) are moving from EAT (External Access Token) to Microsoft Entra ID token authentication. Partners using EAT tokens must update their integration to support AAD tokens for requests from the AM service. For more information, see [Enabling AAD token of Actionable Messages](enable-entra-token-for-actionable-messages.md).
+[!INCLUDE [legacy-token-deprecation](../includes/actionable-messages/legacy-token-deprecation.md)]
 
 Whether you are filling out a survey, approving an expense report, or updating a CRM sales opportunity, Actionable Messages enable you to take quick actions right from within Outlook. Developers can now embed actions in their emails or notifications, elevating user engagement with their services and increasing organizational productivity.
 
diff --git a/docs/actionable-messages/universal-action-model.md b/docs/actionable-messages/universal-action-model.md
index f0702bf3..89cc0b5b 100644
--- a/docs/actionable-messages/universal-action-model.md
+++ b/docs/actionable-messages/universal-action-model.md
@@ -2,7 +2,7 @@
 title: Overview of Universal Action Model
 description: Learn more about Universal Actions for Adaptive Cards in Outlook
 author: avijityadav
-ms.topic: conceptual
+ms.topic: article
 ms.service: outlook
 ms.date: 05/18/2023
 ms.author: avyad
diff --git a/docs/includes/actionable-messages/legacy-token-deprecation.md b/docs/includes/actionable-messages/legacy-token-deprecation.md
new file mode 100644
index 00000000..15016eed
--- /dev/null
+++ b/docs/includes/actionable-messages/legacy-token-deprecation.md
@@ -0,0 +1,13 @@
+---
+author: jasonjoh
+ms.topic: include
+ms.date: 05/27/2026
+ms.localizationpriority: medium
+---
+
+<!-- markdownlint-disable MD041-->
+
+> [!IMPORTANT]
+> Actionable Messages are transitioning from legacy (EAT) authentication to Entra ID–based token authentication. The phase-out of legacy authentication is in progress and will be completed by **June 8, 2026**. After this date, integrations relying on **legacy tokens will no longer function**.
+>
+> To ensure uninterrupted service, partners should implement support for Entra ID tokens as soon as possible. For guidance on updating your integration, please refer to [Enable Microsoft Entra ID token for Actionable Messages](../../actionable-messages/enable-entra-token-for-actionable-messages.md).