aem 6.5 sp13 SAML with azure AD, user is created with random string in user principal

Hello,
I am following this blog post
https://blog.developer.adobe.com/saml-authentication-in-aem-using-microsoft-azure-active-directory-30d668338a8f
and also microsoft official documentation
https://docs.microsoft.com/en-us/azure/active-directory/saas-apps/adobe-identity-management-tutorial

to integrate azure ad with author 6.5 sp 13 saml auth.

Authentication works but the user is always created with principalname with a random string

I tried to configure aem saml User ID attribute  with  emailaddress , uid, nameid but no luck
in azure saml token claims I see

<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
<AttributeValue>Andrea</AttributeValue>
</Attribute>
<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
<AttributeValue>Mysurname</AttributeValue>
</Attribute>
<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
<AttributeValue>mymail@example.com</AttributeValue>
</Attribute>
<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
<AttributeValue>mymail@example.com</AttributeValue>
</Attribute>

any suggestion on how to configure  Userid attribute or  Synchronized attributes
for example mapping claims to user properties like:

surname->familyName

givenname->givenName

Thanks