I think a whole spectrum of actions need to be taken, starting with recruitment and retention for sure, and also, as you said, building a classroom and a workplace environment that is inclusive.
There's lots of research about how this can be done. We need to bring experts to the table who have already provided recommendations on how, for example, to build an inclusive classroom. With my own team, for example, I find I often have students and researchers who want to work with me because they value this. There is a clear benefit to creating an environment where people feel heard and seen.
I think you're right that there are many different approaches. We need both policy level kinds of actions as well as changes in individual teams, cultures, classrooms and research environments.