Update script to fix problems with gpg keys