Update to handle octohost/ prefix.