Hybrid Azure AD join computer procedure

Hi All,

We have configured AADC to sync on-prem AD object / password hash to O365 with ADFS for federation and access control.

We are planning to change our O365 from federated domain to managed domain, so we can dismiss the ADFS.
It will involve Hybrid Azure AD join our domain computers, setup Azure AD conditional access and then dismiss the ADFS, while keeping AADC to sync on-prem AD object / password hash to O365.

Original plan:

1. Setup AAD hybrid join with federation domain.

2. Windows 10 computer will auto AAD hybrid join.

3. Setup Conditional Access rules.

4. Change federation domain to managed domain.

5. Change AAD hybrid join to managed domain.

6. Dismiss ADFS.

According to Microsoft documents: "Beginning with Windows 10 1803, if the instantaneous hybrid Azure AD join for a federated environment by using AD FS fails, we rely on Azure AD Connect to sync the computer object in Azure AD that's subsequently used to complete the device registration for hybrid Azure AD join."

So I am thinking a new plan to simplify the steps:

1. AADC sync WIndows 10 computer to AAD

2. Setup SCP GPO to publish SCP to Windows 10 computers.

3. Windows 10 auto do the AAD hybrid join.

4. Setup Conditional Access rule.

5. Change federation domain to managed domain.

6. Dismiss ADFS.

Will this migration step work?

Thanks,
Roy