Update gpg changes

This MR fixes the public_key issue where we only pass the path to the key file, and not the contents of the file. This also reverts some of the changes to the repo_map creation that are now no longer needed.