Rebuild with SSO update