I trap mine in a room until they finish the room, then add the doorway to let them go on to the next room. :D
What a very pleasant work environment you have adopted for you workers, keep it up.