diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/1-Create.ps1
index 512a22ca2a..30d854debf 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/1-Create.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/1-Create.ps1
@@ -25,10 +25,12 @@ Configuration Example
     {
         EXOMailboxFolderPermission "EXOMailboxFolderPermission-admin:\Calendar"
         {
-            Credential           = $Credscredential;
-            Ensure               = "Present";
-            Identity             = "amdin:\Calendar";
-            UserPermissions      = @(MSFT_EXOMailboxFolderUserPermission {
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
+            Ensure                = "Present";
+            Identity              = "amdin:\Calendar";
+            UserPermissions       = @(MSFT_EXOMailboxFolderUserPermission {
                 User                   = 'Default'
                 AccessRights           = 'AvailabilityOnly'
             }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/2-Update.ps1
index 22c39789c9..53f644e60e 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/2-Update.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxFolderPermission/2-Update.ps1
@@ -23,10 +23,12 @@ Configuration Example
     {
         EXOMailboxFolderPermission "EXOMailboxFolderPermission-admin:\Calendar"
         {
-            Credential           = $Credscredential;
-            Ensure               = "Present";
-            Identity             = "admin:\Calendar";
-            UserPermissions      = @(MSFT_EXOMailboxFolderUserPermission {
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
+            Ensure                = "Present";
+            Identity              = "admin:\Calendar";
+            UserPermissions       = @(MSFT_EXOMailboxFolderUserPermission {
                 User                   = 'Default'
                 AccessRights           = 'AvailabilityOnly'
             }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/1-Create.ps1
index f47d2d2105..224ba6554e 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/1-Create.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/1-Create.ps1
@@ -23,11 +23,13 @@ Configuration Example
     {
         EXOMailboxIRMAccess "EXOMailboxIRMAccess-qwe@testorg.onmicrosoft.com"
         {
-            AccessLevel          = "Block";
-            Credential           = $Credscredential;
-            Ensure               = "Present";
-            Identity             = "qwe@$OrganizationName";
-            User                 = "admin@$OrganizationName";
+            AccessLevel            = "Block";
+            ApplicationId          = $ApplicationId
+            TenantId               = $TenantId
+            CertificateThumbprint  = $CertificateThumbprint
+            Ensure                 = "Present";
+            Identity               = "qwe@$OrganizationName";
+            User                   = "admin@$OrganizationName";
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/2-Remove.ps1
similarity index 50%
rename from Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/2-Update.ps1
rename to Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/2-Remove.ps1
index b516274848..e57be7daf4 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/2-Update.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxIRMAccess/2-Remove.ps1
@@ -21,6 +21,15 @@ Configuration Example
     Import-DscResource -ModuleName Microsoft365DSC
     node localhost
     {
-        
+        EXOMailboxIRMAccess "EXOMailboxIRMAccess-qwe@testorg.onmicrosoft.com"
+        {
+            AccessLevel            = "Block";
+            ApplicationId          = $ApplicationId
+            TenantId               = $TenantId
+            CertificateThumbprint  = $CertificateThumbprint
+            Ensure                 = "Absent";
+            Identity               = "qwe@$OrganizationName";
+            User                   = "admin@$OrganizationName";
+        }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/1-Create.ps1
index ba630d844a..e583a1d42c 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/1-Create.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/1-Create.ps1
@@ -25,7 +25,9 @@ Configuration Example
     {
         EXOManagementScope "EXOManagementScope-Test New DGs"
         {
-            Credential                 = $Credscredential;
+            ApplicationId              = $ApplicationId
+            TenantId                   = $TenantId
+            CertificateThumbprint      = $CertificateThumbprint
             Ensure                     = "Present";
             Exclusive                  = $False;
             Identity                   = "Test New DGs";
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/2-Update.ps1
index 64528717e8..8ceabe1be9 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/2-Update.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/2-Update.ps1
@@ -23,7 +23,9 @@ Configuration Example
     {
         EXOManagementScope "EXOManagementScope-Test New DGs"
         {
-            Credential                 = $Credscredential;
+            ApplicationId              = $ApplicationId
+            TenantId                   = $TenantId
+            CertificateThumbprint      = $CertificateThumbprint
             Ensure                     = "Present";
             Exclusive                  = $False;
             Identity                   = "Test New DGs";
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/3-Remove.ps1
index 3524dc103d..1b2e95e5af 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/3-Remove.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOManagementScope/3-Remove.ps1
@@ -23,7 +23,9 @@ Configuration Example
     {
         EXOManagementScope "EXOManagementScope-Test New DGs"
         {
-            Credential                 = $Credscredential;
+            ApplicationId              = $ApplicationId
+            TenantId                   = $TenantId
+            CertificateThumbprint      = $CertificateThumbprint
             Ensure                     = "Absent";
             Exclusive                  = $False;
             Identity                   = "Test New DGs";
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/1-Create.ps1
index e96d8c8010..58211df214 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/1-Create.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/1-Create.ps1
@@ -25,7 +25,9 @@ Configuration Example
         {
             AcceptUntrustedCertificates   = $True;
             Authentication                = "Basic";
-            Credential                    = $Credscredential;
+            ApplicationId                 = $ApplicationId
+            TenantId                      = $TenantId
+            CertificateThumbprint         = $CertificateThumbprint
             EndpointType                  = "IMAP";
             Ensure                        = "Present";
             Identity                      = "testIMAP";
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/2-Update.ps1
index 4ec28ef8fc..85ec1ba902 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/2-Update.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/2-Update.ps1
@@ -25,7 +25,9 @@ Configuration Example
         {
             AcceptUntrustedCertificates   = $True;
             Authentication                = "Basic";
-            Credential                    = $Credscredential;
+            ApplicationId                 = $ApplicationId
+            TenantId                      = $TenantId
+            CertificateThumbprint         = $CertificateThumbprint
             EndpointType                  = "IMAP";
             Ensure                        = "Present";
             Identity                      = "testIMAP";
@@ -37,6 +39,5 @@ Configuration Example
             # value for security updated from Tls to None
             Security                      = "None";
         }
-
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/3-Remove.ps1
index 9ac7745bec..e1e47e2730 100644
--- a/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/3-Remove.ps1
+++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMigrationEndpoint/3-Remove.ps1
@@ -25,7 +25,9 @@ Configuration Example
         {
             AcceptUntrustedCertificates   = $True;
             Authentication                = "Basic";
-            Credential                    = $Credscredential;
+            ApplicationId                 = $ApplicationId
+            TenantId                      = $TenantId
+            CertificateThumbprint         = $CertificateThumbprint
             EndpointType                  = "IMAP";
             Ensure                        = "Absent";
             Identity                      = "testIMAP";