Look at C/Y mount Zeiss for Contax/Yashica.
Can be pricey but some nice stuff out there.