Explaining EOL date change, auto-gen projects, automatic conversion of JWT to OAuth S2S credentials, and final drop date of Mar 1, 2026

Author: theManikJindal

src/pages/guides/authentication/ServerToServerAuthentication/faqs.md

@@ -7,6 +7,7 @@
 + [Benefits of the new credential](#benefits-of-the-new-credential)
 + [Migration next steps](#migration-next-steps)
 + [Migrating vendor applications](#migrating-vendor-applications)
++ [Migrating Auto-generated projects](#migrating-auto-generated-projects)
 + [Adobe assistance](#adobe-assistance)
 
 
@@ -36,14 +37,17 @@ No. Any integration or application using the Service Account (JWT) credential wi
 
 
 ### What is the deadline to migrate to the new credential? 
-You must migrate your application to use the new OAuth Server-to-Server credential before June 30, 2025, to ensure your application does not face any downtime. See [migration guide](./migration.md).
+You must migrate your application to use the new OAuth Server-to-Server credential before June 30, 2025, to ensure your application does not face any downtime. See [deprecation timelines](./migration.md#deperecation-timelines). See [migration guide](./migration.md).
 
 
 
 ### What happens if we do not migrate our application by Jun 30, 2025? 
 
 Projects on the Developer Console still containing any Service Account (JWT) credentials will be 'frozen' after June 30, 2025. This will disable certificate rotation for your application or any other action to modify the Project or the credential. The ability to migrate will, however, still be available. Once you migrate your application, the Project will be 'unfrozen' again.
 
+Furthermore, Adobe will automatically convert any Service Account (JWT) credential with expired certificates to an OAuth Server-to-Server credential.
+
+Finally, on Mar 1, 2026, all JWT credentials (regardless of certificate validity) will stop working.
 
 
 ### We can currently create new Service Account (JWT) credentials even though they are marked as deprecated. Is it recommended? 
@@ -157,6 +161,14 @@ Until June 3, 2024, customers can still create Service Account (JWT) credentials
 Therefore, we recommend enhancing your application before June3, 2024. You must add support to use the new credential and support for customers to migrate from the old credential to the new credential.
 
 
+## Migrating Auto-generated projects
+
+### Do we need to migrate auto-generated projects?
+No. Adobe will migrate all auto-generated projects without needing your action. 
+
+### When will Adobe migrate auto-generated projects?
+Adobe will migrate all auto-generated projects before Jun 30, 2025.
+
 
 ## Adobe assistance
 

src/pages/guides/authentication/ServerToServerAuthentication/migration.md

@@ -6,6 +6,10 @@ The new OAuth Server-to-Server credentials simplify all aspects of application d
 
 While the Service Account (JWT) credentials have been marked as deprecated, they will continue to work until **Jun 30, 2025**. Therefore you must migrate your application or integration to use the new OAuth Server-to-Server credential before Jun 30, 2025. See the section on [deprecation timelines](#deperecation-timelines) below to learn more.
 
+<InlineAlert slots="text"/>
+
+Note: The end-of-life date for JWT credentials has been extended from Jan 27, 2025, to Jun 30, 2025.
+
 Migrating your applications to the OAuth Server-to-Server credential is a simple two-step process that enables a zero downtime migration for your applications and integrations. Please read our [migration guide](#migration-overview) below to familiarize yourself with the migration process.
 
 If you have more questions, check out our [frequently asked questions](#faqs) or visit the Adobe Developer Console [forums](https://experienceleaguecommunities.adobe.com/t5/adobe-developer-console/ct-p/adobe-io-console).
@@ -45,13 +49,15 @@ Lastly, while the new OAuth Server-to-Server credentials do not use expiring cer
 
 <InlineAlert slots="text"/>
 
-Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025.
-
+Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. 
+Note: The end-of-life date for JWT credentials has been extended from Jan 27, 2025, to Jun 30, 2025.
 
-| | May 1, 2023 - Jun 2, 2024 | Jun 3, 2024 - Jun 29, 2025 | Jun 30, 2025 (end of life) |
-|-|------------------------------|---------------------------------|-------------------------------|
-| Existing applications using a Service Account (JWT) credential |   Existing applications using the Service Account (JWT) credential will continue to work. |   Existing applications using the Service Account (JWT) credential will continue to work.  |  **Existing applications cannot refresh expiring certificates after Jun 30, 2025, and will stop working**.  |
-| New applications creating a Service Account (JWT) credential   |  A new Service Account (JWT) credential can be added to the project.  |  A new Service Account (JWT) credential **cannot** be created or added to the project.  |  A new Service Account (JWT) credential **cannot** be created or added to the project.  |
+| Timeline     | Event                                         | Impact on existing & new applications |
+|--------------|-----------------------------------------------|---------------------------------------|
+| May 1, 2023  | Deprecation and end-of-life date announced.   | Existing applications using JWT continue to work. New applications can still create new JWT credentials. |
+| Jun 3, 2024  | New JWT credentials cannot be created.        | Existing applications using JWT continue to work.  New applications cannot create new JWT credentials. |
+| Jun 30, 2025 | JWT credentials are end-of-life.              | Applications using JWT can no longer refresh certificates and will stop working when existing certificates expire. Any JWT credential that expires will be automatically converted to an OAuth Server-to-server credential. |
+| Mar 1, 2026  | All JWT credentials stop working.  | Regardless of certificate validity, any application using JWT will stop working *on* March 1, 2026. |
 
 ## Migration Overview