Switch to tape, add repo field