my attempt to disentagle repository and registry (Issue #1439)