Respect tenant info from repose

RM7001
Same as above. The rest looks good though.