What about Stadt Wien? It’s licensed CC-BY and we are using it in OSM.