Changed repo/image handling to allow private namespaces to work