Fix keystore issues upon key retrieval/generation

3 jobs for v0.1.1-rc
Status Name Job ID Coverage
  Build
canceled build #11201

 
  Test
canceled code_quality #11203
allowed to fail

canceled test #11202