Srry it's been awhile, RL gets hetic from time to time.
How about this for the possible inclusion of a graveyard?
Thanks to a law/religious bullshit/fear among the people all girls considered "dead" are banned from working in any building in any capacity apart from the house and the farm, as the farm is outside the walls, and what happens in the house is your business and no-one elses. The graveyard can be like normal while the mausoleum can be the doorway into the actual building.
The graveyard can be a point of use for the "Dead" type girls, a plot of land outside the city walls where it can be dug out and used as a building for dead girls, a place to live, do business, a new "Grave-tending" job act as a new catacomb entrance, a catacomb "watchtower" where every week you have a small chance of being told of sightings of possible girls in there, and should it be needed for customers to come to enjoy the pleasures of the flesh, if they are into that sort of thing.
Now this is a more segregated build separating dead from living girls, but living girls also work there, maybe your catacomb explorers depart from the graveyard to explore and return to drop off girls, kills and ingredients for processing, plus having headstones tracking all dead girls and plaques for dead rivals to spruce up the place never goes astray.