Fix keystore issues upon key retrieval/generation

3 jobs for fix_keystore