I think it's best done in a seperate PR, since apps in other repos need to be adjusted