With the goal to advance the discovery of FAIR-enabling repositories, the Repository Finder had been the designated tool to improve within FAIRsFAIR. Being a limited simple view on the re3data data source, it has been reshaped and merged into DataCite Commons to embed repository metadata within the PID-Graph. Thus the joint services address researchers looking for repositories and research data as well infrastructure and service providers that require joint information on research data and its context. So the DataCite Commons integration not only makes FAIR enabling repositories discoverable, but also serves as basis for to develop services, e.g. F-UJI.re3data had been updating its metadata schema and interfaces to accompany the transition and allow to group FAIR-enabling repositories as it has been codified implicitly in the Repository Finder. DataCite Commons allows users to view and explore the context of repositories, e.g. links to the data, the researchers, the organizations etc. It also provides a foundation for future services building upon the linked content. Those services are accompanied by outreach and sustainability measures to keep and advance the work beyond the project period of FAIRsFAIR.