Fix rdoc in container
Move common registry code into module