How to tag a church convent (i.e. nuns' residential building)

St Columba’s RC Church is located at 7 Upper Gray Street in Edinburgh. The residential building beside it, at 9 Upper Gray Street, is the church’s convent where some nuns live and which also acts as the postal address of the church.
It’s classed as residential building rather than a religious building, which is correct as that’s the primary function. It looks like a house and acts like a house. It just happened to be owned by the church next door, and houses people belonging to the church.
I have marked the name as “St Columba’s Convent”, but that’s about it. I feel it could do with one or two more tags, but not sure which ones are most suitable here.

Second question: should we also capture the postal address for the church (9 Upper Gray Street) if it is different from the actual church’s address (7 Upper Gray Street)?

There are various options:

amenity=convent

building=convent

amenity=monastery and monastery:type=convent