Use correct gpg keys.
Merge branch 'hotfix/fix-keys'