diff --git a/docset/winserver2016-ps/adfs/New-AdfsAzureMfaTenantCertificate.md b/docset/winserver2016-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
index c2dc606fbf..282b659773 100644
--- a/docset/winserver2016-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
+++ b/docset/winserver2016-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref, azure-ad-ref-level-one-done
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2016-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
 ### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
 These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
 
-> [!NOTE]
-> Customers are encouraged to use the newer [Microsoft Graph PowerShell](/powershell/microsoftgraph/overview) module.
-
 ### Example 2: Determine which certificate Azure MFA is using
 ```
 $CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
diff --git a/docset/winserver2016-ps/adfs/Set-AdfsAzureMfaTenant.md b/docset/winserver2016-ps/adfs/Set-AdfsAzureMfaTenant.md
index 1adb2c053a..f7930c87d2 100644
--- a/docset/winserver2016-ps/adfs/Set-AdfsAzureMfaTenant.md
+++ b/docset/winserver2016-ps/adfs/Set-AdfsAzureMfaTenant.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2016-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
 ### Example 1: Enable Azure MFA
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
diff --git a/docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md b/docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
index 4d8601d150..68bc3b9740 100644
--- a/docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
+++ b/docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref, azure-ad-ref-level-one-done
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2019-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
 ### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
 These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
 
-> [!NOTE]
-> Customers are encouraged to use the newer [Microsoft Graph PowerShell](/powershell/microsoftgraph/overview) module.
-
 ### Example 2: Determine which certificate Azure MFA is using
 ```
 $CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
diff --git a/docset/winserver2019-ps/adfs/Set-AdfsAzureMfaTenant.md b/docset/winserver2019-ps/adfs/Set-AdfsAzureMfaTenant.md
index 35eea27491..b7f724cade 100644
--- a/docset/winserver2019-ps/adfs/Set-AdfsAzureMfaTenant.md
+++ b/docset/winserver2019-ps/adfs/Set-AdfsAzureMfaTenant.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2019-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
 ### Example 1: Enable Azure MFA
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
diff --git a/docset/winserver2022-ps/adfs/New-AdfsAzureMfaTenantCertificate.md b/docset/winserver2022-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
index 527a6f9674..818edca3b0 100644
--- a/docset/winserver2022-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
+++ b/docset/winserver2022-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2022-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
 ### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
 These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
 
-> [!NOTE]
-> Customers are encouraged to use the newer Azure Active Directory PowerShell 2.0 module. For more information about the v2.0 module, see [AzureAD PowerShell 2.0](/powershell/module/Azuread/?view=azureadps-2.0).
-
 ### Example 2: Determine which certificate Azure MFA is using
 ```
 $CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
diff --git a/docset/winserver2022-ps/adfs/Set-AdfsAzureMfaTenant.md b/docset/winserver2022-ps/adfs/Set-AdfsAzureMfaTenant.md
index cb3d9cf62a..a3556bf1ce 100644
--- a/docset/winserver2022-ps/adfs/Set-AdfsAzureMfaTenant.md
+++ b/docset/winserver2022-ps/adfs/Set-AdfsAzureMfaTenant.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2022-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
 ### Example 1: Enable Azure MFA
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
diff --git a/docset/winserver2025-ps/adfs/New-AdfsAzureMfaTenantCertificate.md b/docset/winserver2025-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
index 639dcd0a18..bc3cfcb465 100644
--- a/docset/winserver2025-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
+++ b/docset/winserver2025-ps/adfs/New-AdfsAzureMfaTenantCertificate.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2025-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
 ### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
 These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
 
-> [!NOTE]
-> Customers are encouraged to use the newer Azure Active Directory PowerShell 2.0 module. For more information about the v2.0 module, see [AzureAD PowerShell 2.0](/powershell/module/Azuread/?view=azureadps-2.0).
-
 ### Example 2: Determine which certificate Azure MFA is using
 ```
 $CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
diff --git a/docset/winserver2025-ps/adfs/Set-AdfsAzureMfaTenant.md b/docset/winserver2025-ps/adfs/Set-AdfsAzureMfaTenant.md
index 06012b4342..c4e9993107 100644
--- a/docset/winserver2025-ps/adfs/Set-AdfsAzureMfaTenant.md
+++ b/docset/winserver2025-ps/adfs/Set-AdfsAzureMfaTenant.md
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
 external help file: Microsoft.IdentityServer.Management.dll-Help.xml
 Module Name: ADFS
 ms.date: 12/20/2016
-ms.custom: has-azure-ad-ps-ref
+ms.custom: no-azure-ad-ps-ref
 online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2025-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
 ### Example 1: Enable Azure MFA
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```