Exchange Online - New GAL

Our organisation recently split into two divisions/companies. Both companies currently share the same M365 tenant and same physical hypverV hosts but have their own on-prem AD/vm's.
To provide company separation, within Outlook, we setup a new GAL/OAB/Address Book Policy etc using company attribute filtering. See below:
New-GlobalAddressList -Name "CompanyA GAL" -IncludedRecipients AllRecipients -ConditionalCompany "CompanyA"

Set-GlobalAddressList -Identity "CompanyA GAL"

New-OfflineAddressBook -Name "CompanyA OAB" -AddressLists "CompanyA GAL"

New-AddressList -Name "CompanyA Users" -IncludedRecipients AllRecipients -ConditionalCompany "CompanyA"

New-AddressBookPolicy -Name "CompanyA ABP" -AddressLists "CompanyA Users" -OfflineAddressBook "CompanyA OAB" -GlobailAddressList "CompanyA GAL"-RoomList "\All Rooms"

This has worked but now the users in CompanyA can no longer see any Distribution Groups or Contacts. The Groups and Contacts objects in AD do not have the company attribute. How do i go about creating New-AddressList for CompanyA groups and contacts and add them to the CompanyA ABP?
Thanks in advance.