Developed a foundational multi-tenant authentication framework for the grafana/grafana repository, focusing on enabling tenant-scoped client registration and authentication logic to enhance security and scalability in multi-tenant environments. The work established the groundwork for a dedicated multi-tenant authentication service, allowing for more flexible and secure deployments. Leveraging Go for backend development, the implementation integrated new authentication libraries and updated the IAM application to support the expanded functionality. Emphasis was placed on robust API development and comprehensive testing to ensure reliability. This contribution addressed the need for scalable authentication solutions, supporting future growth and improved management of tenant-specific access controls.